From ad844a46349783d4056ddfcd679339b0e9bc8946 Mon Sep 17 00:00:00 2001 From: Tomislav Puric Date: Thu, 14 May 2026 17:59:54 +1000 Subject: [PATCH 1/7] FEATURE-3879: added support for typescript isolatedDeclarations --- .../openapi-ts.config.ts | 6 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 16 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../src/client/sdk.gen.ts | 45 +-- .../openapi-ts-angular/openapi-ts.config.ts | 6 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 16 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../openapi-ts-angular/src/client/sdk.gen.ts | 46 +-- .../openapi-ts-axios/openapi-ts.config.ts | 6 +- examples/openapi-ts-axios/src/App.tsx | 4 +- .../openapi-ts-axios/src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../openapi-ts-axios/src/client/sdk.gen.ts | 40 +-- examples/openapi-ts-axios/tsconfig.json | 2 + .../openapi-ts-fastify/openapi-ts.config.ts | 6 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../openapi-ts-fastify/src/client/sdk.gen.ts | 8 +- .../openapi-ts-fetch/openapi-ts.config.ts | 6 +- examples/openapi-ts-fetch/src/App.tsx | 4 +- .../openapi-ts-fetch/src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../openapi-ts-fetch/src/client/sdk.gen.ts | 40 +-- examples/openapi-ts-fetch/tsconfig.json | 2 + examples/openapi-ts-ky/openapi-ts.config.ts | 6 +- examples/openapi-ts-ky/src/App.tsx | 4 +- .../openapi-ts-ky/src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- examples/openapi-ts-ky/src/client/sdk.gen.ts | 40 +-- examples/openapi-ts-ky/tsconfig.json | 2 + .../openapi-ts-nestjs/openapi-ts.config.ts | 6 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../openapi-ts-nestjs/src/client/sdk.gen.ts | 14 +- .../src/pets/pets.controller.ts | 16 +- .../src/store/store.controller.ts | 3 +- examples/openapi-ts-nestjs/tsconfig.json | 2 + examples/openapi-ts-next/app/layout.tsx | 2 +- examples/openapi-ts-next/app/page.tsx | 2 +- .../openapi-ts-next/app/pet/[id]/page.tsx | 12 +- examples/openapi-ts-next/openapi-ts.config.ts | 6 +- .../openapi-ts-next/src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 11 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../openapi-ts-next/src/client/sdk.gen.ts | 40 +-- examples/openapi-ts-next/tailwind.config.ts | 6 +- examples/openapi-ts-next/tsconfig.json | 4 +- .../openapi-ts-ofetch/openapi-ts.config.ts | 6 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../openapi-ts-ofetch/src/client/sdk.gen.ts | 40 +-- .../openapi-ts-openai/openapi-ts.config.ts | 6 +- examples/openapi-ts-openai/src/App.tsx | 4 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../openapi-ts-openai/src/client/sdk.gen.ts | 337 +++++++++--------- examples/openapi-ts-openai/tsconfig.json | 2 + .../openapi-ts.config.ts | 6 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../src/client/sdk.gen.ts | 40 +-- .../openapi-ts.config.ts | 6 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 16 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../src/client/sdk.gen.ts | 40 +-- .../openapi-ts.config.ts | 6 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../src/client/sdk.gen.ts | 48 +-- .../openapi-ts.config.ts | 6 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../src/client/sdk.gen.ts | 40 +-- .../openapi-ts.config.ts | 6 +- .../src/client/client.gen.ts | 4 +- .../src/client/client/utils.gen.ts | 9 +- .../src/client/core/params.gen.ts | 2 +- .../src/client/core/pathSerializer.gen.ts | 12 +- .../src/client/core/queryKeySerializer.gen.ts | 2 +- .../src/client/core/utils.gen.ts | 8 +- .../src/client/sdk.gen.ts | 40 +-- .../body-response-text-plain/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../body-response-text-plain/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../2.0.x/body-response-text-plain/sdk.gen.ts | 4 +- .../2.0.x/form-data/client.gen.ts | 4 +- .../2.0.x/form-data/client/client.gen.ts | 5 +- .../2.0.x/form-data/client/index.ts | 1 + .../2.0.x/form-data/client/utils.gen.ts | 18 +- .../2.0.x/form-data/core/params.gen.ts | 2 +- .../form-data/core/pathSerializer.gen.ts | 12 +- .../form-data/core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/form-data/core/utils.gen.ts | 8 +- .../__snapshots__/2.0.x/form-data/sdk.gen.ts | 4 +- .../common/default-class/client.gen.ts | 4 +- .../common/default-class/client/client.gen.ts | 5 +- .../common/default-class/client/index.ts | 1 + .../common/default-class/client/utils.gen.ts | 21 +- .../common/default-class/core/params.gen.ts | 2 +- .../default-class/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../common/default-class/core/utils.gen.ts | 8 +- .../@angular/common/default-class/sdk.gen.ts | 70 ++-- .../@angular/common/default/client.gen.ts | 4 +- .../common/default/client/client.gen.ts | 5 +- .../@angular/common/default/client/index.ts | 1 + .../common/default/client/utils.gen.ts | 21 +- .../common/default/core/params.gen.ts | 2 +- .../common/default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../@angular/common/default/core/utils.gen.ts | 8 +- .../@angular/common/default/sdk.gen.ts | 70 ++-- .../sdk-nested-classes-instance/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../sdk-nested-classes-instance/sdk.gen.ts | 14 +- .../sdk-nested-classes/client.gen.ts | 4 +- .../sdk-nested-classes/client/client.gen.ts | 5 +- .../sdk-nested-classes/client/index.ts | 1 + .../sdk-nested-classes/client/utils.gen.ts | 18 +- .../sdk-nested-classes/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-nested-classes/core/utils.gen.ts | 8 +- .../sdk-nested-classes/sdk.gen.ts | 22 +- .../@hey-api/sdk/default/client.gen.ts | 4 +- .../@hey-api/sdk/default/client/client.gen.ts | 5 +- .../@hey-api/sdk/default/client/index.ts | 1 + .../@hey-api/sdk/default/client/utils.gen.ts | 18 +- .../@hey-api/sdk/default/core/params.gen.ts | 2 +- .../sdk/default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../@hey-api/sdk/default/core/utils.gen.ts | 8 +- .../plugins/@hey-api/sdk/default/sdk.gen.ts | 70 ++-- .../@hey-api/sdk/instance/client.gen.ts | 4 +- .../sdk/instance/client/client.gen.ts | 5 +- .../@hey-api/sdk/instance/client/index.ts | 1 + .../@hey-api/sdk/instance/client/utils.gen.ts | 18 +- .../@hey-api/sdk/instance/core/params.gen.ts | 2 +- .../sdk/instance/core/pathSerializer.gen.ts | 12 +- .../instance/core/queryKeySerializer.gen.ts | 2 +- .../@hey-api/sdk/instance/core/utils.gen.ts | 8 +- .../plugins/@hey-api/sdk/instance/sdk.gen.ts | 16 +- .../@hey-api/sdk/throwOnError/client.gen.ts | 4 +- .../sdk/throwOnError/client/client.gen.ts | 5 +- .../@hey-api/sdk/throwOnError/client/index.ts | 1 + .../sdk/throwOnError/client/utils.gen.ts | 18 +- .../sdk/throwOnError/core/params.gen.ts | 2 +- .../throwOnError/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk/throwOnError/core/utils.gen.ts | 8 +- .../@hey-api/sdk/throwOnError/sdk.gen.ts | 70 ++-- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../@pinia/colada/asClass/client.gen.ts | 4 +- .../colada/asClass/client/client.gen.ts | 5 +- .../@pinia/colada/asClass/client/index.ts | 1 + .../@pinia/colada/asClass/client/utils.gen.ts | 18 +- .../@pinia/colada/asClass/core/params.gen.ts | 2 +- .../colada/asClass/core/pathSerializer.gen.ts | 12 +- .../asClass/core/queryKeySerializer.gen.ts | 2 +- .../@pinia/colada/asClass/core/utils.gen.ts | 8 +- .../plugins/@pinia/colada/asClass/sdk.gen.ts | 18 +- .../plugins/@pinia/colada/fetch/client.gen.ts | 4 +- .../@pinia/colada/fetch/client/client.gen.ts | 5 +- .../@pinia/colada/fetch/client/index.ts | 1 + .../@pinia/colada/fetch/client/utils.gen.ts | 18 +- .../@pinia/colada/fetch/core/params.gen.ts | 2 +- .../colada/fetch/core/pathSerializer.gen.ts | 12 +- .../fetch/core/queryKeySerializer.gen.ts | 2 +- .../@pinia/colada/fetch/core/utils.gen.ts | 8 +- .../plugins/@pinia/colada/fetch/sdk.gen.ts | 70 ++-- .../2.0.x/schema-unknown/client.gen.ts | 4 +- .../2.0.x/schema-unknown/client/client.gen.ts | 5 +- .../2.0.x/schema-unknown/client/index.ts | 1 + .../2.0.x/schema-unknown/client/utils.gen.ts | 18 +- .../2.0.x/schema-unknown/core/params.gen.ts | 2 +- .../schema-unknown/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/schema-unknown/core/utils.gen.ts | 8 +- .../2.0.x/schema-unknown/sdk.gen.ts | 4 +- .../2.0.x/security-api-key/client.gen.ts | 4 +- .../security-api-key/client/client.gen.ts | 5 +- .../2.0.x/security-api-key/client/index.ts | 1 + .../security-api-key/client/utils.gen.ts | 18 +- .../2.0.x/security-api-key/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/security-api-key/core/utils.gen.ts | 8 +- .../2.0.x/security-api-key/sdk.gen.ts | 4 +- .../2.0.x/security-basic/client.gen.ts | 4 +- .../2.0.x/security-basic/client/client.gen.ts | 5 +- .../2.0.x/security-basic/client/index.ts | 1 + .../2.0.x/security-basic/client/utils.gen.ts | 18 +- .../2.0.x/security-basic/core/params.gen.ts | 2 +- .../security-basic/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/security-basic/core/utils.gen.ts | 8 +- .../2.0.x/security-basic/sdk.gen.ts | 4 +- .../2.0.x/security-false/client.gen.ts | 4 +- .../2.0.x/security-false/client/client.gen.ts | 5 +- .../2.0.x/security-false/client/index.ts | 1 + .../2.0.x/security-false/client/utils.gen.ts | 18 +- .../2.0.x/security-false/core/params.gen.ts | 2 +- .../security-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/security-false/core/utils.gen.ts | 8 +- .../2.0.x/security-false/sdk.gen.ts | 4 +- .../2.0.x/security-oauth2/client.gen.ts | 4 +- .../security-oauth2/client/client.gen.ts | 5 +- .../2.0.x/security-oauth2/client/index.ts | 1 + .../2.0.x/security-oauth2/client/utils.gen.ts | 18 +- .../2.0.x/security-oauth2/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/security-oauth2/core/utils.gen.ts | 8 +- .../2.0.x/security-oauth2/sdk.gen.ts | 4 +- .../2.0.x/servers-base-path/client.gen.ts | 4 +- .../servers-base-path/client/client.gen.ts | 5 +- .../2.0.x/servers-base-path/client/index.ts | 1 + .../servers-base-path/client/utils.gen.ts | 18 +- .../servers-base-path/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/servers-base-path/core/utils.gen.ts | 8 +- .../2.0.x/servers-host/client.gen.ts | 4 +- .../2.0.x/servers-host/client/client.gen.ts | 5 +- .../2.0.x/servers-host/client/index.ts | 1 + .../2.0.x/servers-host/client/utils.gen.ts | 18 +- .../2.0.x/servers-host/core/params.gen.ts | 2 +- .../servers-host/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/servers-host/core/utils.gen.ts | 8 +- .../__snapshots__/2.0.x/servers/client.gen.ts | 4 +- .../2.0.x/servers/client/client.gen.ts | 5 +- .../2.0.x/servers/client/index.ts | 1 + .../2.0.x/servers/client/utils.gen.ts | 18 +- .../2.0.x/servers/core/params.gen.ts | 2 +- .../2.0.x/servers/core/pathSerializer.gen.ts | 12 +- .../servers/core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/servers/core/utils.gen.ts | 8 +- .../2.0.x/transforms-read-write/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../transforms-read-write/client/index.ts | 1 + .../transforms-read-write/client/utils.gen.ts | 18 +- .../transforms-read-write/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../transforms-read-write/core/utils.gen.ts | 8 +- .../3.0.x/body-binary-format/client.gen.ts | 4 +- .../body-binary-format/client/client.gen.ts | 5 +- .../3.0.x/body-binary-format/client/index.ts | 1 + .../body-binary-format/client/utils.gen.ts | 18 +- .../body-binary-format/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../body-binary-format/core/utils.gen.ts | 8 +- .../3.0.x/body-binary-format/sdk.gen.ts | 8 +- .../body-response-text-plain/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../body-response-text-plain/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../3.0.x/body-response-text-plain/sdk.gen.ts | 4 +- .../3.0.x/content-types/client.gen.ts | 4 +- .../3.0.x/content-types/client/client.gen.ts | 5 +- .../3.0.x/content-types/client/index.ts | 1 + .../3.0.x/content-types/client/utils.gen.ts | 18 +- .../3.0.x/content-types/core/params.gen.ts | 2 +- .../content-types/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/content-types/core/utils.gen.ts | 8 +- .../3.0.x/content-types/sdk.gen.ts | 4 +- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../parameter-explode-false-axios/sdk.gen.ts | 4 +- .../parameter-explode-false/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../parameter-explode-false/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../parameter-explode-false/core/utils.gen.ts | 8 +- .../3.0.x/parameter-explode-false/sdk.gen.ts | 4 +- .../common/default-class/client.gen.ts | 4 +- .../common/default-class/client/client.gen.ts | 5 +- .../common/default-class/client/index.ts | 1 + .../common/default-class/client/utils.gen.ts | 21 +- .../common/default-class/core/params.gen.ts | 2 +- .../default-class/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../common/default-class/core/utils.gen.ts | 8 +- .../@angular/common/default-class/sdk.gen.ts | 98 ++--- .../@angular/common/default/client.gen.ts | 4 +- .../common/default/client/client.gen.ts | 5 +- .../@angular/common/default/client/index.ts | 1 + .../common/default/client/utils.gen.ts | 21 +- .../common/default/core/params.gen.ts | 2 +- .../common/default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../@angular/common/default/core/utils.gen.ts | 8 +- .../@angular/common/default/sdk.gen.ts | 98 ++--- .../sdk-nested-classes-instance/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../sdk-nested-classes-instance/sdk.gen.ts | 14 +- .../sdk-nested-classes/client.gen.ts | 4 +- .../sdk-nested-classes/client/client.gen.ts | 5 +- .../sdk-nested-classes/client/index.ts | 1 + .../sdk-nested-classes/client/utils.gen.ts | 18 +- .../sdk-nested-classes/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-nested-classes/core/utils.gen.ts | 8 +- .../sdk-nested-classes/sdk.gen.ts | 22 +- .../@hey-api/sdk/default/client.gen.ts | 4 +- .../@hey-api/sdk/default/client/client.gen.ts | 5 +- .../@hey-api/sdk/default/client/index.ts | 1 + .../@hey-api/sdk/default/client/utils.gen.ts | 18 +- .../@hey-api/sdk/default/core/params.gen.ts | 2 +- .../sdk/default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../@hey-api/sdk/default/core/utils.gen.ts | 8 +- .../plugins/@hey-api/sdk/default/sdk.gen.ts | 98 ++--- .../@hey-api/sdk/instance/client.gen.ts | 4 +- .../sdk/instance/client/client.gen.ts | 5 +- .../@hey-api/sdk/instance/client/index.ts | 1 + .../@hey-api/sdk/instance/client/utils.gen.ts | 18 +- .../@hey-api/sdk/instance/core/params.gen.ts | 2 +- .../sdk/instance/core/pathSerializer.gen.ts | 12 +- .../instance/core/queryKeySerializer.gen.ts | 2 +- .../@hey-api/sdk/instance/core/utils.gen.ts | 8 +- .../plugins/@hey-api/sdk/instance/sdk.gen.ts | 16 +- .../@hey-api/sdk/throwOnError/client.gen.ts | 4 +- .../sdk/throwOnError/client/client.gen.ts | 5 +- .../@hey-api/sdk/throwOnError/client/index.ts | 1 + .../sdk/throwOnError/client/utils.gen.ts | 18 +- .../sdk/throwOnError/core/params.gen.ts | 2 +- .../throwOnError/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk/throwOnError/core/utils.gen.ts | 8 +- .../@hey-api/sdk/throwOnError/sdk.gen.ts | 98 ++--- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../@pinia/colada/asClass/client.gen.ts | 4 +- .../colada/asClass/client/client.gen.ts | 5 +- .../@pinia/colada/asClass/client/index.ts | 1 + .../@pinia/colada/asClass/client/utils.gen.ts | 18 +- .../@pinia/colada/asClass/core/params.gen.ts | 2 +- .../colada/asClass/core/pathSerializer.gen.ts | 12 +- .../asClass/core/queryKeySerializer.gen.ts | 2 +- .../@pinia/colada/asClass/core/utils.gen.ts | 8 +- .../plugins/@pinia/colada/asClass/sdk.gen.ts | 18 +- .../plugins/@pinia/colada/fetch/client.gen.ts | 4 +- .../@pinia/colada/fetch/client/client.gen.ts | 5 +- .../@pinia/colada/fetch/client/index.ts | 1 + .../@pinia/colada/fetch/client/utils.gen.ts | 18 +- .../@pinia/colada/fetch/core/params.gen.ts | 2 +- .../colada/fetch/core/pathSerializer.gen.ts | 12 +- .../fetch/core/queryKeySerializer.gen.ts | 2 +- .../@pinia/colada/fetch/core/utils.gen.ts | 8 +- .../plugins/@pinia/colada/fetch/sdk.gen.ts | 98 ++--- .../3.0.x/security-api-key/client.gen.ts | 4 +- .../security-api-key/client/client.gen.ts | 5 +- .../3.0.x/security-api-key/client/index.ts | 1 + .../security-api-key/client/utils.gen.ts | 18 +- .../3.0.x/security-api-key/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/security-api-key/core/utils.gen.ts | 8 +- .../3.0.x/security-api-key/sdk.gen.ts | 6 +- .../3.0.x/security-false/client.gen.ts | 4 +- .../3.0.x/security-false/client/client.gen.ts | 5 +- .../3.0.x/security-false/client/index.ts | 1 + .../3.0.x/security-false/client/utils.gen.ts | 18 +- .../3.0.x/security-false/core/params.gen.ts | 2 +- .../security-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/security-false/core/utils.gen.ts | 8 +- .../3.0.x/security-false/sdk.gen.ts | 4 +- .../3.0.x/security-http-bearer/client.gen.ts | 4 +- .../security-http-bearer/client/client.gen.ts | 5 +- .../security-http-bearer/client/index.ts | 1 + .../security-http-bearer/client/utils.gen.ts | 18 +- .../security-http-bearer/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../security-http-bearer/core/utils.gen.ts | 8 +- .../3.0.x/security-http-bearer/sdk.gen.ts | 4 +- .../3.0.x/security-oauth2/client.gen.ts | 4 +- .../security-oauth2/client/client.gen.ts | 5 +- .../3.0.x/security-oauth2/client/index.ts | 1 + .../3.0.x/security-oauth2/client/utils.gen.ts | 18 +- .../3.0.x/security-oauth2/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/security-oauth2/core/utils.gen.ts | 8 +- .../3.0.x/security-oauth2/sdk.gen.ts | 4 +- .../security-open-id-connect/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../security-open-id-connect/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../3.0.x/security-open-id-connect/sdk.gen.ts | 4 +- .../__snapshots__/3.0.x/servers/client.gen.ts | 4 +- .../3.0.x/servers/client/client.gen.ts | 5 +- .../3.0.x/servers/client/index.ts | 1 + .../3.0.x/servers/client/utils.gen.ts | 18 +- .../3.0.x/servers/core/params.gen.ts | 2 +- .../3.0.x/servers/core/pathSerializer.gen.ts | 12 +- .../servers/core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/servers/core/utils.gen.ts | 8 +- .../3.0.x/transformers-all-of/client.gen.ts | 4 +- .../transformers-all-of/client/client.gen.ts | 5 +- .../3.0.x/transformers-all-of/client/index.ts | 1 + .../transformers-all-of/client/utils.gen.ts | 18 +- .../transformers-all-of/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../transformers-all-of/core/utils.gen.ts | 8 +- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../transformers-any-of-null/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../transformers-any-of-null/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../3.0.x/transformers-array/client.gen.ts | 4 +- .../transformers-array/client/client.gen.ts | 5 +- .../3.0.x/transformers-array/client/index.ts | 1 + .../transformers-array/client/utils.gen.ts | 18 +- .../transformers-array/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../transformers-array/core/utils.gen.ts | 8 +- .../transformers-recursive/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../transformers-recursive/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../transformers-recursive/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../transformers-recursive/core/utils.gen.ts | 8 +- .../3.0.x/transforms-read-write/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../transforms-read-write/client/index.ts | 1 + .../transforms-read-write/client/utils.gen.ts | 18 +- .../transforms-read-write/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../transforms-read-write/core/utils.gen.ts | 8 +- .../body-response-text-plain/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../body-response-text-plain/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../3.1.x/body-response-text-plain/sdk.gen.ts | 4 +- .../base-url-false/client.gen.ts | 4 +- .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/index.ts | 1 + .../base-url-false/client/utils.gen.ts | 21 +- .../base-url-false/core/params.gen.ts | 2 +- .../base-url-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-false/core/utils.gen.ts | 8 +- .../base-url-number/client.gen.ts | 4 +- .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/index.ts | 1 + .../base-url-number/client/utils.gen.ts | 21 +- .../base-url-number/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-number/core/utils.gen.ts | 8 +- .../base-url-strict/client.gen.ts | 4 +- .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/index.ts | 1 + .../base-url-strict/client/utils.gen.ts | 21 +- .../base-url-strict/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-strict/core/utils.gen.ts | 8 +- .../base-url-string/client.gen.ts | 4 +- .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/index.ts | 1 + .../base-url-string/client/utils.gen.ts | 21 +- .../base-url-string/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-string/core/utils.gen.ts | 8 +- .../client-angular/clean-false/client.gen.ts | 4 +- .../clean-false/client/client.gen.ts | 5 +- .../clean-false/client/index.ts | 1 + .../clean-false/client/utils.gen.ts | 21 +- .../clean-false/core/params.gen.ts | 2 +- .../clean-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../clean-false/core/utils.gen.ts | 8 +- .../client-angular/clean-false/sdk.gen.ts | 98 ++--- .../client-angular/default/client.gen.ts | 4 +- .../default/client/client.gen.ts | 5 +- .../client-angular/default/client/index.ts | 1 + .../default/client/utils.gen.ts | 21 +- .../client-angular/default/core/params.gen.ts | 2 +- .../default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../client-angular/default/core/utils.gen.ts | 8 +- .../client-angular/default/sdk.gen.ts | 98 ++--- .../import-file-extension-ts/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../import-file-extension-ts/client/index.ts | 1 + .../client/utils.gen.ts | 21 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../import-file-extension-ts/sdk.gen.ts | 98 ++--- .../sdk-client-optional/client.gen.ts | 4 +- .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/index.ts | 1 + .../sdk-client-optional/client/utils.gen.ts | 21 +- .../sdk-client-optional/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-optional/core/utils.gen.ts | 8 +- .../sdk-client-optional/sdk.gen.ts | 98 ++--- .../sdk-client-required/client.gen.ts | 4 +- .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/index.ts | 1 + .../sdk-client-required/client/utils.gen.ts | 21 +- .../sdk-client-required/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-required/core/utils.gen.ts | 8 +- .../sdk-client-required/sdk.gen.ts | 98 ++--- .../tsconfig-node16-sdk/client.gen.ts | 4 +- .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/index.ts | 1 + .../tsconfig-node16-sdk/client/utils.gen.ts | 21 +- .../tsconfig-node16-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-node16-sdk/core/utils.gen.ts | 8 +- .../tsconfig-node16-sdk/sdk.gen.ts | 98 ++--- .../tsconfig-nodenext-sdk/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/index.ts | 1 + .../tsconfig-nodenext-sdk/client/utils.gen.ts | 21 +- .../tsconfig-nodenext-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-nodenext-sdk/core/utils.gen.ts | 8 +- .../tsconfig-nodenext-sdk/sdk.gen.ts | 98 ++--- .../client-axios/base-url-false/client.gen.ts | 4 +- .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/index.ts | 1 + .../base-url-false/client/utils.gen.ts | 18 +- .../base-url-false/core/params.gen.ts | 2 +- .../base-url-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-false/core/utils.gen.ts | 8 +- .../base-url-number/client.gen.ts | 4 +- .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/index.ts | 1 + .../base-url-number/client/utils.gen.ts | 18 +- .../base-url-number/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-number/core/utils.gen.ts | 8 +- .../base-url-strict/client.gen.ts | 4 +- .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/index.ts | 1 + .../base-url-strict/client/utils.gen.ts | 18 +- .../base-url-strict/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-strict/core/utils.gen.ts | 8 +- .../base-url-string/client.gen.ts | 4 +- .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/index.ts | 1 + .../base-url-string/client/utils.gen.ts | 18 +- .../base-url-string/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-string/core/utils.gen.ts | 8 +- .../client-axios/clean-false/client.gen.ts | 4 +- .../clean-false/client/client.gen.ts | 5 +- .../client-axios/clean-false/client/index.ts | 1 + .../clean-false/client/utils.gen.ts | 18 +- .../clean-false/core/params.gen.ts | 2 +- .../clean-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../clean-false/core/utils.gen.ts | 8 +- .../client-axios/clean-false/sdk.gen.ts | 98 ++--- .../client-axios/default/client.gen.ts | 4 +- .../client-axios/default/client/client.gen.ts | 5 +- .../client-axios/default/client/index.ts | 1 + .../client-axios/default/client/utils.gen.ts | 18 +- .../client-axios/default/core/params.gen.ts | 2 +- .../default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../client-axios/default/core/utils.gen.ts | 8 +- .../@hey-api/client-axios/default/sdk.gen.ts | 98 ++--- .../import-file-extension-ts/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../import-file-extension-ts/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../import-file-extension-ts/sdk.gen.ts | 98 ++--- .../sdk-client-optional/client.gen.ts | 4 +- .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/index.ts | 1 + .../sdk-client-optional/client/utils.gen.ts | 18 +- .../sdk-client-optional/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-optional/core/utils.gen.ts | 8 +- .../sdk-client-optional/sdk.gen.ts | 98 ++--- .../sdk-client-required/client.gen.ts | 4 +- .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/index.ts | 1 + .../sdk-client-required/client/utils.gen.ts | 18 +- .../sdk-client-required/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-required/core/utils.gen.ts | 8 +- .../sdk-client-required/sdk.gen.ts | 98 ++--- .../tsconfig-node16-sdk/client.gen.ts | 4 +- .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/index.ts | 1 + .../tsconfig-node16-sdk/client/utils.gen.ts | 18 +- .../tsconfig-node16-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-node16-sdk/core/utils.gen.ts | 8 +- .../tsconfig-node16-sdk/sdk.gen.ts | 98 ++--- .../tsconfig-nodenext-sdk/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/index.ts | 1 + .../tsconfig-nodenext-sdk/client/utils.gen.ts | 18 +- .../tsconfig-nodenext-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-nodenext-sdk/core/utils.gen.ts | 8 +- .../tsconfig-nodenext-sdk/sdk.gen.ts | 98 ++--- .../client-fetch/base-url-false/client.gen.ts | 4 +- .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/index.ts | 1 + .../base-url-false/client/utils.gen.ts | 18 +- .../base-url-false/core/params.gen.ts | 2 +- .../base-url-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-false/core/utils.gen.ts | 8 +- .../base-url-number/client.gen.ts | 4 +- .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/index.ts | 1 + .../base-url-number/client/utils.gen.ts | 18 +- .../base-url-number/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-number/core/utils.gen.ts | 8 +- .../base-url-strict/client.gen.ts | 4 +- .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/index.ts | 1 + .../base-url-strict/client/utils.gen.ts | 18 +- .../base-url-strict/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-strict/core/utils.gen.ts | 8 +- .../base-url-string/client.gen.ts | 4 +- .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/index.ts | 1 + .../base-url-string/client/utils.gen.ts | 18 +- .../base-url-string/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-string/core/utils.gen.ts | 8 +- .../client-fetch/clean-false/client.gen.ts | 4 +- .../clean-false/client/client.gen.ts | 5 +- .../client-fetch/clean-false/client/index.ts | 1 + .../clean-false/client/utils.gen.ts | 18 +- .../clean-false/core/params.gen.ts | 2 +- .../clean-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../clean-false/core/utils.gen.ts | 8 +- .../client-fetch/clean-false/sdk.gen.ts | 98 ++--- .../client-fetch/default/client.gen.ts | 4 +- .../client-fetch/default/client/client.gen.ts | 5 +- .../client-fetch/default/client/index.ts | 1 + .../client-fetch/default/client/utils.gen.ts | 18 +- .../client-fetch/default/core/params.gen.ts | 2 +- .../default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../client-fetch/default/core/utils.gen.ts | 8 +- .../@hey-api/client-fetch/default/sdk.gen.ts | 98 ++--- .../import-file-extension-ts/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../import-file-extension-ts/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../import-file-extension-ts/sdk.gen.ts | 98 ++--- .../sdk-client-optional/client.gen.ts | 4 +- .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/index.ts | 1 + .../sdk-client-optional/client/utils.gen.ts | 18 +- .../sdk-client-optional/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-optional/core/utils.gen.ts | 8 +- .../sdk-client-optional/sdk.gen.ts | 98 ++--- .../sdk-client-required/client.gen.ts | 4 +- .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/index.ts | 1 + .../sdk-client-required/client/utils.gen.ts | 18 +- .../sdk-client-required/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-required/core/utils.gen.ts | 8 +- .../sdk-client-required/sdk.gen.ts | 98 ++--- .../tsconfig-node16-sdk/client.gen.ts | 4 +- .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/index.ts | 1 + .../tsconfig-node16-sdk/client/utils.gen.ts | 18 +- .../tsconfig-node16-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-node16-sdk/core/utils.gen.ts | 8 +- .../tsconfig-node16-sdk/sdk.gen.ts | 98 ++--- .../tsconfig-nodenext-sdk/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/index.ts | 1 + .../tsconfig-nodenext-sdk/client/utils.gen.ts | 18 +- .../tsconfig-nodenext-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-nodenext-sdk/core/utils.gen.ts | 8 +- .../tsconfig-nodenext-sdk/sdk.gen.ts | 98 ++--- .../client-ky/base-url-false/client.gen.ts | 4 +- .../base-url-false/client/client.gen.ts | 5 +- .../client-ky/base-url-false/client/index.ts | 1 + .../base-url-false/client/utils.gen.ts | 18 +- .../base-url-false/core/params.gen.ts | 2 +- .../base-url-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-false/core/utils.gen.ts | 8 +- .../client-ky/base-url-number/client.gen.ts | 4 +- .../base-url-number/client/client.gen.ts | 5 +- .../client-ky/base-url-number/client/index.ts | 1 + .../base-url-number/client/utils.gen.ts | 18 +- .../base-url-number/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-number/core/utils.gen.ts | 8 +- .../client-ky/base-url-strict/client.gen.ts | 4 +- .../base-url-strict/client/client.gen.ts | 5 +- .../client-ky/base-url-strict/client/index.ts | 1 + .../base-url-strict/client/utils.gen.ts | 18 +- .../base-url-strict/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-strict/core/utils.gen.ts | 8 +- .../client-ky/base-url-string/client.gen.ts | 4 +- .../base-url-string/client/client.gen.ts | 5 +- .../client-ky/base-url-string/client/index.ts | 1 + .../base-url-string/client/utils.gen.ts | 18 +- .../base-url-string/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-string/core/utils.gen.ts | 8 +- .../client-ky/clean-false/client.gen.ts | 4 +- .../clean-false/client/client.gen.ts | 5 +- .../client-ky/clean-false/client/index.ts | 1 + .../client-ky/clean-false/client/utils.gen.ts | 18 +- .../client-ky/clean-false/core/params.gen.ts | 2 +- .../clean-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../client-ky/clean-false/core/utils.gen.ts | 8 +- .../@hey-api/client-ky/clean-false/sdk.gen.ts | 98 ++--- .../@hey-api/client-ky/default/client.gen.ts | 4 +- .../client-ky/default/client/client.gen.ts | 5 +- .../client-ky/default/client/index.ts | 1 + .../client-ky/default/client/utils.gen.ts | 18 +- .../client-ky/default/core/params.gen.ts | 2 +- .../default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../client-ky/default/core/utils.gen.ts | 8 +- .../@hey-api/client-ky/default/sdk.gen.ts | 98 ++--- .../import-file-extension-ts/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../import-file-extension-ts/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../import-file-extension-ts/sdk.gen.ts | 98 ++--- .../sdk-client-optional/client.gen.ts | 4 +- .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/index.ts | 1 + .../sdk-client-optional/client/utils.gen.ts | 18 +- .../sdk-client-optional/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-optional/core/utils.gen.ts | 8 +- .../client-ky/sdk-client-optional/sdk.gen.ts | 98 ++--- .../sdk-client-required/client.gen.ts | 4 +- .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/index.ts | 1 + .../sdk-client-required/client/utils.gen.ts | 18 +- .../sdk-client-required/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-required/core/utils.gen.ts | 8 +- .../client-ky/sdk-client-required/sdk.gen.ts | 98 ++--- .../tsconfig-node16-sdk/client.gen.ts | 4 +- .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/index.ts | 1 + .../tsconfig-node16-sdk/client/utils.gen.ts | 18 +- .../tsconfig-node16-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-node16-sdk/core/utils.gen.ts | 8 +- .../client-ky/tsconfig-node16-sdk/sdk.gen.ts | 98 ++--- .../tsconfig-nodenext-sdk/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/index.ts | 1 + .../tsconfig-nodenext-sdk/client/utils.gen.ts | 18 +- .../tsconfig-nodenext-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-nodenext-sdk/core/utils.gen.ts | 8 +- .../tsconfig-nodenext-sdk/sdk.gen.ts | 98 ++--- .../client-next/base-url-false/client.gen.ts | 4 +- .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/index.ts | 1 + .../base-url-false/client/utils.gen.ts | 20 +- .../base-url-false/core/params.gen.ts | 2 +- .../base-url-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-false/core/utils.gen.ts | 8 +- .../client-next/base-url-number/client.gen.ts | 4 +- .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/index.ts | 1 + .../base-url-number/client/utils.gen.ts | 20 +- .../base-url-number/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-number/core/utils.gen.ts | 8 +- .../client-next/base-url-strict/client.gen.ts | 4 +- .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/index.ts | 1 + .../base-url-strict/client/utils.gen.ts | 20 +- .../base-url-strict/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-strict/core/utils.gen.ts | 8 +- .../client-next/base-url-string/client.gen.ts | 4 +- .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/index.ts | 1 + .../base-url-string/client/utils.gen.ts | 20 +- .../base-url-string/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-string/core/utils.gen.ts | 8 +- .../client-next/clean-false/client.gen.ts | 4 +- .../clean-false/client/client.gen.ts | 5 +- .../client-next/clean-false/client/index.ts | 1 + .../clean-false/client/utils.gen.ts | 20 +- .../clean-false/core/params.gen.ts | 2 +- .../clean-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../client-next/clean-false/core/utils.gen.ts | 8 +- .../client-next/clean-false/sdk.gen.ts | 98 ++--- .../client-next/default/client.gen.ts | 4 +- .../client-next/default/client/client.gen.ts | 5 +- .../client-next/default/client/index.ts | 1 + .../client-next/default/client/utils.gen.ts | 20 +- .../client-next/default/core/params.gen.ts | 2 +- .../default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../client-next/default/core/utils.gen.ts | 8 +- .../@hey-api/client-next/default/sdk.gen.ts | 98 ++--- .../import-file-extension-ts/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../import-file-extension-ts/client/index.ts | 1 + .../client/utils.gen.ts | 20 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../import-file-extension-ts/sdk.gen.ts | 98 ++--- .../sdk-client-optional/client.gen.ts | 4 +- .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/index.ts | 1 + .../sdk-client-optional/client/utils.gen.ts | 20 +- .../sdk-client-optional/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-optional/core/utils.gen.ts | 8 +- .../sdk-client-optional/sdk.gen.ts | 98 ++--- .../sdk-client-required/client.gen.ts | 4 +- .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/index.ts | 1 + .../sdk-client-required/client/utils.gen.ts | 20 +- .../sdk-client-required/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-required/core/utils.gen.ts | 8 +- .../sdk-client-required/sdk.gen.ts | 98 ++--- .../tsconfig-node16-sdk/client.gen.ts | 4 +- .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/index.ts | 1 + .../tsconfig-node16-sdk/client/utils.gen.ts | 20 +- .../tsconfig-node16-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-node16-sdk/core/utils.gen.ts | 8 +- .../tsconfig-node16-sdk/sdk.gen.ts | 98 ++--- .../tsconfig-nodenext-sdk/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/index.ts | 1 + .../tsconfig-nodenext-sdk/client/utils.gen.ts | 20 +- .../tsconfig-nodenext-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-nodenext-sdk/core/utils.gen.ts | 8 +- .../tsconfig-nodenext-sdk/sdk.gen.ts | 98 ++--- .../client-nuxt/base-url-false/client.gen.ts | 4 +- .../base-url-false/client/client.gen.ts | 13 +- .../base-url-false/client/index.ts | 1 + .../base-url-false/client/utils.gen.ts | 20 +- .../base-url-false/core/params.gen.ts | 2 +- .../base-url-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-false/core/utils.gen.ts | 8 +- .../client-nuxt/base-url-number/client.gen.ts | 4 +- .../base-url-number/client/client.gen.ts | 13 +- .../base-url-number/client/index.ts | 1 + .../base-url-number/client/utils.gen.ts | 20 +- .../base-url-number/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-number/core/utils.gen.ts | 8 +- .../client-nuxt/base-url-strict/client.gen.ts | 4 +- .../base-url-strict/client/client.gen.ts | 13 +- .../base-url-strict/client/index.ts | 1 + .../base-url-strict/client/utils.gen.ts | 20 +- .../base-url-strict/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-strict/core/utils.gen.ts | 8 +- .../client-nuxt/base-url-string/client.gen.ts | 4 +- .../base-url-string/client/client.gen.ts | 13 +- .../base-url-string/client/index.ts | 1 + .../base-url-string/client/utils.gen.ts | 20 +- .../base-url-string/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-string/core/utils.gen.ts | 8 +- .../client-nuxt/clean-false/client.gen.ts | 4 +- .../clean-false/client/client.gen.ts | 13 +- .../client-nuxt/clean-false/client/index.ts | 1 + .../clean-false/client/utils.gen.ts | 20 +- .../clean-false/core/params.gen.ts | 2 +- .../clean-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../client-nuxt/clean-false/core/utils.gen.ts | 8 +- .../client-nuxt/clean-false/sdk.gen.ts | 98 ++--- .../client-nuxt/default/client.gen.ts | 4 +- .../client-nuxt/default/client/client.gen.ts | 13 +- .../client-nuxt/default/client/index.ts | 1 + .../client-nuxt/default/client/utils.gen.ts | 20 +- .../client-nuxt/default/core/params.gen.ts | 2 +- .../default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../client-nuxt/default/core/utils.gen.ts | 8 +- .../@hey-api/client-nuxt/default/sdk.gen.ts | 98 ++--- .../import-file-extension-ts/client.gen.ts | 4 +- .../client/client.gen.ts | 13 +- .../import-file-extension-ts/client/index.ts | 1 + .../client/utils.gen.ts | 20 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../import-file-extension-ts/sdk.gen.ts | 98 ++--- .../sdk-client-optional/client.gen.ts | 4 +- .../sdk-client-optional/client/client.gen.ts | 13 +- .../sdk-client-optional/client/index.ts | 1 + .../sdk-client-optional/client/utils.gen.ts | 20 +- .../sdk-client-optional/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-optional/core/utils.gen.ts | 8 +- .../sdk-client-optional/sdk.gen.ts | 98 ++--- .../sdk-client-required/client.gen.ts | 4 +- .../sdk-client-required/client/client.gen.ts | 13 +- .../sdk-client-required/client/index.ts | 1 + .../sdk-client-required/client/utils.gen.ts | 20 +- .../sdk-client-required/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-required/core/utils.gen.ts | 8 +- .../sdk-client-required/sdk.gen.ts | 98 ++--- .../tsconfig-node16-sdk/client.gen.ts | 4 +- .../tsconfig-node16-sdk/client/client.gen.ts | 13 +- .../tsconfig-node16-sdk/client/index.ts | 1 + .../tsconfig-node16-sdk/client/utils.gen.ts | 20 +- .../tsconfig-node16-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-node16-sdk/core/utils.gen.ts | 8 +- .../tsconfig-node16-sdk/sdk.gen.ts | 98 ++--- .../tsconfig-nodenext-sdk/client.gen.ts | 4 +- .../client/client.gen.ts | 13 +- .../tsconfig-nodenext-sdk/client/index.ts | 1 + .../tsconfig-nodenext-sdk/client/utils.gen.ts | 20 +- .../tsconfig-nodenext-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-nodenext-sdk/core/utils.gen.ts | 8 +- .../tsconfig-nodenext-sdk/sdk.gen.ts | 98 ++--- .../base-url-false/client.gen.ts | 4 +- .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/index.ts | 1 + .../base-url-false/client/utils.gen.ts | 18 +- .../base-url-false/core/params.gen.ts | 2 +- .../base-url-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-false/core/utils.gen.ts | 8 +- .../base-url-number/client.gen.ts | 4 +- .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/index.ts | 1 + .../base-url-number/client/utils.gen.ts | 18 +- .../base-url-number/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-number/core/utils.gen.ts | 8 +- .../base-url-strict/client.gen.ts | 4 +- .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/index.ts | 1 + .../base-url-strict/client/utils.gen.ts | 18 +- .../base-url-strict/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-strict/core/utils.gen.ts | 8 +- .../base-url-string/client.gen.ts | 4 +- .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/index.ts | 1 + .../base-url-string/client/utils.gen.ts | 18 +- .../base-url-string/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../base-url-string/core/utils.gen.ts | 8 +- .../client-ofetch/clean-false/client.gen.ts | 4 +- .../clean-false/client/client.gen.ts | 5 +- .../client-ofetch/clean-false/client/index.ts | 1 + .../clean-false/client/utils.gen.ts | 18 +- .../clean-false/core/params.gen.ts | 2 +- .../clean-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../clean-false/core/utils.gen.ts | 8 +- .../client-ofetch/clean-false/sdk.gen.ts | 98 ++--- .../client-ofetch/default/client.gen.ts | 4 +- .../default/client/client.gen.ts | 5 +- .../client-ofetch/default/client/index.ts | 1 + .../client-ofetch/default/client/utils.gen.ts | 18 +- .../client-ofetch/default/core/params.gen.ts | 2 +- .../default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../client-ofetch/default/core/utils.gen.ts | 8 +- .../@hey-api/client-ofetch/default/sdk.gen.ts | 98 ++--- .../import-file-extension-ts/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../import-file-extension-ts/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../import-file-extension-ts/sdk.gen.ts | 98 ++--- .../sdk-client-optional/client.gen.ts | 4 +- .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/index.ts | 1 + .../sdk-client-optional/client/utils.gen.ts | 18 +- .../sdk-client-optional/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-optional/core/utils.gen.ts | 8 +- .../sdk-client-optional/sdk.gen.ts | 98 ++--- .../sdk-client-required/client.gen.ts | 4 +- .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/index.ts | 1 + .../sdk-client-required/client/utils.gen.ts | 18 +- .../sdk-client-required/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-client-required/core/utils.gen.ts | 8 +- .../sdk-client-required/sdk.gen.ts | 98 ++--- .../tsconfig-node16-sdk/client.gen.ts | 4 +- .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/index.ts | 1 + .../tsconfig-node16-sdk/client/utils.gen.ts | 18 +- .../tsconfig-node16-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-node16-sdk/core/utils.gen.ts | 8 +- .../tsconfig-node16-sdk/sdk.gen.ts | 98 ++--- .../tsconfig-nodenext-sdk/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/index.ts | 1 + .../tsconfig-nodenext-sdk/client/utils.gen.ts | 18 +- .../tsconfig-nodenext-sdk/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../tsconfig-nodenext-sdk/core/utils.gen.ts | 8 +- .../tsconfig-nodenext-sdk/sdk.gen.ts | 98 ++--- .../base-url-false/custom-client.gen.ts | 4 +- .../base-url-number/custom-client.gen.ts | 4 +- .../base-url-strict/custom-client.gen.ts | 4 +- .../base-url-string/custom-client.gen.ts | 4 +- .../default/custom-client.gen.ts | 4 +- .../clients/client-custom/default/sdk.gen.ts | 98 ++--- .../sdk-client-optional/custom-client.gen.ts | 4 +- .../sdk-client-optional/sdk.gen.ts | 98 ++--- .../sdk-client-required/custom-client.gen.ts | 4 +- .../sdk-client-required/sdk.gen.ts | 98 ++--- .../my-client/base-url-false/custom.gen.ts | 4 +- .../my-client/base-url-number/custom.gen.ts | 4 +- .../my-client/base-url-strict/custom.gen.ts | 4 +- .../my-client/base-url-string/custom.gen.ts | 4 +- .../clients/my-client/bundle/custom.gen.ts | 4 +- .../3.1.x/clients/my-client/bundle/sdk.gen.ts | 98 ++--- .../clients/my-client/default/custom.gen.ts | 4 +- .../clients/my-client/default/sdk.gen.ts | 98 ++--- .../sdk-client-optional/custom.gen.ts | 4 +- .../my-client/sdk-client-optional/sdk.gen.ts | 98 ++--- .../sdk-client-required/custom.gen.ts | 4 +- .../my-client/sdk-client-required/sdk.gen.ts | 98 ++--- .../3.1.x/content-types/client.gen.ts | 4 +- .../3.1.x/content-types/client/client.gen.ts | 5 +- .../3.1.x/content-types/client/index.ts | 1 + .../3.1.x/content-types/client/utils.gen.ts | 18 +- .../3.1.x/content-types/core/params.gen.ts | 2 +- .../content-types/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/content-types/core/utils.gen.ts | 8 +- .../3.1.x/content-types/sdk.gen.ts | 4 +- .../__snapshots__/3.1.x/headers/client.gen.ts | 4 +- .../3.1.x/headers/client/client.gen.ts | 5 +- .../3.1.x/headers/client/index.ts | 1 + .../3.1.x/headers/client/utils.gen.ts | 18 +- .../3.1.x/headers/core/params.gen.ts | 2 +- .../3.1.x/headers/core/pathSerializer.gen.ts | 12 +- .../headers/core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/headers/core/utils.gen.ts | 8 +- .../__snapshots__/3.1.x/headers/sdk.gen.ts | 10 +- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../parameter-explode-false-axios/sdk.gen.ts | 4 +- .../parameter-explode-false/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../parameter-explode-false/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../parameter-explode-false/core/utils.gen.ts | 8 +- .../3.1.x/parameter-explode-false/sdk.gen.ts | 4 +- .../common/default-class/client.gen.ts | 4 +- .../common/default-class/client/client.gen.ts | 5 +- .../common/default-class/client/index.ts | 1 + .../common/default-class/client/utils.gen.ts | 21 +- .../common/default-class/core/params.gen.ts | 2 +- .../default-class/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../common/default-class/core/utils.gen.ts | 8 +- .../@angular/common/default-class/sdk.gen.ts | 98 ++--- .../@angular/common/default/client.gen.ts | 4 +- .../common/default/client/client.gen.ts | 5 +- .../@angular/common/default/client/index.ts | 1 + .../common/default/client/utils.gen.ts | 21 +- .../common/default/core/params.gen.ts | 2 +- .../common/default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../@angular/common/default/core/utils.gen.ts | 8 +- .../@angular/common/default/sdk.gen.ts | 98 ++--- .../sdk-nested-classes-instance/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../sdk-nested-classes-instance/sdk.gen.ts | 14 +- .../sdk-nested-classes/client.gen.ts | 4 +- .../sdk-nested-classes/client/client.gen.ts | 5 +- .../sdk-nested-classes/client/index.ts | 1 + .../sdk-nested-classes/client/utils.gen.ts | 18 +- .../sdk-nested-classes/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk-nested-classes/core/utils.gen.ts | 8 +- .../sdk-nested-classes/sdk.gen.ts | 22 +- .../@hey-api/sdk/default/client.gen.ts | 4 +- .../@hey-api/sdk/default/client/client.gen.ts | 5 +- .../@hey-api/sdk/default/client/index.ts | 1 + .../@hey-api/sdk/default/client/utils.gen.ts | 18 +- .../@hey-api/sdk/default/core/params.gen.ts | 2 +- .../sdk/default/core/pathSerializer.gen.ts | 12 +- .../default/core/queryKeySerializer.gen.ts | 2 +- .../@hey-api/sdk/default/core/utils.gen.ts | 8 +- .../plugins/@hey-api/sdk/default/sdk.gen.ts | 98 ++--- .../@hey-api/sdk/instance/client.gen.ts | 4 +- .../sdk/instance/client/client.gen.ts | 5 +- .../@hey-api/sdk/instance/client/index.ts | 1 + .../@hey-api/sdk/instance/client/utils.gen.ts | 18 +- .../@hey-api/sdk/instance/core/params.gen.ts | 2 +- .../sdk/instance/core/pathSerializer.gen.ts | 12 +- .../instance/core/queryKeySerializer.gen.ts | 2 +- .../@hey-api/sdk/instance/core/utils.gen.ts | 8 +- .../plugins/@hey-api/sdk/instance/sdk.gen.ts | 16 +- .../@hey-api/sdk/throwOnError/client.gen.ts | 4 +- .../sdk/throwOnError/client/client.gen.ts | 5 +- .../@hey-api/sdk/throwOnError/client/index.ts | 1 + .../sdk/throwOnError/client/utils.gen.ts | 18 +- .../sdk/throwOnError/core/params.gen.ts | 2 +- .../throwOnError/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sdk/throwOnError/core/utils.gen.ts | 8 +- .../@hey-api/sdk/throwOnError/sdk.gen.ts | 98 ++--- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../@pinia/colada/asClass/client.gen.ts | 4 +- .../colada/asClass/client/client.gen.ts | 5 +- .../@pinia/colada/asClass/client/index.ts | 1 + .../@pinia/colada/asClass/client/utils.gen.ts | 18 +- .../@pinia/colada/asClass/core/params.gen.ts | 2 +- .../colada/asClass/core/pathSerializer.gen.ts | 12 +- .../asClass/core/queryKeySerializer.gen.ts | 2 +- .../@pinia/colada/asClass/core/utils.gen.ts | 8 +- .../plugins/@pinia/colada/asClass/sdk.gen.ts | 18 +- .../plugins/@pinia/colada/fetch/client.gen.ts | 4 +- .../@pinia/colada/fetch/client/client.gen.ts | 5 +- .../@pinia/colada/fetch/client/index.ts | 1 + .../@pinia/colada/fetch/client/utils.gen.ts | 18 +- .../@pinia/colada/fetch/core/params.gen.ts | 2 +- .../colada/fetch/core/pathSerializer.gen.ts | 12 +- .../fetch/core/queryKeySerializer.gen.ts | 2 +- .../@pinia/colada/fetch/core/utils.gen.ts | 8 +- .../plugins/@pinia/colada/fetch/sdk.gen.ts | 98 ++--- .../3.1.x/security-api-key/client.gen.ts | 4 +- .../security-api-key/client/client.gen.ts | 5 +- .../3.1.x/security-api-key/client/index.ts | 1 + .../security-api-key/client/utils.gen.ts | 18 +- .../3.1.x/security-api-key/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/security-api-key/core/utils.gen.ts | 8 +- .../3.1.x/security-api-key/sdk.gen.ts | 6 +- .../3.1.x/security-false/client.gen.ts | 4 +- .../3.1.x/security-false/client/client.gen.ts | 5 +- .../3.1.x/security-false/client/index.ts | 1 + .../3.1.x/security-false/client/utils.gen.ts | 18 +- .../3.1.x/security-false/core/params.gen.ts | 2 +- .../security-false/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/security-false/core/utils.gen.ts | 8 +- .../3.1.x/security-false/sdk.gen.ts | 4 +- .../3.1.x/security-http-bearer/client.gen.ts | 4 +- .../security-http-bearer/client/client.gen.ts | 5 +- .../security-http-bearer/client/index.ts | 1 + .../security-http-bearer/client/utils.gen.ts | 18 +- .../security-http-bearer/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../security-http-bearer/core/utils.gen.ts | 8 +- .../3.1.x/security-http-bearer/sdk.gen.ts | 4 +- .../3.1.x/security-oauth2/client.gen.ts | 4 +- .../security-oauth2/client/client.gen.ts | 5 +- .../3.1.x/security-oauth2/client/index.ts | 1 + .../3.1.x/security-oauth2/client/utils.gen.ts | 18 +- .../3.1.x/security-oauth2/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/security-oauth2/core/utils.gen.ts | 8 +- .../3.1.x/security-oauth2/sdk.gen.ts | 4 +- .../security-open-id-connect/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../security-open-id-connect/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../3.1.x/security-open-id-connect/sdk.gen.ts | 4 +- .../__snapshots__/3.1.x/servers/client.gen.ts | 4 +- .../3.1.x/servers/client/client.gen.ts | 5 +- .../3.1.x/servers/client/index.ts | 1 + .../3.1.x/servers/client/utils.gen.ts | 18 +- .../3.1.x/servers/core/params.gen.ts | 2 +- .../3.1.x/servers/core/pathSerializer.gen.ts | 12 +- .../servers/core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/servers/core/utils.gen.ts | 8 +- .../3.1.x/sse-angular/client.gen.ts | 4 +- .../3.1.x/sse-angular/client/client.gen.ts | 5 +- .../3.1.x/sse-angular/client/index.ts | 1 + .../3.1.x/sse-angular/client/utils.gen.ts | 21 +- .../3.1.x/sse-angular/core/params.gen.ts | 2 +- .../sse-angular/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/sse-angular/core/utils.gen.ts | 8 +- .../3.1.x/sse-angular/sdk.gen.ts | 4 +- .../3.1.x/sse-axios/client.gen.ts | 4 +- .../3.1.x/sse-axios/client/client.gen.ts | 5 +- .../3.1.x/sse-axios/client/index.ts | 1 + .../3.1.x/sse-axios/client/utils.gen.ts | 18 +- .../3.1.x/sse-axios/core/params.gen.ts | 2 +- .../sse-axios/core/pathSerializer.gen.ts | 12 +- .../sse-axios/core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/sse-axios/core/utils.gen.ts | 8 +- .../__snapshots__/3.1.x/sse-axios/sdk.gen.ts | 4 +- .../3.1.x/sse-fetch/client.gen.ts | 4 +- .../3.1.x/sse-fetch/client/client.gen.ts | 5 +- .../3.1.x/sse-fetch/client/index.ts | 1 + .../3.1.x/sse-fetch/client/utils.gen.ts | 18 +- .../3.1.x/sse-fetch/core/params.gen.ts | 2 +- .../sse-fetch/core/pathSerializer.gen.ts | 12 +- .../sse-fetch/core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/sse-fetch/core/utils.gen.ts | 8 +- .../__snapshots__/3.1.x/sse-fetch/sdk.gen.ts | 4 +- .../3.1.x/sse-next/client.gen.ts | 4 +- .../3.1.x/sse-next/client/client.gen.ts | 5 +- .../3.1.x/sse-next/client/index.ts | 1 + .../3.1.x/sse-next/client/utils.gen.ts | 20 +- .../3.1.x/sse-next/core/params.gen.ts | 2 +- .../3.1.x/sse-next/core/pathSerializer.gen.ts | 12 +- .../sse-next/core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/sse-next/core/utils.gen.ts | 8 +- .../__snapshots__/3.1.x/sse-next/sdk.gen.ts | 4 +- .../3.1.x/sse-nuxt/client.gen.ts | 4 +- .../3.1.x/sse-nuxt/client/client.gen.ts | 13 +- .../3.1.x/sse-nuxt/client/index.ts | 1 + .../3.1.x/sse-nuxt/client/utils.gen.ts | 20 +- .../3.1.x/sse-nuxt/core/params.gen.ts | 2 +- .../3.1.x/sse-nuxt/core/pathSerializer.gen.ts | 12 +- .../sse-nuxt/core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/sse-nuxt/core/utils.gen.ts | 8 +- .../__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts | 4 +- .../3.1.x/sse-ofetch/client.gen.ts | 4 +- .../3.1.x/sse-ofetch/client/client.gen.ts | 5 +- .../3.1.x/sse-ofetch/client/index.ts | 1 + .../3.1.x/sse-ofetch/client/utils.gen.ts | 18 +- .../3.1.x/sse-ofetch/core/params.gen.ts | 2 +- .../sse-ofetch/core/pathSerializer.gen.ts | 12 +- .../sse-ofetch/core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/sse-ofetch/core/utils.gen.ts | 8 +- .../__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts | 4 +- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../3.1.x/transformers-all-of/client.gen.ts | 4 +- .../transformers-all-of/client/client.gen.ts | 5 +- .../3.1.x/transformers-all-of/client/index.ts | 1 + .../transformers-all-of/client/utils.gen.ts | 18 +- .../transformers-all-of/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../transformers-all-of/core/utils.gen.ts | 8 +- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../transformers-any-of-null/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../transformers-any-of-null/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../3.1.x/transformers-array/client.gen.ts | 4 +- .../transformers-array/client/client.gen.ts | 5 +- .../3.1.x/transformers-array/client/index.ts | 1 + .../transformers-array/client/utils.gen.ts | 18 +- .../transformers-array/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../transformers-array/core/utils.gen.ts | 8 +- .../client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../transformers-recursive/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../transformers-recursive/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../transformers-recursive/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../transformers-recursive/core/utils.gen.ts | 8 +- .../3.1.x/transforms-read-write/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../transforms-read-write/client/index.ts | 1 + .../transforms-read-write/client/utils.gen.ts | 18 +- .../transforms-read-write/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../transforms-read-write/core/utils.gen.ts | 8 +- .../method-class-conflict/class/client.gen.ts | 4 +- .../class/client/client.gen.ts | 5 +- .../class/client/index.ts | 1 + .../class/client/utils.gen.ts | 18 +- .../class/core/params.gen.ts | 2 +- .../class/core/pathSerializer.gen.ts | 12 +- .../class/core/queryKeySerializer.gen.ts | 2 +- .../class/core/utils.gen.ts | 8 +- .../method-class-conflict/class/sdk.gen.ts | 264 +++++++------- .../method-class-conflict/flat/client.gen.ts | 4 +- .../flat/client/client.gen.ts | 5 +- .../flat/client/index.ts | 1 + .../flat/client/utils.gen.ts | 18 +- .../flat/core/params.gen.ts | 2 +- .../flat/core/pathSerializer.gen.ts | 12 +- .../flat/core/queryKeySerializer.gen.ts | 2 +- .../flat/core/utils.gen.ts | 8 +- .../method-class-conflict/flat/sdk.gen.ts | 264 +++++++------- .../instance/client.gen.ts | 4 +- .../instance/client/client.gen.ts | 5 +- .../instance/client/index.ts | 1 + .../instance/client/utils.gen.ts | 18 +- .../instance/core/params.gen.ts | 2 +- .../instance/core/pathSerializer.gen.ts | 12 +- .../instance/core/queryKeySerializer.gen.ts | 2 +- .../instance/core/utils.gen.ts | 8 +- .../method-class-conflict/instance/sdk.gen.ts | 266 +++++++------- .../opencode/export-all/client.gen.ts | 4 +- .../opencode/export-all/client/client.gen.ts | 5 +- .../opencode/export-all/client/index.ts | 1 + .../opencode/export-all/client/utils.gen.ts | 18 +- .../opencode/export-all/core/params.gen.ts | 2 +- .../export-all/core/pathSerializer.gen.ts | 12 +- .../export-all/core/queryKeySerializer.gen.ts | 2 +- .../opencode/export-all/core/utils.gen.ts | 8 +- .../opencode/export-all/sdk.gen.ts | 172 ++++----- .../__snapshots__/opencode/flat/client.gen.ts | 4 +- .../opencode/flat/client/client.gen.ts | 5 +- .../opencode/flat/client/index.ts | 1 + .../opencode/flat/client/utils.gen.ts | 18 +- .../opencode/flat/core/params.gen.ts | 2 +- .../opencode/flat/core/pathSerializer.gen.ts | 12 +- .../flat/core/queryKeySerializer.gen.ts | 2 +- .../opencode/flat/core/utils.gen.ts | 8 +- .../__snapshots__/opencode/flat/sdk.gen.ts | 172 ++++----- .../opencode/grouped/client.gen.ts | 4 +- .../opencode/grouped/client/client.gen.ts | 5 +- .../opencode/grouped/client/index.ts | 1 + .../opencode/grouped/client/utils.gen.ts | 18 +- .../opencode/grouped/core/params.gen.ts | 2 +- .../grouped/core/pathSerializer.gen.ts | 12 +- .../grouped/core/queryKeySerializer.gen.ts | 2 +- .../opencode/grouped/core/utils.gen.ts | 8 +- .../__snapshots__/opencode/grouped/sdk.gen.ts | 172 ++++----- .../2.0.x/plugins/asClass/client.gen.ts | 4 +- .../plugins/asClass/client/client.gen.ts | 5 +- .../2.0.x/plugins/asClass/client/index.ts | 1 + .../2.0.x/plugins/asClass/client/utils.gen.ts | 18 +- .../2.0.x/plugins/asClass/core/params.gen.ts | 2 +- .../asClass/core/pathSerializer.gen.ts | 12 +- .../asClass/core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/plugins/asClass/core/utils.gen.ts | 8 +- .../2.0.x/plugins/asClass/sdk.gen.ts | 18 +- .../2.0.x/plugins/axios/client.gen.ts | 4 +- .../2.0.x/plugins/axios/client/client.gen.ts | 5 +- .../2.0.x/plugins/axios/client/index.ts | 1 + .../2.0.x/plugins/axios/client/utils.gen.ts | 18 +- .../2.0.x/plugins/axios/core/params.gen.ts | 2 +- .../plugins/axios/core/pathSerializer.gen.ts | 12 +- .../axios/core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/plugins/axios/core/utils.gen.ts | 8 +- .../2.0.x/plugins/axios/sdk.gen.ts | 70 ++-- .../2.0.x/plugins/fetch/client.gen.ts | 4 +- .../2.0.x/plugins/fetch/client/client.gen.ts | 5 +- .../2.0.x/plugins/fetch/client/index.ts | 1 + .../2.0.x/plugins/fetch/client/utils.gen.ts | 18 +- .../2.0.x/plugins/fetch/core/params.gen.ts | 2 +- .../plugins/fetch/core/pathSerializer.gen.ts | 12 +- .../fetch/core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/plugins/fetch/core/utils.gen.ts | 8 +- .../2.0.x/plugins/fetch/sdk.gen.ts | 70 ++-- .../full-config/@tanstack/react-query.gen.ts | 129 ++----- .../2.0.x/plugins/full-config/client.gen.ts | 4 +- .../plugins/full-config/client/client.gen.ts | 5 +- .../2.0.x/plugins/full-config/client/index.ts | 1 + .../plugins/full-config/client/utils.gen.ts | 18 +- .../plugins/full-config/core/params.gen.ts | 2 +- .../full-config/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../plugins/full-config/core/utils.gen.ts | 8 +- .../2.0.x/plugins/full-config/sdk.gen.ts | 70 ++-- .../2.0.x/plugins/name-builder/client.gen.ts | 4 +- .../plugins/name-builder/client/client.gen.ts | 5 +- .../plugins/name-builder/client/index.ts | 1 + .../plugins/name-builder/client/utils.gen.ts | 18 +- .../plugins/name-builder/core/params.gen.ts | 2 +- .../name-builder/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../plugins/name-builder/core/utils.gen.ts | 8 +- .../2.0.x/plugins/name-builder/sdk.gen.ts | 14 +- .../internal-name-conflict/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../internal-name-conflict/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../internal-name-conflict/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../internal-name-conflict/core/utils.gen.ts | 8 +- .../3.0.x/internal-name-conflict/sdk.gen.ts | 8 +- .../3.0.x/plugins/asClass/client.gen.ts | 4 +- .../plugins/asClass/client/client.gen.ts | 5 +- .../3.0.x/plugins/asClass/client/index.ts | 1 + .../3.0.x/plugins/asClass/client/utils.gen.ts | 18 +- .../3.0.x/plugins/asClass/core/params.gen.ts | 2 +- .../asClass/core/pathSerializer.gen.ts | 12 +- .../asClass/core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/plugins/asClass/core/utils.gen.ts | 8 +- .../3.0.x/plugins/asClass/sdk.gen.ts | 18 +- .../3.0.x/plugins/axios/client.gen.ts | 4 +- .../3.0.x/plugins/axios/client/client.gen.ts | 5 +- .../3.0.x/plugins/axios/client/index.ts | 1 + .../3.0.x/plugins/axios/client/utils.gen.ts | 18 +- .../3.0.x/plugins/axios/core/params.gen.ts | 2 +- .../plugins/axios/core/pathSerializer.gen.ts | 12 +- .../axios/core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/plugins/axios/core/utils.gen.ts | 8 +- .../3.0.x/plugins/axios/sdk.gen.ts | 98 ++--- .../3.0.x/plugins/fetch/client.gen.ts | 4 +- .../3.0.x/plugins/fetch/client/client.gen.ts | 5 +- .../3.0.x/plugins/fetch/client/index.ts | 1 + .../3.0.x/plugins/fetch/client/utils.gen.ts | 18 +- .../3.0.x/plugins/fetch/core/params.gen.ts | 2 +- .../plugins/fetch/core/pathSerializer.gen.ts | 12 +- .../fetch/core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/plugins/fetch/core/utils.gen.ts | 8 +- .../3.0.x/plugins/fetch/sdk.gen.ts | 98 ++--- .../full-config/@tanstack/react-query.gen.ts | 174 ++------- .../3.0.x/plugins/full-config/client.gen.ts | 4 +- .../plugins/full-config/client/client.gen.ts | 5 +- .../3.0.x/plugins/full-config/client/index.ts | 1 + .../plugins/full-config/client/utils.gen.ts | 18 +- .../plugins/full-config/core/params.gen.ts | 2 +- .../full-config/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../plugins/full-config/core/utils.gen.ts | 8 +- .../3.0.x/plugins/full-config/sdk.gen.ts | 98 ++--- .../3.0.x/plugins/name-builder/client.gen.ts | 4 +- .../plugins/name-builder/client/client.gen.ts | 5 +- .../plugins/name-builder/client/index.ts | 1 + .../plugins/name-builder/client/utils.gen.ts | 18 +- .../plugins/name-builder/core/params.gen.ts | 2 +- .../name-builder/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../plugins/name-builder/core/utils.gen.ts | 8 +- .../3.0.x/plugins/name-builder/sdk.gen.ts | 14 +- .../internal-name-conflict/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../internal-name-conflict/client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../internal-name-conflict/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../internal-name-conflict/core/utils.gen.ts | 8 +- .../3.1.x/internal-name-conflict/sdk.gen.ts | 8 +- .../angular-query-experimental/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../angular-query-experimental/sdk.gen.ts | 6 +- .../meta-function/preact-query/client.gen.ts | 4 +- .../preact-query/client/client.gen.ts | 5 +- .../preact-query/client/index.ts | 1 + .../preact-query/client/utils.gen.ts | 18 +- .../preact-query/core/params.gen.ts | 2 +- .../preact-query/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../preact-query/core/utils.gen.ts | 8 +- .../meta-function/preact-query/sdk.gen.ts | 6 +- .../meta-function/react-query/client.gen.ts | 4 +- .../react-query/client/client.gen.ts | 5 +- .../meta-function/react-query/client/index.ts | 1 + .../react-query/client/utils.gen.ts | 18 +- .../react-query/core/params.gen.ts | 2 +- .../react-query/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../react-query/core/utils.gen.ts | 8 +- .../meta-function/react-query/sdk.gen.ts | 6 +- .../meta-function/solid-query/client.gen.ts | 4 +- .../solid-query/client/client.gen.ts | 5 +- .../meta-function/solid-query/client/index.ts | 1 + .../solid-query/client/utils.gen.ts | 18 +- .../solid-query/core/params.gen.ts | 2 +- .../solid-query/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../solid-query/core/utils.gen.ts | 8 +- .../meta-function/solid-query/sdk.gen.ts | 6 +- .../meta-function/svelte-query/client.gen.ts | 4 +- .../svelte-query/client/client.gen.ts | 5 +- .../svelte-query/client/index.ts | 1 + .../svelte-query/client/utils.gen.ts | 18 +- .../svelte-query/core/params.gen.ts | 2 +- .../svelte-query/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../svelte-query/core/utils.gen.ts | 8 +- .../meta-function/svelte-query/sdk.gen.ts | 6 +- .../meta-function/vue-query/client.gen.ts | 4 +- .../vue-query/client/client.gen.ts | 5 +- .../meta-function/vue-query/client/index.ts | 1 + .../vue-query/client/utils.gen.ts | 18 +- .../vue-query/core/params.gen.ts | 2 +- .../vue-query/core/pathSerializer.gen.ts | 12 +- .../vue-query/core/queryKeySerializer.gen.ts | 2 +- .../meta-function/vue-query/core/utils.gen.ts | 8 +- .../3.1.x/meta-function/vue-query/sdk.gen.ts | 6 +- .../3.1.x/pagination-ref/client.gen.ts | 4 +- .../3.1.x/pagination-ref/client/client.gen.ts | 5 +- .../3.1.x/pagination-ref/client/index.ts | 1 + .../3.1.x/pagination-ref/client/utils.gen.ts | 18 +- .../3.1.x/pagination-ref/core/params.gen.ts | 2 +- .../pagination-ref/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/pagination-ref/core/utils.gen.ts | 8 +- .../3.1.x/pagination-ref/sdk.gen.ts | 6 +- .../3.1.x/plugins/asClass/client.gen.ts | 4 +- .../plugins/asClass/client/client.gen.ts | 5 +- .../3.1.x/plugins/asClass/client/index.ts | 1 + .../3.1.x/plugins/asClass/client/utils.gen.ts | 18 +- .../3.1.x/plugins/asClass/core/params.gen.ts | 2 +- .../asClass/core/pathSerializer.gen.ts | 12 +- .../asClass/core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/plugins/asClass/core/utils.gen.ts | 8 +- .../3.1.x/plugins/asClass/sdk.gen.ts | 18 +- .../3.1.x/plugins/axios/client.gen.ts | 4 +- .../3.1.x/plugins/axios/client/client.gen.ts | 5 +- .../3.1.x/plugins/axios/client/index.ts | 1 + .../3.1.x/plugins/axios/client/utils.gen.ts | 18 +- .../3.1.x/plugins/axios/core/params.gen.ts | 2 +- .../plugins/axios/core/pathSerializer.gen.ts | 12 +- .../axios/core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/plugins/axios/core/utils.gen.ts | 8 +- .../3.1.x/plugins/axios/sdk.gen.ts | 98 ++--- .../3.1.x/plugins/fetch/client.gen.ts | 4 +- .../3.1.x/plugins/fetch/client/client.gen.ts | 5 +- .../3.1.x/plugins/fetch/client/index.ts | 1 + .../3.1.x/plugins/fetch/client/utils.gen.ts | 18 +- .../3.1.x/plugins/fetch/core/params.gen.ts | 2 +- .../plugins/fetch/core/pathSerializer.gen.ts | 12 +- .../fetch/core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/plugins/fetch/core/utils.gen.ts | 8 +- .../3.1.x/plugins/fetch/sdk.gen.ts | 98 ++--- .../full-config/@tanstack/react-query.gen.ts | 174 ++------- .../3.1.x/plugins/full-config/client.gen.ts | 4 +- .../plugins/full-config/client/client.gen.ts | 5 +- .../3.1.x/plugins/full-config/client/index.ts | 1 + .../plugins/full-config/client/utils.gen.ts | 18 +- .../plugins/full-config/core/params.gen.ts | 2 +- .../full-config/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../plugins/full-config/core/utils.gen.ts | 8 +- .../3.1.x/plugins/full-config/sdk.gen.ts | 98 ++--- .../3.1.x/plugins/name-builder/client.gen.ts | 4 +- .../plugins/name-builder/client/client.gen.ts | 5 +- .../plugins/name-builder/client/index.ts | 1 + .../plugins/name-builder/client/utils.gen.ts | 18 +- .../plugins/name-builder/core/params.gen.ts | 2 +- .../name-builder/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../plugins/name-builder/core/utils.gen.ts | 8 +- .../3.1.x/plugins/name-builder/sdk.gen.ts | 14 +- .../@tanstack/react-query.gen.ts | 2 +- .../query-options-name-conflict/client.gen.ts | 4 +- .../client/client.gen.ts | 5 +- .../client/index.ts | 1 + .../client/utils.gen.ts | 18 +- .../core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../core/utils.gen.ts | 8 +- .../query-options-name-conflict/sdk.gen.ts | 6 +- .../3.1.x/sse-react-query/client.gen.ts | 4 +- .../sse-react-query/client/client.gen.ts | 5 +- .../3.1.x/sse-react-query/client/index.ts | 1 + .../3.1.x/sse-react-query/client/utils.gen.ts | 18 +- .../3.1.x/sse-react-query/core/params.gen.ts | 2 +- .../core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/sse-react-query/core/utils.gen.ts | 8 +- .../3.1.x/sse-react-query/sdk.gen.ts | 6 +- .../3.1.x/type-format/client.gen.ts | 4 +- .../3.1.x/type-format/client/client.gen.ts | 5 +- .../3.1.x/type-format/client/index.ts | 1 + .../3.1.x/type-format/client/utils.gen.ts | 18 +- .../3.1.x/type-format/core/params.gen.ts | 2 +- .../type-format/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/type-format/core/utils.gen.ts | 8 +- .../3.1.x/type-format/sdk.gen.ts | 6 +- .../3.1.x/webhooks/valibot.gen.ts | 16 +- .../2.0.x/mini/type-format/client.gen.ts | 4 +- .../mini/type-format/client/client.gen.ts | 5 +- .../2.0.x/mini/type-format/client/index.ts | 1 + .../mini/type-format/client/utils.gen.ts | 18 +- .../2.0.x/mini/type-format/core/params.gen.ts | 2 +- .../type-format/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/mini/type-format/core/utils.gen.ts | 8 +- .../2.0.x/mini/type-format/sdk.gen.ts | 4 +- .../2.0.x/v3/type-format/client.gen.ts | 4 +- .../2.0.x/v3/type-format/client/client.gen.ts | 5 +- .../2.0.x/v3/type-format/client/index.ts | 1 + .../2.0.x/v3/type-format/client/utils.gen.ts | 18 +- .../2.0.x/v3/type-format/core/params.gen.ts | 2 +- .../v3/type-format/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/v3/type-format/core/utils.gen.ts | 8 +- .../2.0.x/v3/type-format/sdk.gen.ts | 4 +- .../2.0.x/v4/type-format/client.gen.ts | 4 +- .../2.0.x/v4/type-format/client/client.gen.ts | 5 +- .../2.0.x/v4/type-format/client/index.ts | 1 + .../2.0.x/v4/type-format/client/utils.gen.ts | 18 +- .../2.0.x/v4/type-format/core/params.gen.ts | 2 +- .../v4/type-format/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../2.0.x/v4/type-format/core/utils.gen.ts | 8 +- .../2.0.x/v4/type-format/sdk.gen.ts | 4 +- .../3.0.x/mini/type-format/client.gen.ts | 4 +- .../mini/type-format/client/client.gen.ts | 5 +- .../3.0.x/mini/type-format/client/index.ts | 1 + .../mini/type-format/client/utils.gen.ts | 18 +- .../3.0.x/mini/type-format/core/params.gen.ts | 2 +- .../type-format/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/mini/type-format/core/utils.gen.ts | 8 +- .../3.0.x/mini/type-format/sdk.gen.ts | 4 +- .../3.0.x/v3/type-format/client.gen.ts | 4 +- .../3.0.x/v3/type-format/client/client.gen.ts | 5 +- .../3.0.x/v3/type-format/client/index.ts | 1 + .../3.0.x/v3/type-format/client/utils.gen.ts | 18 +- .../3.0.x/v3/type-format/core/params.gen.ts | 2 +- .../v3/type-format/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/v3/type-format/core/utils.gen.ts | 8 +- .../3.0.x/v3/type-format/sdk.gen.ts | 4 +- .../3.0.x/v4/type-format/client.gen.ts | 4 +- .../3.0.x/v4/type-format/client/client.gen.ts | 5 +- .../3.0.x/v4/type-format/client/index.ts | 1 + .../3.0.x/v4/type-format/client/utils.gen.ts | 18 +- .../3.0.x/v4/type-format/core/params.gen.ts | 2 +- .../v4/type-format/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.0.x/v4/type-format/core/utils.gen.ts | 8 +- .../3.0.x/v4/type-format/sdk.gen.ts | 4 +- .../3.1.x/mini/transformer/client.gen.ts | 4 +- .../mini/transformer/client/client.gen.ts | 5 +- .../3.1.x/mini/transformer/client/index.ts | 1 + .../mini/transformer/client/utils.gen.ts | 18 +- .../3.1.x/mini/transformer/core/params.gen.ts | 2 +- .../transformer/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/mini/transformer/core/utils.gen.ts | 8 +- .../3.1.x/mini/transformer/sdk.gen.ts | 6 +- .../3.1.x/mini/type-format/client.gen.ts | 4 +- .../mini/type-format/client/client.gen.ts | 5 +- .../3.1.x/mini/type-format/client/index.ts | 1 + .../mini/type-format/client/utils.gen.ts | 18 +- .../3.1.x/mini/type-format/core/params.gen.ts | 2 +- .../type-format/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/mini/type-format/core/utils.gen.ts | 8 +- .../3.1.x/mini/type-format/sdk.gen.ts | 4 +- .../3.1.x/v3/transformer/client.gen.ts | 4 +- .../3.1.x/v3/transformer/client/client.gen.ts | 5 +- .../3.1.x/v3/transformer/client/index.ts | 1 + .../3.1.x/v3/transformer/client/utils.gen.ts | 18 +- .../3.1.x/v3/transformer/core/params.gen.ts | 2 +- .../v3/transformer/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/v3/transformer/core/utils.gen.ts | 8 +- .../3.1.x/v3/transformer/sdk.gen.ts | 6 +- .../3.1.x/v3/type-format/client.gen.ts | 4 +- .../3.1.x/v3/type-format/client/client.gen.ts | 5 +- .../3.1.x/v3/type-format/client/index.ts | 1 + .../3.1.x/v3/type-format/client/utils.gen.ts | 18 +- .../3.1.x/v3/type-format/core/params.gen.ts | 2 +- .../v3/type-format/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/v3/type-format/core/utils.gen.ts | 8 +- .../3.1.x/v3/type-format/sdk.gen.ts | 4 +- .../3.1.x/v4/transformer/client.gen.ts | 4 +- .../3.1.x/v4/transformer/client/client.gen.ts | 5 +- .../3.1.x/v4/transformer/client/index.ts | 1 + .../3.1.x/v4/transformer/client/utils.gen.ts | 18 +- .../3.1.x/v4/transformer/core/params.gen.ts | 2 +- .../v4/transformer/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/v4/transformer/core/utils.gen.ts | 8 +- .../3.1.x/v4/transformer/sdk.gen.ts | 6 +- .../3.1.x/v4/type-format/client.gen.ts | 4 +- .../3.1.x/v4/type-format/client/client.gen.ts | 5 +- .../3.1.x/v4/type-format/client/index.ts | 1 + .../3.1.x/v4/type-format/client/utils.gen.ts | 18 +- .../3.1.x/v4/type-format/core/params.gen.ts | 2 +- .../v4/type-format/core/pathSerializer.gen.ts | 12 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/v4/type-format/core/utils.gen.ts | 8 +- .../3.1.x/v4/type-format/sdk.gen.ts | 4 +- .../@hey-api/client-angular/bundle/utils.ts | 6 +- .../@hey-api/client-axios/bundle/utils.ts | 4 +- .../@hey-api/client-core/bundle/params.ts | 2 +- .../client-core/bundle/pathSerializer.ts | 12 +- .../client-core/bundle/queryKeySerializer.ts | 2 +- .../@hey-api/client-core/bundle/utils.ts | 8 +- .../plugins/@hey-api/client-core/client.ts | 9 + .../@hey-api/client-fetch/bundle/utils.ts | 4 +- .../@hey-api/client-ky/bundle/utils.ts | 4 +- .../@hey-api/client-next/bundle/utils.ts | 6 +- .../@hey-api/client-nuxt/bundle/utils.ts | 6 +- .../@hey-api/client-ofetch/bundle/utils.ts | 4 +- .../src/plugins/@hey-api/sdk/v1/node.ts | 30 +- .../src/plugins/@hey-api/sdk/v1/plugin.ts | 8 + 1995 files changed, 11925 insertions(+), 10854 deletions(-) diff --git a/examples/openapi-ts-angular-common/openapi-ts.config.ts b/examples/openapi-ts-angular-common/openapi-ts.config.ts index d146f5d2d5..3ddd1055be 100644 --- a/examples/openapi-ts-angular-common/openapi-ts.config.ts +++ b/examples/openapi-ts-angular-common/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -35,3 +35,5 @@ export default defineConfig({ }, ], }); + +export default config; diff --git a/examples/openapi-ts-angular-common/src/client/client.gen.ts b/examples/openapi-ts-angular-common/src/client/client.gen.ts index beccff2934..2aa821f67a 100644 --- a/examples/openapi-ts-angular-common/src/client/client.gen.ts +++ b/examples/openapi-ts-angular-common/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,7 +15,7 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3', throwOnError: true, diff --git a/examples/openapi-ts-angular-common/src/client/client/utils.gen.ts b/examples/openapi-ts-angular-common/src/client/client/utils.gen.ts index 8a905e0552..2b4b8bfc2d 100644 --- a/examples/openapi-ts-angular-common/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-angular-common/src/client/client/utils.gen.ts @@ -92,8 +92,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -179,12 +179,22 @@ export const getParseAs = ( return; }; +<<<<<<< HEAD export async function setAuthParams( options: Pick & { headers: HttpHeaders; }, ): Promise { for (const auth of options.security ?? []) { +======= +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) const token = await getAuthToken(auth, options.auth); if (!token) { @@ -239,7 +249,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/examples/openapi-ts-angular-common/src/client/core/params.gen.ts b/examples/openapi-ts-angular-common/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-angular-common/src/client/core/params.gen.ts +++ b/examples/openapi-ts-angular-common/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-angular-common/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-angular-common/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-angular-common/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-angular-common/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-angular-common/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-angular-common/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-angular-common/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-angular-common/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-angular-common/src/client/core/utils.gen.ts b/examples/openapi-ts-angular-common/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-angular-common/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-angular-common/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-angular-common/src/client/sdk.gen.ts b/examples/openapi-ts-angular-common/src/client/sdk.gen.ts index 93cd006760..56fcc0a46f 100644 --- a/examples/openapi-ts-angular-common/src/client/sdk.gen.ts +++ b/examples/openapi-ts-angular-common/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -87,7 +87,7 @@ export type Options< */ export const addPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ responseStyle: 'data', security: [{ scheme: 'bearer', type: 'http' }], @@ -106,7 +106,7 @@ export const addPet = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ responseStyle: 'data', security: [{ scheme: 'bearer', type: 'http' }], @@ -125,7 +125,7 @@ export const updatePet = ( */ export const findPetsByStatus = ( options: Options, -) => +): RequestResult => (options.client ?? client).get< FindPetsByStatusResponses, FindPetsByStatusErrors, @@ -145,7 +145,7 @@ export const findPetsByStatus = ( */ export const findPetsByTags = ( options: Options, -) => +): RequestResult => (options.client ?? client).get< FindPetsByTagsResponses, FindPetsByTagsErrors, @@ -165,7 +165,7 @@ export const findPetsByTags = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ responseStyle: 'data', security: [{ scheme: 'bearer', type: 'http' }], @@ -180,7 +180,7 @@ export const deletePet = ( */ export const getPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ responseStyle: 'data', security: [ @@ -198,7 +198,7 @@ export const getPetById = ( */ export const updatePetWithForm = ( options: Options, -) => +): RequestResult => (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -218,7 +218,7 @@ export const updatePetWithForm = ( */ export const uploadFile = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ bodySerializer: null, responseStyle: 'data', @@ -238,7 +238,7 @@ export const uploadFile = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ responseStyle: 'data', security: [{ name: 'api_key', type: 'apiKey' }], @@ -253,7 +253,7 @@ export const getInventory = ( */ export const placeOrder = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ responseStyle: 'data', url: '/store/order', @@ -271,7 +271,7 @@ export const placeOrder = ( */ export const deleteOrder = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ responseStyle: 'data', url: '/store/order/{orderId}', @@ -285,7 +285,7 @@ export const deleteOrder = ( */ export const getOrderById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ responseStyle: 'data', url: '/store/order/{orderId}', @@ -299,7 +299,7 @@ export const getOrderById = ( */ export const createUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ responseStyle: 'data', url: '/user', @@ -317,7 +317,12 @@ export const createUser = ( */ export const createUsersWithListInput = ( options?: Options, -) => +): RequestResult< + CreateUsersWithListInputResponses, + CreateUsersWithListInputErrors, + ThrowOnError, + 'data' +> => (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -340,7 +345,7 @@ export const createUsersWithListInput = ( */ export const loginUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ responseStyle: 'data', url: '/user/login', @@ -354,7 +359,7 @@ export const loginUser = ( */ export const logoutUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ responseStyle: 'data', url: '/user/logout', @@ -368,7 +373,7 @@ export const logoutUser = ( */ export const deleteUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ responseStyle: 'data', url: '/user/{username}', @@ -382,7 +387,7 @@ export const deleteUser = ( */ export const getUserByName = ( options: Options, -) => +): RequestResult => (options.client ?? client).get( { responseStyle: 'data', @@ -398,7 +403,7 @@ export const getUserByName = ( */ export const updateUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ responseStyle: 'data', url: '/user/{username}', diff --git a/examples/openapi-ts-angular/openapi-ts.config.ts b/examples/openapi-ts-angular/openapi-ts.config.ts index 7bbd563139..4c419a2d32 100644 --- a/examples/openapi-ts-angular/openapi-ts.config.ts +++ b/examples/openapi-ts-angular/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -26,3 +26,5 @@ export default defineConfig({ }, ], }); + +export default config; diff --git a/examples/openapi-ts-angular/src/client/client.gen.ts b/examples/openapi-ts-angular/src/client/client.gen.ts index 84318ba67c..c0ceac20e4 100644 --- a/examples/openapi-ts-angular/src/client/client.gen.ts +++ b/examples/openapi-ts-angular/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3' }), ); diff --git a/examples/openapi-ts-angular/src/client/client/utils.gen.ts b/examples/openapi-ts-angular/src/client/client/utils.gen.ts index 8a905e0552..2b4b8bfc2d 100644 --- a/examples/openapi-ts-angular/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-angular/src/client/client/utils.gen.ts @@ -92,8 +92,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -179,12 +179,22 @@ export const getParseAs = ( return; }; +<<<<<<< HEAD export async function setAuthParams( options: Pick & { headers: HttpHeaders; }, ): Promise { for (const auth of options.security ?? []) { +======= +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) const token = await getAuthToken(auth, options.auth); if (!token) { @@ -239,7 +249,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/examples/openapi-ts-angular/src/client/core/params.gen.ts b/examples/openapi-ts-angular/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-angular/src/client/core/params.gen.ts +++ b/examples/openapi-ts-angular/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-angular/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-angular/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-angular/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-angular/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-angular/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-angular/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-angular/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-angular/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-angular/src/client/core/utils.gen.ts b/examples/openapi-ts-angular/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-angular/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-angular/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-angular/src/client/sdk.gen.ts b/examples/openapi-ts-angular/src/client/sdk.gen.ts index 1ebde1b3b3..1a29c6b67c 100644 --- a/examples/openapi-ts-angular/src/client/sdk.gen.ts +++ b/examples/openapi-ts-angular/src/client/sdk.gen.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -89,7 +89,9 @@ export class PetService { * * Add a new pet to the store. */ - public addPet(options: Options) { + public addPet( + options: Options, + ): RequestResult { return (options.client ?? client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -108,7 +110,7 @@ export class PetService { */ public updatePet( options: Options, - ) { + ): RequestResult { return (options.client ?? client).put({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -127,7 +129,7 @@ export class PetService { */ public findPetsByStatus( options: Options, - ) { + ): RequestResult { return (options.client ?? client).get< FindPetsByStatusResponses, FindPetsByStatusErrors, @@ -146,7 +148,7 @@ export class PetService { */ public findPetsByTags( options: Options, - ) { + ): RequestResult { return (options.client ?? client).get< FindPetsByTagsResponses, FindPetsByTagsErrors, @@ -165,7 +167,7 @@ export class PetService { */ public deletePet( options: Options, - ) { + ): RequestResult { return (options.client ?? client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/{petId}', @@ -180,7 +182,7 @@ export class PetService { */ public getPetById( options: Options, - ) { + ): RequestResult { return (options.client ?? client).get({ security: [ { name: 'api_key', type: 'apiKey' }, @@ -198,7 +200,7 @@ export class PetService { */ public updatePetWithForm( options: Options, - ) { + ): RequestResult { return (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -217,7 +219,7 @@ export class PetService { */ public uploadFile( options: Options, - ) { + ): RequestResult { return (options.client ?? client).post({ bodySerializer: null, security: [{ scheme: 'bearer', type: 'http' }], @@ -240,7 +242,7 @@ export class StoreService { */ public getInventory( options?: Options, - ) { + ): RequestResult { return (options?.client ?? client).get( { security: [{ name: 'api_key', type: 'apiKey' }], @@ -257,7 +259,7 @@ export class StoreService { */ public placeOrder( options?: Options, - ) { + ): RequestResult { return (options?.client ?? client).post({ url: '/store/order', ...options, @@ -275,7 +277,7 @@ export class StoreService { */ public deleteOrder( options: Options, - ) { + ): RequestResult { return (options.client ?? client).delete( { url: '/store/order/{orderId}', ...options }, ); @@ -288,7 +290,7 @@ export class StoreService { */ public getOrderById( options: Options, - ) { + ): RequestResult { return (options.client ?? client).get({ url: '/store/order/{orderId}', ...options, @@ -305,7 +307,7 @@ export class UserService { */ public createUser( options?: Options, - ) { + ): RequestResult { return (options?.client ?? client).post({ url: '/user', ...options, @@ -323,7 +325,11 @@ export class UserService { */ public createUsersWithListInput( options?: Options, - ) { + ): RequestResult< + CreateUsersWithListInputResponses, + CreateUsersWithListInputErrors, + ThrowOnError + > { return (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -345,7 +351,7 @@ export class UserService { */ public loginUser( options?: Options, - ) { + ): RequestResult { return (options?.client ?? client).get({ url: '/user/login', ...options, @@ -359,7 +365,7 @@ export class UserService { */ public logoutUser( options?: Options, - ) { + ): RequestResult { return (options?.client ?? client).get({ url: '/user/logout', ...options, @@ -373,7 +379,7 @@ export class UserService { */ public deleteUser( options: Options, - ) { + ): RequestResult { return (options.client ?? client).delete({ url: '/user/{username}', ...options, @@ -387,7 +393,7 @@ export class UserService { */ public getUserByName( options: Options, - ) { + ): RequestResult { return (options.client ?? client).get< GetUserByNameResponses, GetUserByNameErrors, @@ -402,7 +408,7 @@ export class UserService { */ public updateUser( options: Options, - ) { + ): RequestResult { return (options.client ?? client).put({ url: '/user/{username}', ...options, diff --git a/examples/openapi-ts-axios/openapi-ts.config.ts b/examples/openapi-ts-axios/openapi-ts.config.ts index 76edc0e08e..2611d83ab5 100644 --- a/examples/openapi-ts-axios/openapi-ts.config.ts +++ b/examples/openapi-ts-axios/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -20,3 +20,5 @@ export default defineConfig({ }, ], }); + +export default config; diff --git a/examples/openapi-ts-axios/src/App.tsx b/examples/openapi-ts-axios/src/App.tsx index 549558fdfd..4d3e0dd26a 100644 --- a/examples/openapi-ts-axios/src/App.tsx +++ b/examples/openapi-ts-axios/src/App.tsx @@ -14,7 +14,7 @@ import { Text, TextField, } from '@radix-ui/themes'; -import { useState } from 'react'; +import React, { useState } from 'react'; import { createClient } from './client/client'; import { PetSchema } from './client/schemas.gen'; @@ -44,7 +44,7 @@ localClient.instance.interceptors.request.use((config) => { return config; }); -function App() { +function App(): React.ReactNode { const [pet, setPet] = useState(); const [isRequiredNameError, setIsRequiredNameError] = useState(false); diff --git a/examples/openapi-ts-axios/src/client/client.gen.ts b/examples/openapi-ts-axios/src/client/client.gen.ts index b01c360ba3..d25225d9d6 100644 --- a/examples/openapi-ts-axios/src/client/client.gen.ts +++ b/examples/openapi-ts-axios/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseURL: 'https://petstore3.swagger.io/api/v3' }), ); diff --git a/examples/openapi-ts-axios/src/client/client/utils.gen.ts b/examples/openapi-ts-axios/src/client/client/utils.gen.ts index 837b8690af..ff959dfa79 100644 --- a/examples/openapi-ts-axios/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-axios/src/client/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -86,9 +86,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Record; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-axios/src/client/core/params.gen.ts b/examples/openapi-ts-axios/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-axios/src/client/core/params.gen.ts +++ b/examples/openapi-ts-axios/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-axios/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-axios/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-axios/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-axios/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-axios/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-axios/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-axios/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-axios/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-axios/src/client/core/utils.gen.ts b/examples/openapi-ts-axios/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-axios/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-axios/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-axios/src/client/sdk.gen.ts b/examples/openapi-ts-axios/src/client/sdk.gen.ts index 30f487e78a..97d0449989 100644 --- a/examples/openapi-ts-axios/src/client/sdk.gen.ts +++ b/examples/openapi-ts-axios/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -87,7 +87,7 @@ export type Options< */ export const addPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ responseType: 'json', security: [{ scheme: 'bearer', type: 'http' }], @@ -106,7 +106,7 @@ export const addPet = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ responseType: 'json', security: [{ scheme: 'bearer', type: 'http' }], @@ -125,7 +125,7 @@ export const updatePet = ( */ export const findPetsByStatus = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ responseType: 'json', security: [{ scheme: 'bearer', type: 'http' }], @@ -140,7 +140,7 @@ export const findPetsByStatus = ( */ export const findPetsByTags = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ responseType: 'json', security: [{ scheme: 'bearer', type: 'http' }], @@ -155,7 +155,7 @@ export const findPetsByTags = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/{petId}', @@ -169,7 +169,7 @@ export const deletePet = ( */ export const getPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ responseType: 'json', security: [ @@ -187,7 +187,7 @@ export const getPetById = ( */ export const updatePetWithForm = ( options: Options, -) => +): RequestResult => (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -206,7 +206,7 @@ export const updatePetWithForm = ( */ export const uploadFile = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ bodySerializer: null, responseType: 'json', @@ -226,7 +226,7 @@ export const uploadFile = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ responseType: 'json', security: [{ name: 'api_key', type: 'apiKey' }], @@ -241,7 +241,7 @@ export const getInventory = ( */ export const placeOrder = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/store/order', @@ -259,7 +259,7 @@ export const placeOrder = ( */ export const deleteOrder = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/store/order/{orderId}', ...options, @@ -272,7 +272,7 @@ export const deleteOrder = ( */ export const getOrderById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/store/order/{orderId}', @@ -286,7 +286,7 @@ export const getOrderById = ( */ export const createUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/user', @@ -304,7 +304,7 @@ export const createUser = ( */ export const createUsersWithListInput = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -326,7 +326,7 @@ export const createUsersWithListInput = ( */ export const loginUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/user/login', @@ -340,7 +340,7 @@ export const loginUser = ( */ export const logoutUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/logout', ...options, @@ -353,7 +353,7 @@ export const logoutUser = ( */ export const deleteUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/user/{username}', ...options, @@ -366,7 +366,7 @@ export const deleteUser = ( */ export const getUserByName = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/user/{username}', @@ -380,7 +380,7 @@ export const getUserByName = ( */ export const updateUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ url: '/user/{username}', ...options, diff --git a/examples/openapi-ts-axios/tsconfig.json b/examples/openapi-ts-axios/tsconfig.json index 04664de395..9a7cf4ceb2 100644 --- a/examples/openapi-ts-axios/tsconfig.json +++ b/examples/openapi-ts-axios/tsconfig.json @@ -10,6 +10,8 @@ "moduleResolution": "bundler", "allowImportingTsExtensions": true, "resolveJsonModule": true, + "declaration": true, + "isolatedDeclarations": true, "isolatedModules": true, "noEmit": true, "jsx": "react-jsx", diff --git a/examples/openapi-ts-fastify/openapi-ts.config.ts b/examples/openapi-ts-fastify/openapi-ts.config.ts index 34c6987cbf..29f85e6024 100644 --- a/examples/openapi-ts-fastify/openapi-ts.config.ts +++ b/examples/openapi-ts-fastify/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://gist.githubusercontent.com/seriousme/55bd4c8ba2e598e416bb5543dcd362dc/raw/cf0b86ba37bb54bf1a6bf047c0ecf2a0ce4c62e0/petstore-v3.1.json', logs: { @@ -12,3 +12,5 @@ export default defineConfig({ }, plugins: ['fastify', '@hey-api/sdk'], }); + +export default config; diff --git a/examples/openapi-ts-fastify/src/client/client.gen.ts b/examples/openapi-ts-fastify/src/client/client.gen.ts index 4aab8bcaa8..35ccb236bc 100644 --- a/examples/openapi-ts-fastify/src/client/client.gen.ts +++ b/examples/openapi-ts-fastify/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'http://petstore.swagger.io/v1' }), ); diff --git a/examples/openapi-ts-fastify/src/client/client/utils.gen.ts b/examples/openapi-ts-fastify/src/client/client/utils.gen.ts index 7800fe4b9d..0499cf988a 100644 --- a/examples/openapi-ts-fastify/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-fastify/src/client/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -121,9 +121,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-fastify/src/client/core/params.gen.ts b/examples/openapi-ts-fastify/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-fastify/src/client/core/params.gen.ts +++ b/examples/openapi-ts-fastify/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-fastify/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-fastify/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-fastify/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-fastify/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-fastify/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-fastify/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-fastify/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-fastify/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-fastify/src/client/core/utils.gen.ts b/examples/openapi-ts-fastify/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-fastify/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-fastify/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-fastify/src/client/sdk.gen.ts b/examples/openapi-ts-fastify/src/client/sdk.gen.ts index 98ce6909fd..179de0ddaf 100644 --- a/examples/openapi-ts-fastify/src/client/sdk.gen.ts +++ b/examples/openapi-ts-fastify/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { CreatePetsData, @@ -37,7 +37,7 @@ export type Options< */ export const listPets = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/pets', ...options, @@ -48,7 +48,7 @@ export const listPets = ( */ export const createPets = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/pets', ...options, @@ -59,7 +59,7 @@ export const createPets = ( */ export const showPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/pets/{petId}', ...options, diff --git a/examples/openapi-ts-fetch/openapi-ts.config.ts b/examples/openapi-ts-fetch/openapi-ts.config.ts index acb2c6549c..15ff0c5e90 100644 --- a/examples/openapi-ts-fetch/openapi-ts.config.ts +++ b/examples/openapi-ts-fetch/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -20,3 +20,5 @@ export default defineConfig({ }, ], }); + +export default config; diff --git a/examples/openapi-ts-fetch/src/App.tsx b/examples/openapi-ts-fetch/src/App.tsx index 0e73c0b40e..64cad04ced 100644 --- a/examples/openapi-ts-fetch/src/App.tsx +++ b/examples/openapi-ts-fetch/src/App.tsx @@ -14,7 +14,7 @@ import { Text, TextField, } from '@radix-ui/themes'; -import { useState } from 'react'; +import React, { useState } from 'react'; import { createClient } from './client/client'; import { PetSchema } from './client/schemas.gen'; @@ -49,7 +49,7 @@ localClient.interceptors.error.use((error) => { return error; }); -function App() { +function App(): React.ReactNode { const [pet, setPet] = useState(); const [isRequiredNameError, setIsRequiredNameError] = useState(false); diff --git a/examples/openapi-ts-fetch/src/client/client.gen.ts b/examples/openapi-ts-fetch/src/client/client.gen.ts index 84318ba67c..c0ceac20e4 100644 --- a/examples/openapi-ts-fetch/src/client/client.gen.ts +++ b/examples/openapi-ts-fetch/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3' }), ); diff --git a/examples/openapi-ts-fetch/src/client/client/utils.gen.ts b/examples/openapi-ts-fetch/src/client/client/utils.gen.ts index 7800fe4b9d..0499cf988a 100644 --- a/examples/openapi-ts-fetch/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-fetch/src/client/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -121,9 +121,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-fetch/src/client/core/params.gen.ts b/examples/openapi-ts-fetch/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-fetch/src/client/core/params.gen.ts +++ b/examples/openapi-ts-fetch/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-fetch/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-fetch/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-fetch/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-fetch/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-fetch/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-fetch/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-fetch/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-fetch/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-fetch/src/client/core/utils.gen.ts b/examples/openapi-ts-fetch/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-fetch/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-fetch/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-fetch/src/client/sdk.gen.ts b/examples/openapi-ts-fetch/src/client/sdk.gen.ts index 6010a7fc0f..984bc10439 100644 --- a/examples/openapi-ts-fetch/src/client/sdk.gen.ts +++ b/examples/openapi-ts-fetch/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -87,7 +87,7 @@ export type Options< */ export const addPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -105,7 +105,7 @@ export const addPet = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -123,7 +123,7 @@ export const updatePet = ( */ export const findPetsByStatus = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByStatus', @@ -137,7 +137,7 @@ export const findPetsByStatus = ( */ export const findPetsByTags = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByTags', @@ -151,7 +151,7 @@ export const findPetsByTags = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/{petId}', @@ -165,7 +165,7 @@ export const deletePet = ( */ export const getPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [ { name: 'api_key', type: 'apiKey' }, @@ -182,7 +182,7 @@ export const getPetById = ( */ export const updatePetWithForm = ( options: Options, -) => +): RequestResult => (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -200,7 +200,7 @@ export const updatePetWithForm = ( */ export const uploadFile = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ bodySerializer: null, security: [{ scheme: 'bearer', type: 'http' }], @@ -219,7 +219,7 @@ export const uploadFile = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ security: [{ name: 'api_key', type: 'apiKey' }], url: '/store/inventory', @@ -233,7 +233,7 @@ export const getInventory = ( */ export const placeOrder = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/store/order', ...options, @@ -250,7 +250,7 @@ export const placeOrder = ( */ export const deleteOrder = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/store/order/{orderId}', ...options, @@ -263,7 +263,7 @@ export const deleteOrder = ( */ export const getOrderById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/store/order/{orderId}', ...options, @@ -276,7 +276,7 @@ export const getOrderById = ( */ export const createUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/user', ...options, @@ -293,7 +293,7 @@ export const createUser = ( */ export const createUsersWithListInput = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -314,7 +314,7 @@ export const createUsersWithListInput = ( */ export const loginUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/login', ...options, @@ -327,7 +327,7 @@ export const loginUser = ( */ export const logoutUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/logout', ...options, @@ -340,7 +340,7 @@ export const logoutUser = ( */ export const deleteUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/user/{username}', ...options, @@ -353,7 +353,7 @@ export const deleteUser = ( */ export const getUserByName = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/user/{username}', ...options, @@ -366,7 +366,7 @@ export const getUserByName = ( */ export const updateUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ url: '/user/{username}', ...options, diff --git a/examples/openapi-ts-fetch/tsconfig.json b/examples/openapi-ts-fetch/tsconfig.json index 04664de395..9a7cf4ceb2 100644 --- a/examples/openapi-ts-fetch/tsconfig.json +++ b/examples/openapi-ts-fetch/tsconfig.json @@ -10,6 +10,8 @@ "moduleResolution": "bundler", "allowImportingTsExtensions": true, "resolveJsonModule": true, + "declaration": true, + "isolatedDeclarations": true, "isolatedModules": true, "noEmit": true, "jsx": "react-jsx", diff --git a/examples/openapi-ts-ky/openapi-ts.config.ts b/examples/openapi-ts-ky/openapi-ts.config.ts index 1e18d36ea3..6b23b2fd94 100644 --- a/examples/openapi-ts-ky/openapi-ts.config.ts +++ b/examples/openapi-ts-ky/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -20,3 +20,5 @@ export default defineConfig({ }, ], }); + +export default config; diff --git a/examples/openapi-ts-ky/src/App.tsx b/examples/openapi-ts-ky/src/App.tsx index 0e73c0b40e..64cad04ced 100644 --- a/examples/openapi-ts-ky/src/App.tsx +++ b/examples/openapi-ts-ky/src/App.tsx @@ -14,7 +14,7 @@ import { Text, TextField, } from '@radix-ui/themes'; -import { useState } from 'react'; +import React, { useState } from 'react'; import { createClient } from './client/client'; import { PetSchema } from './client/schemas.gen'; @@ -49,7 +49,7 @@ localClient.interceptors.error.use((error) => { return error; }); -function App() { +function App(): React.ReactNode { const [pet, setPet] = useState(); const [isRequiredNameError, setIsRequiredNameError] = useState(false); diff --git a/examples/openapi-ts-ky/src/client/client.gen.ts b/examples/openapi-ts-ky/src/client/client.gen.ts index 84318ba67c..c0ceac20e4 100644 --- a/examples/openapi-ts-ky/src/client/client.gen.ts +++ b/examples/openapi-ts-ky/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3' }), ); diff --git a/examples/openapi-ts-ky/src/client/client/utils.gen.ts b/examples/openapi-ts-ky/src/client/client/utils.gen.ts index 68fa7b2d79..154171c46f 100644 --- a/examples/openapi-ts-ky/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-ky/src/client/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -119,9 +119,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-ky/src/client/core/params.gen.ts b/examples/openapi-ts-ky/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-ky/src/client/core/params.gen.ts +++ b/examples/openapi-ts-ky/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-ky/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-ky/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-ky/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-ky/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-ky/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-ky/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-ky/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-ky/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-ky/src/client/core/utils.gen.ts b/examples/openapi-ts-ky/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-ky/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-ky/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-ky/src/client/sdk.gen.ts b/examples/openapi-ts-ky/src/client/sdk.gen.ts index 6010a7fc0f..984bc10439 100644 --- a/examples/openapi-ts-ky/src/client/sdk.gen.ts +++ b/examples/openapi-ts-ky/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -87,7 +87,7 @@ export type Options< */ export const addPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -105,7 +105,7 @@ export const addPet = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -123,7 +123,7 @@ export const updatePet = ( */ export const findPetsByStatus = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByStatus', @@ -137,7 +137,7 @@ export const findPetsByStatus = ( */ export const findPetsByTags = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByTags', @@ -151,7 +151,7 @@ export const findPetsByTags = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/{petId}', @@ -165,7 +165,7 @@ export const deletePet = ( */ export const getPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [ { name: 'api_key', type: 'apiKey' }, @@ -182,7 +182,7 @@ export const getPetById = ( */ export const updatePetWithForm = ( options: Options, -) => +): RequestResult => (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -200,7 +200,7 @@ export const updatePetWithForm = ( */ export const uploadFile = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ bodySerializer: null, security: [{ scheme: 'bearer', type: 'http' }], @@ -219,7 +219,7 @@ export const uploadFile = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ security: [{ name: 'api_key', type: 'apiKey' }], url: '/store/inventory', @@ -233,7 +233,7 @@ export const getInventory = ( */ export const placeOrder = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/store/order', ...options, @@ -250,7 +250,7 @@ export const placeOrder = ( */ export const deleteOrder = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/store/order/{orderId}', ...options, @@ -263,7 +263,7 @@ export const deleteOrder = ( */ export const getOrderById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/store/order/{orderId}', ...options, @@ -276,7 +276,7 @@ export const getOrderById = ( */ export const createUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/user', ...options, @@ -293,7 +293,7 @@ export const createUser = ( */ export const createUsersWithListInput = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -314,7 +314,7 @@ export const createUsersWithListInput = ( */ export const loginUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/login', ...options, @@ -327,7 +327,7 @@ export const loginUser = ( */ export const logoutUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/logout', ...options, @@ -340,7 +340,7 @@ export const logoutUser = ( */ export const deleteUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/user/{username}', ...options, @@ -353,7 +353,7 @@ export const deleteUser = ( */ export const getUserByName = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/user/{username}', ...options, @@ -366,7 +366,7 @@ export const getUserByName = ( */ export const updateUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ url: '/user/{username}', ...options, diff --git a/examples/openapi-ts-ky/tsconfig.json b/examples/openapi-ts-ky/tsconfig.json index 04664de395..9a7cf4ceb2 100644 --- a/examples/openapi-ts-ky/tsconfig.json +++ b/examples/openapi-ts-ky/tsconfig.json @@ -10,6 +10,8 @@ "moduleResolution": "bundler", "allowImportingTsExtensions": true, "resolveJsonModule": true, + "declaration": true, + "isolatedDeclarations": true, "isolatedModules": true, "noEmit": true, "jsx": "react-jsx", diff --git a/examples/openapi-ts-nestjs/openapi-ts.config.ts b/examples/openapi-ts-nestjs/openapi-ts.config.ts index 3c756f3f19..699457eb5c 100644 --- a/examples/openapi-ts-nestjs/openapi-ts.config.ts +++ b/examples/openapi-ts-nestjs/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: './openapi.json', logs: { path: './logs', @@ -11,3 +11,5 @@ export default defineConfig({ }, plugins: ['nestjs', '@hey-api/sdk'], }); + +export default config; diff --git a/examples/openapi-ts-nestjs/src/client/client.gen.ts b/examples/openapi-ts-nestjs/src/client/client.gen.ts index fd8ac85200..001a8d4c8f 100644 --- a/examples/openapi-ts-nestjs/src/client/client.gen.ts +++ b/examples/openapi-ts-nestjs/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'http://localhost:3000/v3' }), ); diff --git a/examples/openapi-ts-nestjs/src/client/client/utils.gen.ts b/examples/openapi-ts-nestjs/src/client/client/utils.gen.ts index 7800fe4b9d..0499cf988a 100644 --- a/examples/openapi-ts-nestjs/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-nestjs/src/client/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -121,9 +121,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-nestjs/src/client/core/params.gen.ts b/examples/openapi-ts-nestjs/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-nestjs/src/client/core/params.gen.ts +++ b/examples/openapi-ts-nestjs/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-nestjs/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-nestjs/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-nestjs/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-nestjs/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-nestjs/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-nestjs/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-nestjs/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-nestjs/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-nestjs/src/client/core/utils.gen.ts b/examples/openapi-ts-nestjs/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-nestjs/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-nestjs/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-nestjs/src/client/sdk.gen.ts b/examples/openapi-ts-nestjs/src/client/sdk.gen.ts index 22cfaf05dd..6a40a60d21 100644 --- a/examples/openapi-ts-nestjs/src/client/sdk.gen.ts +++ b/examples/openapi-ts-nestjs/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { CreatePetData, @@ -44,7 +44,7 @@ export type Options< */ export const listPets = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/pets', ...options, @@ -55,7 +55,7 @@ export const listPets = ( */ export const createPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ url: '/pets', ...options, @@ -70,7 +70,7 @@ export const createPet = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/pets/{petId}', ...options, @@ -81,7 +81,7 @@ export const deletePet = ( */ export const showPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/pets/{petId}', ...options, @@ -92,7 +92,7 @@ export const showPetById = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ url: '/pets/{petId}', ...options, @@ -107,7 +107,7 @@ export const updatePet = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/store/inventory', ...options, diff --git a/examples/openapi-ts-nestjs/src/pets/pets.controller.ts b/examples/openapi-ts-nestjs/src/pets/pets.controller.ts index c0ede9f33b..f5a6c964fa 100644 --- a/examples/openapi-ts-nestjs/src/pets/pets.controller.ts +++ b/examples/openapi-ts-nestjs/src/pets/pets.controller.ts @@ -1,7 +1,15 @@ import { Body, Controller, Get, NotFoundException, Param, Post, Query } from '@nestjs/common'; import type { PetsControllerMethods } from '../client/nestjs.gen'; -import type { CreatePetData, ListPetsData, Pet, ShowPetByIdData } from '../client/types.gen'; +import type { + CreatePetData, + CreatePetResponse, + ListPetsData, + ListPetsResponse, + Pet, + ShowPetByIdData, + ShowPetByIdResponse, +} from '../client/types.gen'; @Controller('pets') export class PetsController implements Pick< @@ -14,14 +22,14 @@ export class PetsController implements Pick< ]; @Get() - async listPets(@Query() query?: ListPetsData['query']) { + async listPets(@Query() query?: ListPetsData['query']): Promise { const limit = query?.limit ?? 20; return this.pets.slice(0, limit); } @Post() - async createPet(@Body() body: CreatePetData['body']) { + async createPet(@Body() body: CreatePetData['body']): Promise { const pet: Pet = { id: crypto.randomUUID(), name: body.name, @@ -35,7 +43,7 @@ export class PetsController implements Pick< } @Get(':petId') - async showPetById(@Param() path: ShowPetByIdData['path']) { + async showPetById(@Param() path: ShowPetByIdData['path']): Promise { const pet = this.pets.find((p) => p.id === path.petId); if (!pet) { diff --git a/examples/openapi-ts-nestjs/src/store/store.controller.ts b/examples/openapi-ts-nestjs/src/store/store.controller.ts index 7b1e3e1844..3674be4762 100644 --- a/examples/openapi-ts-nestjs/src/store/store.controller.ts +++ b/examples/openapi-ts-nestjs/src/store/store.controller.ts @@ -1,11 +1,12 @@ import { Controller, Get } from '@nestjs/common'; import type { StoreControllerMethods } from '../client/nestjs.gen'; +import type { GetInventoryResponse } from '../client/types.gen'; @Controller('store') export class StoreController implements Pick { @Get('inventory') - async getInventory() { + async getInventory(): Promise { return { available: 10, pending: 3, diff --git a/examples/openapi-ts-nestjs/tsconfig.json b/examples/openapi-ts-nestjs/tsconfig.json index d44925e95e..9993b8359e 100644 --- a/examples/openapi-ts-nestjs/tsconfig.json +++ b/examples/openapi-ts-nestjs/tsconfig.json @@ -23,6 +23,8 @@ "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "forceConsistentCasingInFileNames": true, + "declaration": true, + "isolatedDeclarations": true, "isolatedModules": true }, "references": [{ "path": "./tsconfig.node.json" }] diff --git a/examples/openapi-ts-next/app/layout.tsx b/examples/openapi-ts-next/app/layout.tsx index 25e0731666..56097db5f1 100644 --- a/examples/openapi-ts-next/app/layout.tsx +++ b/examples/openapi-ts-next/app/layout.tsx @@ -33,7 +33,7 @@ export default function RootLayout({ children, }: Readonly<{ children: React.ReactNode; -}>) { +}>): React.ReactNode { return ( {children} diff --git a/examples/openapi-ts-next/app/page.tsx b/examples/openapi-ts-next/app/page.tsx index c2701fcd27..4eb4e83c72 100644 --- a/examples/openapi-ts-next/app/page.tsx +++ b/examples/openapi-ts-next/app/page.tsx @@ -7,7 +7,7 @@ import { useEffect, useState } from 'react'; import { getPetById } from '@/src/client/sdk.gen'; import type { Pet } from '@/src/client/types.gen'; -export default function Home() { +export default function Home(): React.ReactNode { const [pet, setPet] = useState(); const [petId, setPetId] = useState(8); diff --git a/examples/openapi-ts-next/app/pet/[id]/page.tsx b/examples/openapi-ts-next/app/pet/[id]/page.tsx index 4059d32a08..8d31b78555 100644 --- a/examples/openapi-ts-next/app/pet/[id]/page.tsx +++ b/examples/openapi-ts-next/app/pet/[id]/page.tsx @@ -23,7 +23,11 @@ async function getPet(id: string) { return pet; } -export async function generateMetadata({ params }: { params: Promise<{ id: string }> }) { +export async function generateMetadata({ + params, +}: { + params: Promise<{ id: string }>; +}): Promise<{ name: string }> { const { id } = await params; const pet = await getPet(id); return { @@ -31,7 +35,11 @@ export async function generateMetadata({ params }: { params: Promise<{ id: strin }; } -export default async function Blog({ params }: { params: Promise<{ id: string }> }) { +export default async function Blog({ + params, +}: { + params: Promise<{ id: string }>; +}): Promise { const { id } = await params; const pet = await getPet(id); diff --git a/examples/openapi-ts-next/openapi-ts.config.ts b/examples/openapi-ts-next/openapi-ts.config.ts index fa98f49052..4fce66e18a 100644 --- a/examples/openapi-ts-next/openapi-ts.config.ts +++ b/examples/openapi-ts-next/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -22,3 +22,5 @@ export default defineConfig({ }, ], }); + +export default config; diff --git a/examples/openapi-ts-next/src/client/client.gen.ts b/examples/openapi-ts-next/src/client/client.gen.ts index 9085c3bc78..1ef82f154d 100644 --- a/examples/openapi-ts-next/src/client/client.gen.ts +++ b/examples/openapi-ts-next/src/client/client.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { createClientConfig } from '../hey-api'; -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -16,7 +16,7 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createClientConfig( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3' }), ), diff --git a/examples/openapi-ts-next/src/client/client/utils.gen.ts b/examples/openapi-ts-next/src/client/client/utils.gen.ts index c1b9c44b9f..9d8699889c 100644 --- a/examples/openapi-ts-next/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-next/src/client/client/utils.gen.ts @@ -91,8 +91,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,9 +198,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } @@ -256,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/examples/openapi-ts-next/src/client/core/params.gen.ts b/examples/openapi-ts-next/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-next/src/client/core/params.gen.ts +++ b/examples/openapi-ts-next/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-next/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-next/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-next/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-next/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-next/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-next/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-next/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-next/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-next/src/client/core/utils.gen.ts b/examples/openapi-ts-next/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-next/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-next/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-next/src/client/sdk.gen.ts b/examples/openapi-ts-next/src/client/sdk.gen.ts index 6010a7fc0f..984bc10439 100644 --- a/examples/openapi-ts-next/src/client/sdk.gen.ts +++ b/examples/openapi-ts-next/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -87,7 +87,7 @@ export type Options< */ export const addPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -105,7 +105,7 @@ export const addPet = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -123,7 +123,7 @@ export const updatePet = ( */ export const findPetsByStatus = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByStatus', @@ -137,7 +137,7 @@ export const findPetsByStatus = ( */ export const findPetsByTags = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByTags', @@ -151,7 +151,7 @@ export const findPetsByTags = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/{petId}', @@ -165,7 +165,7 @@ export const deletePet = ( */ export const getPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [ { name: 'api_key', type: 'apiKey' }, @@ -182,7 +182,7 @@ export const getPetById = ( */ export const updatePetWithForm = ( options: Options, -) => +): RequestResult => (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -200,7 +200,7 @@ export const updatePetWithForm = ( */ export const uploadFile = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ bodySerializer: null, security: [{ scheme: 'bearer', type: 'http' }], @@ -219,7 +219,7 @@ export const uploadFile = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ security: [{ name: 'api_key', type: 'apiKey' }], url: '/store/inventory', @@ -233,7 +233,7 @@ export const getInventory = ( */ export const placeOrder = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/store/order', ...options, @@ -250,7 +250,7 @@ export const placeOrder = ( */ export const deleteOrder = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/store/order/{orderId}', ...options, @@ -263,7 +263,7 @@ export const deleteOrder = ( */ export const getOrderById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/store/order/{orderId}', ...options, @@ -276,7 +276,7 @@ export const getOrderById = ( */ export const createUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/user', ...options, @@ -293,7 +293,7 @@ export const createUser = ( */ export const createUsersWithListInput = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -314,7 +314,7 @@ export const createUsersWithListInput = ( */ export const loginUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/login', ...options, @@ -327,7 +327,7 @@ export const loginUser = ( */ export const logoutUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/logout', ...options, @@ -340,7 +340,7 @@ export const logoutUser = ( */ export const deleteUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/user/{username}', ...options, @@ -353,7 +353,7 @@ export const deleteUser = ( */ export const getUserByName = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/user/{username}', ...options, @@ -366,7 +366,7 @@ export const getUserByName = ( */ export const updateUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ url: '/user/{username}', ...options, diff --git a/examples/openapi-ts-next/tailwind.config.ts b/examples/openapi-ts-next/tailwind.config.ts index f8122ad918..974a73028e 100644 --- a/examples/openapi-ts-next/tailwind.config.ts +++ b/examples/openapi-ts-next/tailwind.config.ts @@ -1,6 +1,6 @@ import type { Config } from 'tailwindcss'; -export default { +const config: Config = { content: [ './pages/**/*.{js,ts,jsx,tsx,mdx}', './components/**/*.{js,ts,jsx,tsx,mdx}', @@ -14,4 +14,6 @@ export default { }, }, }, -} satisfies Config; +}; + +export default config; diff --git a/examples/openapi-ts-next/tsconfig.json b/examples/openapi-ts-next/tsconfig.json index d8b93235f2..a6b124eeaf 100644 --- a/examples/openapi-ts-next/tsconfig.json +++ b/examples/openapi-ts-next/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "target": "ES2017", "lib": ["dom", "dom.iterable", "esnext"], - "allowJs": true, + "allowJs": false, "skipLibCheck": true, "strict": true, "noEmit": true, @@ -10,6 +10,8 @@ "module": "esnext", "moduleResolution": "bundler", "resolveJsonModule": true, + "declaration": true, + "isolatedDeclarations": true, "isolatedModules": true, "jsx": "preserve", "incremental": true, diff --git a/examples/openapi-ts-ofetch/openapi-ts.config.ts b/examples/openapi-ts-ofetch/openapi-ts.config.ts index b1ac7ed69b..d6462a8f7a 100644 --- a/examples/openapi-ts-ofetch/openapi-ts.config.ts +++ b/examples/openapi-ts-ofetch/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -20,3 +20,5 @@ export default defineConfig({ }, ], }); + +export default config; diff --git a/examples/openapi-ts-ofetch/src/client/client.gen.ts b/examples/openapi-ts-ofetch/src/client/client.gen.ts index 84318ba67c..c0ceac20e4 100644 --- a/examples/openapi-ts-ofetch/src/client/client.gen.ts +++ b/examples/openapi-ts-ofetch/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3' }), ); diff --git a/examples/openapi-ts-ofetch/src/client/client/utils.gen.ts b/examples/openapi-ts-ofetch/src/client/client/utils.gen.ts index 06bcad1bdc..4a14d746f5 100644 --- a/examples/openapi-ts-ofetch/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-ofetch/src/client/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -152,9 +152,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-ofetch/src/client/core/params.gen.ts b/examples/openapi-ts-ofetch/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-ofetch/src/client/core/params.gen.ts +++ b/examples/openapi-ts-ofetch/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-ofetch/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-ofetch/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-ofetch/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-ofetch/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-ofetch/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-ofetch/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-ofetch/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-ofetch/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-ofetch/src/client/core/utils.gen.ts b/examples/openapi-ts-ofetch/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-ofetch/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-ofetch/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-ofetch/src/client/sdk.gen.ts b/examples/openapi-ts-ofetch/src/client/sdk.gen.ts index 6010a7fc0f..984bc10439 100644 --- a/examples/openapi-ts-ofetch/src/client/sdk.gen.ts +++ b/examples/openapi-ts-ofetch/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -87,7 +87,7 @@ export type Options< */ export const addPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -105,7 +105,7 @@ export const addPet = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -123,7 +123,7 @@ export const updatePet = ( */ export const findPetsByStatus = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByStatus', @@ -137,7 +137,7 @@ export const findPetsByStatus = ( */ export const findPetsByTags = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByTags', @@ -151,7 +151,7 @@ export const findPetsByTags = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/{petId}', @@ -165,7 +165,7 @@ export const deletePet = ( */ export const getPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [ { name: 'api_key', type: 'apiKey' }, @@ -182,7 +182,7 @@ export const getPetById = ( */ export const updatePetWithForm = ( options: Options, -) => +): RequestResult => (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -200,7 +200,7 @@ export const updatePetWithForm = ( */ export const uploadFile = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ bodySerializer: null, security: [{ scheme: 'bearer', type: 'http' }], @@ -219,7 +219,7 @@ export const uploadFile = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ security: [{ name: 'api_key', type: 'apiKey' }], url: '/store/inventory', @@ -233,7 +233,7 @@ export const getInventory = ( */ export const placeOrder = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/store/order', ...options, @@ -250,7 +250,7 @@ export const placeOrder = ( */ export const deleteOrder = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/store/order/{orderId}', ...options, @@ -263,7 +263,7 @@ export const deleteOrder = ( */ export const getOrderById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/store/order/{orderId}', ...options, @@ -276,7 +276,7 @@ export const getOrderById = ( */ export const createUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/user', ...options, @@ -293,7 +293,7 @@ export const createUser = ( */ export const createUsersWithListInput = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -314,7 +314,7 @@ export const createUsersWithListInput = ( */ export const loginUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/login', ...options, @@ -327,7 +327,7 @@ export const loginUser = ( */ export const logoutUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/logout', ...options, @@ -340,7 +340,7 @@ export const logoutUser = ( */ export const deleteUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/user/{username}', ...options, @@ -353,7 +353,7 @@ export const deleteUser = ( */ export const getUserByName = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/user/{username}', ...options, @@ -366,7 +366,7 @@ export const getUserByName = ( */ export const updateUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ url: '/user/{username}', ...options, diff --git a/examples/openapi-ts-openai/openapi-ts.config.ts b/examples/openapi-ts-openai/openapi-ts.config.ts index 5075c5efee..386c82820b 100644 --- a/examples/openapi-ts-openai/openapi-ts.config.ts +++ b/examples/openapi-ts-openai/openapi-ts.config.ts @@ -1,8 +1,8 @@ import path from 'node:path'; -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: path.resolve('..', '..', 'specs', '3.1.x', 'openai.yaml'), logs: { path: './logs', @@ -23,3 +23,5 @@ export default defineConfig({ }, ], }); + +export default config; diff --git a/examples/openapi-ts-openai/src/App.tsx b/examples/openapi-ts-openai/src/App.tsx index c83afe9921..8f15cd0854 100644 --- a/examples/openapi-ts-openai/src/App.tsx +++ b/examples/openapi-ts-openai/src/App.tsx @@ -4,7 +4,7 @@ import * as Form from '@radix-ui/react-form'; import { PlusIcon } from '@radix-ui/react-icons'; import { Box, Button, Container, Flex, Heading, Section, TextField } from '@radix-ui/themes'; import OpenAI from 'openai'; -import { useState } from 'react'; +import React, { useState } from 'react'; import { client as baseClient } from './client/client.gen'; import { OpenAi } from './client/sdk.gen'; @@ -24,7 +24,7 @@ const client = new OpenAi({ client: baseClient, }); -function App() { +function App(): React.ReactNode { const [isRequiredNameError] = useState(false); const onCreateResponse = async (values: FormData) => { diff --git a/examples/openapi-ts-openai/src/client/client.gen.ts b/examples/openapi-ts-openai/src/client/client.gen.ts index 61a6958eea..13711423af 100644 --- a/examples/openapi-ts-openai/src/client/client.gen.ts +++ b/examples/openapi-ts-openai/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://api.openai.com/v1' }), ); diff --git a/examples/openapi-ts-openai/src/client/client/utils.gen.ts b/examples/openapi-ts-openai/src/client/client/utils.gen.ts index 7800fe4b9d..0499cf988a 100644 --- a/examples/openapi-ts-openai/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-openai/src/client/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -121,9 +121,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-openai/src/client/core/params.gen.ts b/examples/openapi-ts-openai/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-openai/src/client/core/params.gen.ts +++ b/examples/openapi-ts-openai/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-openai/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-openai/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-openai/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-openai/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-openai/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-openai/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-openai/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-openai/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-openai/src/client/core/utils.gen.ts b/examples/openapi-ts-openai/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-openai/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-openai/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-openai/src/client/sdk.gen.ts b/examples/openapi-ts-openai/src/client/sdk.gen.ts index f5912d61eb..c47a9d2c9e 100644 --- a/examples/openapi-ts-openai/src/client/sdk.gen.ts +++ b/examples/openapi-ts-openai/src/client/sdk.gen.ts @@ -4,6 +4,7 @@ import { type Client, formDataBodySerializer, type Options as Options2, + type RequestResult, type TDataShape, } from './client'; import { client } from './client.gen'; @@ -393,7 +394,7 @@ class HeyApiRegistry { } export class OpenAi extends HeyApiClient { - public static readonly __registry = new HeyApiRegistry(); + public static readonly __registry: HeyApiRegistry = new HeyApiRegistry(); constructor(args?: { client?: Client; key?: string }) { super(args); @@ -407,7 +408,7 @@ export class OpenAi extends HeyApiClient { */ public listAssistants( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/assistants', @@ -422,7 +423,7 @@ export class OpenAi extends HeyApiClient { */ public createAssistant( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/assistants', @@ -441,7 +442,7 @@ export class OpenAi extends HeyApiClient { */ public deleteAssistant( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/assistants/{assistant_id}', @@ -456,7 +457,7 @@ export class OpenAi extends HeyApiClient { */ public getAssistant( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/assistants/{assistant_id}', @@ -471,7 +472,7 @@ export class OpenAi extends HeyApiClient { */ public modifyAssistant( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/assistants/{assistant_id}', @@ -490,7 +491,7 @@ export class OpenAi extends HeyApiClient { */ public createSpeech( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/audio/speech', @@ -509,7 +510,7 @@ export class OpenAi extends HeyApiClient { */ public createTranscription( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateTranscriptionResponses, unknown, @@ -533,7 +534,7 @@ export class OpenAi extends HeyApiClient { */ public createTranslation( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ ...formDataBodySerializer, security: [{ scheme: 'bearer', type: 'http' }], @@ -553,7 +554,7 @@ export class OpenAi extends HeyApiClient { */ public listBatches( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/batches', @@ -568,7 +569,7 @@ export class OpenAi extends HeyApiClient { */ public createBatch( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/batches', @@ -587,7 +588,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveBatch( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/batches/{batch_id}', @@ -602,7 +603,7 @@ export class OpenAi extends HeyApiClient { */ public cancelBatch( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/batches/{batch_id}/cancel', @@ -619,7 +620,7 @@ export class OpenAi extends HeyApiClient { */ public listChatCompletions( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get< ListChatCompletionsResponses, unknown, @@ -653,7 +654,7 @@ export class OpenAi extends HeyApiClient { */ public createChatCompletion( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateChatCompletionResponses, unknown, @@ -678,7 +679,7 @@ export class OpenAi extends HeyApiClient { */ public deleteChatCompletion( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteChatCompletionResponses, unknown, @@ -699,7 +700,7 @@ export class OpenAi extends HeyApiClient { */ public getChatCompletion( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/chat/completions/{completion_id}', @@ -717,7 +718,7 @@ export class OpenAi extends HeyApiClient { */ public updateChatCompletion( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< UpdateChatCompletionResponses, unknown, @@ -743,7 +744,7 @@ export class OpenAi extends HeyApiClient { */ public getChatCompletionMessages( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< GetChatCompletionMessagesResponses, unknown, @@ -762,7 +763,7 @@ export class OpenAi extends HeyApiClient { */ public createCompletion( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/completions', @@ -781,7 +782,7 @@ export class OpenAi extends HeyApiClient { */ public listContainers( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/containers', @@ -796,7 +797,7 @@ export class OpenAi extends HeyApiClient { */ public createContainer( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/containers', @@ -815,7 +816,7 @@ export class OpenAi extends HeyApiClient { */ public deleteContainer( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/containers/{container_id}', @@ -830,7 +831,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveContainer( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/containers/{container_id}', @@ -845,7 +846,7 @@ export class OpenAi extends HeyApiClient { */ public listContainerFiles( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/containers/{container_id}/files', @@ -863,7 +864,7 @@ export class OpenAi extends HeyApiClient { */ public createContainerFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateContainerFileResponses, unknown, @@ -887,7 +888,7 @@ export class OpenAi extends HeyApiClient { */ public deleteContainerFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteContainerFileResponses, unknown, @@ -906,7 +907,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveContainerFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< RetrieveContainerFileResponses, unknown, @@ -925,7 +926,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveContainerFileContent( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< RetrieveContainerFileContentResponses, unknown, @@ -944,7 +945,7 @@ export class OpenAi extends HeyApiClient { */ public createEmbedding( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/embeddings', @@ -964,7 +965,7 @@ export class OpenAi extends HeyApiClient { */ public listEvals( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/evals', @@ -982,7 +983,7 @@ export class OpenAi extends HeyApiClient { */ public createEval( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/evals', @@ -1002,7 +1003,7 @@ export class OpenAi extends HeyApiClient { */ public deleteEval( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteEvalResponses, DeleteEvalErrors, @@ -1022,7 +1023,7 @@ export class OpenAi extends HeyApiClient { */ public getEval( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/evals/{eval_id}', @@ -1038,7 +1039,7 @@ export class OpenAi extends HeyApiClient { */ public updateEval( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/evals/{eval_id}', @@ -1058,7 +1059,7 @@ export class OpenAi extends HeyApiClient { */ public getEvalRuns( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/evals/{eval_id}/runs', @@ -1074,7 +1075,7 @@ export class OpenAi extends HeyApiClient { */ public createEvalRun( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateEvalRunResponses, CreateEvalRunErrors, @@ -1098,7 +1099,7 @@ export class OpenAi extends HeyApiClient { */ public deleteEvalRun( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteEvalRunResponses, DeleteEvalRunErrors, @@ -1118,7 +1119,7 @@ export class OpenAi extends HeyApiClient { */ public getEvalRun( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/evals/{eval_id}/runs/{run_id}', @@ -1134,7 +1135,7 @@ export class OpenAi extends HeyApiClient { */ public cancelEvalRun( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/evals/{eval_id}/runs/{run_id}', @@ -1150,7 +1151,7 @@ export class OpenAi extends HeyApiClient { */ public getEvalRunOutputItems( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< GetEvalRunOutputItemsResponses, unknown, @@ -1170,7 +1171,7 @@ export class OpenAi extends HeyApiClient { */ public getEvalRunOutputItem( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< GetEvalRunOutputItemResponses, unknown, @@ -1189,7 +1190,7 @@ export class OpenAi extends HeyApiClient { */ public listFiles( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/files', @@ -1213,7 +1214,7 @@ export class OpenAi extends HeyApiClient { */ public createFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ ...formDataBodySerializer, security: [{ scheme: 'bearer', type: 'http' }], @@ -1233,7 +1234,7 @@ export class OpenAi extends HeyApiClient { */ public deleteFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/files/{file_id}', @@ -1248,7 +1249,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/files/{file_id}', @@ -1263,7 +1264,7 @@ export class OpenAi extends HeyApiClient { */ public downloadFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/files/{file_id}/content', @@ -1279,7 +1280,7 @@ export class OpenAi extends HeyApiClient { */ public runGrader( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/fine_tuning/alpha/graders/run', @@ -1299,7 +1300,7 @@ export class OpenAi extends HeyApiClient { */ public validateGrader( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/fine_tuning/alpha/graders/validate', @@ -1321,7 +1322,7 @@ export class OpenAi extends HeyApiClient { */ public listFineTuningCheckpointPermissions( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< ListFineTuningCheckpointPermissionsResponses, unknown, @@ -1343,7 +1344,7 @@ export class OpenAi extends HeyApiClient { */ public createFineTuningCheckpointPermission( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateFineTuningCheckpointPermissionResponses, unknown, @@ -1369,7 +1370,7 @@ export class OpenAi extends HeyApiClient { */ public deleteFineTuningCheckpointPermission( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteFineTuningCheckpointPermissionResponses, unknown, @@ -1389,7 +1390,7 @@ export class OpenAi extends HeyApiClient { */ public listPaginatedFineTuningJobs( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get< ListPaginatedFineTuningJobsResponses, unknown, @@ -1413,7 +1414,7 @@ export class OpenAi extends HeyApiClient { */ public createFineTuningJob( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateFineTuningJobResponses, unknown, @@ -1439,7 +1440,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveFineTuningJob( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< RetrieveFineTuningJobResponses, unknown, @@ -1459,7 +1460,7 @@ export class OpenAi extends HeyApiClient { */ public cancelFineTuningJob( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CancelFineTuningJobResponses, unknown, @@ -1479,7 +1480,7 @@ export class OpenAi extends HeyApiClient { */ public listFineTuningJobCheckpoints( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< ListFineTuningJobCheckpointsResponses, unknown, @@ -1499,7 +1500,7 @@ export class OpenAi extends HeyApiClient { */ public listFineTuningEvents( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< ListFineTuningEventsResponses, unknown, @@ -1519,7 +1520,7 @@ export class OpenAi extends HeyApiClient { */ public pauseFineTuningJob( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post( { security: [{ scheme: 'bearer', type: 'http' }], @@ -1537,7 +1538,7 @@ export class OpenAi extends HeyApiClient { */ public resumeFineTuningJob( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< ResumeFineTuningJobResponses, unknown, @@ -1556,7 +1557,7 @@ export class OpenAi extends HeyApiClient { */ public createImageEdit( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ ...formDataBodySerializer, security: [{ scheme: 'bearer', type: 'http' }], @@ -1577,7 +1578,7 @@ export class OpenAi extends HeyApiClient { */ public createImage( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/images/generations', @@ -1596,7 +1597,7 @@ export class OpenAi extends HeyApiClient { */ public createImageVariation( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateImageVariationResponses, unknown, @@ -1620,7 +1621,7 @@ export class OpenAi extends HeyApiClient { */ public listModels( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/models', @@ -1635,7 +1636,7 @@ export class OpenAi extends HeyApiClient { */ public deleteModel( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/models/{model}', @@ -1650,7 +1651,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveModel( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/models/{model}', @@ -1667,7 +1668,7 @@ export class OpenAi extends HeyApiClient { */ public createModeration( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/moderations', @@ -1686,7 +1687,7 @@ export class OpenAi extends HeyApiClient { */ public adminApiKeysList( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/admin_api_keys', @@ -1701,7 +1702,7 @@ export class OpenAi extends HeyApiClient { */ public adminApiKeysCreate( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post( { security: [{ scheme: 'bearer', type: 'http' }], @@ -1722,7 +1723,7 @@ export class OpenAi extends HeyApiClient { */ public adminApiKeysDelete( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< AdminApiKeysDeleteResponses, unknown, @@ -1741,7 +1742,7 @@ export class OpenAi extends HeyApiClient { */ public adminApiKeysGet( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/admin_api_keys/{key_id}', @@ -1756,7 +1757,7 @@ export class OpenAi extends HeyApiClient { */ public listAuditLogs( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ querySerializer: { parameters: { effective_at: { object: { style: 'form' } } } }, security: [{ scheme: 'bearer', type: 'http' }], @@ -1772,7 +1773,7 @@ export class OpenAi extends HeyApiClient { */ public listOrganizationCertificates( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get< ListOrganizationCertificatesResponses, unknown, @@ -1794,7 +1795,7 @@ export class OpenAi extends HeyApiClient { */ public uploadCertificate( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/certificates', @@ -1816,7 +1817,7 @@ export class OpenAi extends HeyApiClient { */ public activateOrganizationCertificates( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< ActivateOrganizationCertificatesResponses, unknown, @@ -1842,7 +1843,7 @@ export class OpenAi extends HeyApiClient { */ public deactivateOrganizationCertificates( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< DeactivateOrganizationCertificatesResponses, unknown, @@ -1868,7 +1869,7 @@ export class OpenAi extends HeyApiClient { */ public deleteCertificate( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).delete< DeleteCertificateResponses, unknown, @@ -1890,7 +1891,7 @@ export class OpenAi extends HeyApiClient { */ public getCertificate( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/certificates/{certificate_id}', @@ -1906,7 +1907,7 @@ export class OpenAi extends HeyApiClient { */ public modifyCertificate( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/certificates/{certificate_id}', @@ -1925,7 +1926,7 @@ export class OpenAi extends HeyApiClient { */ public usageCosts( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/costs', @@ -1940,7 +1941,7 @@ export class OpenAi extends HeyApiClient { */ public listInvites( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/invites', @@ -1955,7 +1956,7 @@ export class OpenAi extends HeyApiClient { */ public inviteUser( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/invites', @@ -1974,7 +1975,7 @@ export class OpenAi extends HeyApiClient { */ public deleteInvite( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/invites/{invite_id}', @@ -1989,7 +1990,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveInvite( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/invites/{invite_id}', @@ -2004,7 +2005,7 @@ export class OpenAi extends HeyApiClient { */ public listProjects( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/projects', @@ -2019,7 +2020,7 @@ export class OpenAi extends HeyApiClient { */ public createProject( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/projects', @@ -2038,7 +2039,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveProject( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/projects/{project_id}', @@ -2053,7 +2054,7 @@ export class OpenAi extends HeyApiClient { */ public modifyProject( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< ModifyProjectResponses, ModifyProjectErrors, @@ -2076,7 +2077,7 @@ export class OpenAi extends HeyApiClient { */ public listProjectApiKeys( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/projects/{project_id}/api_keys', @@ -2091,7 +2092,7 @@ export class OpenAi extends HeyApiClient { */ public deleteProjectApiKey( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteProjectApiKeyResponses, DeleteProjectApiKeyErrors, @@ -2110,7 +2111,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveProjectApiKey( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< RetrieveProjectApiKeyResponses, unknown, @@ -2129,7 +2130,7 @@ export class OpenAi extends HeyApiClient { */ public archiveProject( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/projects/{project_id}/archive', @@ -2144,7 +2145,7 @@ export class OpenAi extends HeyApiClient { */ public listProjectCertificates( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< ListProjectCertificatesResponses, unknown, @@ -2166,7 +2167,7 @@ export class OpenAi extends HeyApiClient { */ public activateProjectCertificates( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< ActivateProjectCertificatesResponses, unknown, @@ -2191,7 +2192,7 @@ export class OpenAi extends HeyApiClient { */ public deactivateProjectCertificates( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< DeactivateProjectCertificatesResponses, unknown, @@ -2214,7 +2215,7 @@ export class OpenAi extends HeyApiClient { */ public listProjectRateLimits( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< ListProjectRateLimitsResponses, unknown, @@ -2233,7 +2234,7 @@ export class OpenAi extends HeyApiClient { */ public updateProjectRateLimits( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< UpdateProjectRateLimitsResponses, UpdateProjectRateLimitsErrors, @@ -2256,7 +2257,11 @@ export class OpenAi extends HeyApiClient { */ public listProjectServiceAccounts( options: Options, - ) { + ): RequestResult< + ListProjectServiceAccountsResponses, + ListProjectServiceAccountsErrors, + ThrowOnError + > { return (options.client ?? this.client).get< ListProjectServiceAccountsResponses, ListProjectServiceAccountsErrors, @@ -2275,7 +2280,11 @@ export class OpenAi extends HeyApiClient { */ public createProjectServiceAccount( options: Options, - ) { + ): RequestResult< + CreateProjectServiceAccountResponses, + CreateProjectServiceAccountErrors, + ThrowOnError + > { return (options.client ?? this.client).post< CreateProjectServiceAccountResponses, CreateProjectServiceAccountErrors, @@ -2298,7 +2307,7 @@ export class OpenAi extends HeyApiClient { */ public deleteProjectServiceAccount( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteProjectServiceAccountResponses, unknown, @@ -2317,7 +2326,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveProjectServiceAccount( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< RetrieveProjectServiceAccountResponses, unknown, @@ -2336,7 +2345,7 @@ export class OpenAi extends HeyApiClient { */ public listProjectUsers( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< ListProjectUsersResponses, ListProjectUsersErrors, @@ -2355,7 +2364,7 @@ export class OpenAi extends HeyApiClient { */ public createProjectUser( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateProjectUserResponses, CreateProjectUserErrors, @@ -2378,7 +2387,7 @@ export class OpenAi extends HeyApiClient { */ public deleteProjectUser( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteProjectUserResponses, DeleteProjectUserErrors, @@ -2397,7 +2406,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveProjectUser( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get( { security: [{ scheme: 'bearer', type: 'http' }], @@ -2414,7 +2423,7 @@ export class OpenAi extends HeyApiClient { */ public modifyProjectUser( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< ModifyProjectUserResponses, ModifyProjectUserErrors, @@ -2437,7 +2446,7 @@ export class OpenAi extends HeyApiClient { */ public usageAudioSpeeches( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/usage/audio_speeches', @@ -2452,7 +2461,7 @@ export class OpenAi extends HeyApiClient { */ public usageAudioTranscriptions( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< UsageAudioTranscriptionsResponses, unknown, @@ -2471,7 +2480,7 @@ export class OpenAi extends HeyApiClient { */ public usageCodeInterpreterSessions( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< UsageCodeInterpreterSessionsResponses, unknown, @@ -2490,7 +2499,7 @@ export class OpenAi extends HeyApiClient { */ public usageCompletions( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/usage/completions', @@ -2505,7 +2514,7 @@ export class OpenAi extends HeyApiClient { */ public usageEmbeddings( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/usage/embeddings', @@ -2520,7 +2529,7 @@ export class OpenAi extends HeyApiClient { */ public usageImages( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/usage/images', @@ -2535,7 +2544,7 @@ export class OpenAi extends HeyApiClient { */ public usageModerations( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/usage/moderations', @@ -2550,7 +2559,7 @@ export class OpenAi extends HeyApiClient { */ public usageVectorStores( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/usage/vector_stores', @@ -2565,7 +2574,7 @@ export class OpenAi extends HeyApiClient { */ public listUsers( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/users', @@ -2580,7 +2589,7 @@ export class OpenAi extends HeyApiClient { */ public deleteUser( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/users/{user_id}', @@ -2595,7 +2604,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveUser( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/users/{user_id}', @@ -2610,7 +2619,7 @@ export class OpenAi extends HeyApiClient { */ public modifyUser( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/organization/users/{user_id}', @@ -2636,7 +2645,7 @@ export class OpenAi extends HeyApiClient { */ public createRealtimeSession( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateRealtimeSessionResponses, unknown, @@ -2666,7 +2675,7 @@ export class OpenAi extends HeyApiClient { */ public createRealtimeTranscriptionSession( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateRealtimeTranscriptionSessionResponses, unknown, @@ -2696,7 +2705,7 @@ export class OpenAi extends HeyApiClient { */ public createResponse( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/responses', @@ -2716,7 +2725,7 @@ export class OpenAi extends HeyApiClient { */ public deleteResponse( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteResponseResponses, DeleteResponseErrors, @@ -2736,7 +2745,7 @@ export class OpenAi extends HeyApiClient { */ public getResponse( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/responses/{response_id}', @@ -2754,7 +2763,7 @@ export class OpenAi extends HeyApiClient { */ public cancelResponse( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CancelResponseResponses, CancelResponseErrors, @@ -2773,7 +2782,7 @@ export class OpenAi extends HeyApiClient { */ public listInputItems( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/responses/{response_id}/input_items', @@ -2788,7 +2797,7 @@ export class OpenAi extends HeyApiClient { */ public createThread( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads', @@ -2807,7 +2816,7 @@ export class OpenAi extends HeyApiClient { */ public createThreadAndRun( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post( { security: [{ scheme: 'bearer', type: 'http' }], @@ -2828,7 +2837,7 @@ export class OpenAi extends HeyApiClient { */ public deleteThread( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}', @@ -2843,7 +2852,7 @@ export class OpenAi extends HeyApiClient { */ public getThread( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}', @@ -2858,7 +2867,7 @@ export class OpenAi extends HeyApiClient { */ public modifyThread( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}', @@ -2877,7 +2886,7 @@ export class OpenAi extends HeyApiClient { */ public listMessages( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/messages', @@ -2892,7 +2901,7 @@ export class OpenAi extends HeyApiClient { */ public createMessage( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/messages', @@ -2911,7 +2920,7 @@ export class OpenAi extends HeyApiClient { */ public deleteMessage( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/messages/{message_id}', @@ -2926,7 +2935,7 @@ export class OpenAi extends HeyApiClient { */ public getMessage( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/messages/{message_id}', @@ -2941,7 +2950,7 @@ export class OpenAi extends HeyApiClient { */ public modifyMessage( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/messages/{message_id}', @@ -2960,7 +2969,7 @@ export class OpenAi extends HeyApiClient { */ public listRuns( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/runs', @@ -2975,7 +2984,7 @@ export class OpenAi extends HeyApiClient { */ public createRun( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/runs', @@ -2992,7 +3001,9 @@ export class OpenAi extends HeyApiClient { * * Retrieves a run. */ - public getRun(options: Options) { + public getRun( + options: Options, + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/runs/{run_id}', @@ -3007,7 +3018,7 @@ export class OpenAi extends HeyApiClient { */ public modifyRun( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/runs/{run_id}', @@ -3026,7 +3037,7 @@ export class OpenAi extends HeyApiClient { */ public cancelRun( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/runs/{run_id}/cancel', @@ -3041,7 +3052,7 @@ export class OpenAi extends HeyApiClient { */ public listRunSteps( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/runs/{run_id}/steps', @@ -3056,7 +3067,7 @@ export class OpenAi extends HeyApiClient { */ public getRunStep( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/threads/{thread_id}/runs/{run_id}/steps/{step_id}', @@ -3072,7 +3083,7 @@ export class OpenAi extends HeyApiClient { */ public submitToolOuputsToRun( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< SubmitToolOuputsToRunResponses, unknown, @@ -3112,7 +3123,7 @@ export class OpenAi extends HeyApiClient { */ public createUpload( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/uploads', @@ -3132,7 +3143,7 @@ export class OpenAi extends HeyApiClient { */ public cancelUpload( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/uploads/{upload_id}/cancel', @@ -3154,7 +3165,7 @@ export class OpenAi extends HeyApiClient { */ public completeUpload( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/uploads/{upload_id}/complete', @@ -3178,7 +3189,7 @@ export class OpenAi extends HeyApiClient { */ public addUploadPart( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ ...formDataBodySerializer, security: [{ scheme: 'bearer', type: 'http' }], @@ -3198,7 +3209,7 @@ export class OpenAi extends HeyApiClient { */ public listVectorStores( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/vector_stores', @@ -3213,7 +3224,7 @@ export class OpenAi extends HeyApiClient { */ public createVectorStore( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/vector_stores', @@ -3232,7 +3243,7 @@ export class OpenAi extends HeyApiClient { */ public deleteVectorStore( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteVectorStoreResponses, unknown, @@ -3251,7 +3262,7 @@ export class OpenAi extends HeyApiClient { */ public getVectorStore( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/vector_stores/{vector_store_id}', @@ -3266,7 +3277,7 @@ export class OpenAi extends HeyApiClient { */ public modifyVectorStore( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/vector_stores/{vector_store_id}', @@ -3285,7 +3296,7 @@ export class OpenAi extends HeyApiClient { */ public createVectorStoreFileBatch( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateVectorStoreFileBatchResponses, unknown, @@ -3308,7 +3319,7 @@ export class OpenAi extends HeyApiClient { */ public getVectorStoreFileBatch( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< GetVectorStoreFileBatchResponses, unknown, @@ -3327,7 +3338,7 @@ export class OpenAi extends HeyApiClient { */ public cancelVectorStoreFileBatch( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CancelVectorStoreFileBatchResponses, unknown, @@ -3346,7 +3357,7 @@ export class OpenAi extends HeyApiClient { */ public listFilesInVectorStoreBatch( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< ListFilesInVectorStoreBatchResponses, unknown, @@ -3365,7 +3376,7 @@ export class OpenAi extends HeyApiClient { */ public listVectorStoreFiles( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< ListVectorStoreFilesResponses, unknown, @@ -3384,7 +3395,7 @@ export class OpenAi extends HeyApiClient { */ public createVectorStoreFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< CreateVectorStoreFileResponses, unknown, @@ -3407,7 +3418,7 @@ export class OpenAi extends HeyApiClient { */ public deleteVectorStoreFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteVectorStoreFileResponses, unknown, @@ -3426,7 +3437,7 @@ export class OpenAi extends HeyApiClient { */ public getVectorStoreFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/vector_stores/{vector_store_id}/files/{file_id}', @@ -3441,7 +3452,7 @@ export class OpenAi extends HeyApiClient { */ public updateVectorStoreFileAttributes( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< UpdateVectorStoreFileAttributesResponses, unknown, @@ -3464,7 +3475,7 @@ export class OpenAi extends HeyApiClient { */ public retrieveVectorStoreFileContent( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< RetrieveVectorStoreFileContentResponses, unknown, @@ -3483,7 +3494,7 @@ export class OpenAi extends HeyApiClient { */ public searchVectorStore( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/vector_stores/{vector_store_id}/search', diff --git a/examples/openapi-ts-openai/tsconfig.json b/examples/openapi-ts-openai/tsconfig.json index 04664de395..9a7cf4ceb2 100644 --- a/examples/openapi-ts-openai/tsconfig.json +++ b/examples/openapi-ts-openai/tsconfig.json @@ -10,6 +10,8 @@ "moduleResolution": "bundler", "allowImportingTsExtensions": true, "resolveJsonModule": true, + "declaration": true, + "isolatedDeclarations": true, "isolatedModules": true, "noEmit": true, "jsx": "react-jsx", diff --git a/examples/openapi-ts-pinia-colada/openapi-ts.config.ts b/examples/openapi-ts-pinia-colada/openapi-ts.config.ts index 2686ace7c9..92efabce9e 100644 --- a/examples/openapi-ts-pinia-colada/openapi-ts.config.ts +++ b/examples/openapi-ts-pinia-colada/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -25,3 +25,5 @@ export default defineConfig({ }, ], }); + +export default config; diff --git a/examples/openapi-ts-pinia-colada/src/client/client.gen.ts b/examples/openapi-ts-pinia-colada/src/client/client.gen.ts index 84318ba67c..c0ceac20e4 100644 --- a/examples/openapi-ts-pinia-colada/src/client/client.gen.ts +++ b/examples/openapi-ts-pinia-colada/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3' }), ); diff --git a/examples/openapi-ts-pinia-colada/src/client/client/utils.gen.ts b/examples/openapi-ts-pinia-colada/src/client/client/utils.gen.ts index 7800fe4b9d..0499cf988a 100644 --- a/examples/openapi-ts-pinia-colada/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-pinia-colada/src/client/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -121,9 +121,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-pinia-colada/src/client/core/params.gen.ts b/examples/openapi-ts-pinia-colada/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-pinia-colada/src/client/core/params.gen.ts +++ b/examples/openapi-ts-pinia-colada/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-pinia-colada/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-pinia-colada/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-pinia-colada/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-pinia-colada/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-pinia-colada/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-pinia-colada/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-pinia-colada/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-pinia-colada/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-pinia-colada/src/client/core/utils.gen.ts b/examples/openapi-ts-pinia-colada/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-pinia-colada/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-pinia-colada/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-pinia-colada/src/client/sdk.gen.ts b/examples/openapi-ts-pinia-colada/src/client/sdk.gen.ts index 6010a7fc0f..984bc10439 100644 --- a/examples/openapi-ts-pinia-colada/src/client/sdk.gen.ts +++ b/examples/openapi-ts-pinia-colada/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -87,7 +87,7 @@ export type Options< */ export const addPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -105,7 +105,7 @@ export const addPet = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -123,7 +123,7 @@ export const updatePet = ( */ export const findPetsByStatus = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByStatus', @@ -137,7 +137,7 @@ export const findPetsByStatus = ( */ export const findPetsByTags = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByTags', @@ -151,7 +151,7 @@ export const findPetsByTags = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/{petId}', @@ -165,7 +165,7 @@ export const deletePet = ( */ export const getPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [ { name: 'api_key', type: 'apiKey' }, @@ -182,7 +182,7 @@ export const getPetById = ( */ export const updatePetWithForm = ( options: Options, -) => +): RequestResult => (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -200,7 +200,7 @@ export const updatePetWithForm = ( */ export const uploadFile = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ bodySerializer: null, security: [{ scheme: 'bearer', type: 'http' }], @@ -219,7 +219,7 @@ export const uploadFile = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ security: [{ name: 'api_key', type: 'apiKey' }], url: '/store/inventory', @@ -233,7 +233,7 @@ export const getInventory = ( */ export const placeOrder = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/store/order', ...options, @@ -250,7 +250,7 @@ export const placeOrder = ( */ export const deleteOrder = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/store/order/{orderId}', ...options, @@ -263,7 +263,7 @@ export const deleteOrder = ( */ export const getOrderById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/store/order/{orderId}', ...options, @@ -276,7 +276,7 @@ export const getOrderById = ( */ export const createUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/user', ...options, @@ -293,7 +293,7 @@ export const createUser = ( */ export const createUsersWithListInput = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -314,7 +314,7 @@ export const createUsersWithListInput = ( */ export const loginUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/login', ...options, @@ -327,7 +327,7 @@ export const loginUser = ( */ export const logoutUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/logout', ...options, @@ -340,7 +340,7 @@ export const logoutUser = ( */ export const deleteUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/user/{username}', ...options, @@ -353,7 +353,7 @@ export const deleteUser = ( */ export const getUserByName = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/user/{username}', ...options, @@ -366,7 +366,7 @@ export const getUserByName = ( */ export const updateUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ url: '/user/{username}', ...options, diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/openapi-ts.config.ts b/examples/openapi-ts-tanstack-angular-query-experimental/openapi-ts.config.ts index 3743db4c00..2c21a22146 100644 --- a/examples/openapi-ts-tanstack-angular-query-experimental/openapi-ts.config.ts +++ b/examples/openapi-ts-tanstack-angular-query-experimental/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -24,3 +24,5 @@ export default defineConfig({ '@tanstack/angular-query-experimental', ], }); + +export default config; diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client.gen.ts index 84318ba67c..c0ceac20e4 100644 --- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client.gen.ts +++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3' }), ); diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/utils.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/utils.gen.ts index 8a905e0552..2b4b8bfc2d 100644 --- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/utils.gen.ts @@ -92,8 +92,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -179,12 +179,22 @@ export const getParseAs = ( return; }; +<<<<<<< HEAD export async function setAuthParams( options: Pick & { headers: HttpHeaders; }, ): Promise { for (const auth of options.security ?? []) { +======= +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) const token = await getAuthToken(auth, options.auth); if (!token) { @@ -239,7 +249,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/params.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/params.gen.ts +++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/utils.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/sdk.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/sdk.gen.ts index 6010a7fc0f..984bc10439 100644 --- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/sdk.gen.ts +++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -87,7 +87,7 @@ export type Options< */ export const addPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -105,7 +105,7 @@ export const addPet = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -123,7 +123,7 @@ export const updatePet = ( */ export const findPetsByStatus = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByStatus', @@ -137,7 +137,7 @@ export const findPetsByStatus = ( */ export const findPetsByTags = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByTags', @@ -151,7 +151,7 @@ export const findPetsByTags = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/{petId}', @@ -165,7 +165,7 @@ export const deletePet = ( */ export const getPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [ { name: 'api_key', type: 'apiKey' }, @@ -182,7 +182,7 @@ export const getPetById = ( */ export const updatePetWithForm = ( options: Options, -) => +): RequestResult => (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -200,7 +200,7 @@ export const updatePetWithForm = ( */ export const uploadFile = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ bodySerializer: null, security: [{ scheme: 'bearer', type: 'http' }], @@ -219,7 +219,7 @@ export const uploadFile = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ security: [{ name: 'api_key', type: 'apiKey' }], url: '/store/inventory', @@ -233,7 +233,7 @@ export const getInventory = ( */ export const placeOrder = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/store/order', ...options, @@ -250,7 +250,7 @@ export const placeOrder = ( */ export const deleteOrder = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/store/order/{orderId}', ...options, @@ -263,7 +263,7 @@ export const deleteOrder = ( */ export const getOrderById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/store/order/{orderId}', ...options, @@ -276,7 +276,7 @@ export const getOrderById = ( */ export const createUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/user', ...options, @@ -293,7 +293,7 @@ export const createUser = ( */ export const createUsersWithListInput = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -314,7 +314,7 @@ export const createUsersWithListInput = ( */ export const loginUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/login', ...options, @@ -327,7 +327,7 @@ export const loginUser = ( */ export const logoutUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/logout', ...options, @@ -340,7 +340,7 @@ export const logoutUser = ( */ export const deleteUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/user/{username}', ...options, @@ -353,7 +353,7 @@ export const deleteUser = ( */ export const getUserByName = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/user/{username}', ...options, @@ -366,7 +366,7 @@ export const getUserByName = ( */ export const updateUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ url: '/user/{username}', ...options, diff --git a/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts b/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts index ff1aa65264..4346337e23 100644 --- a/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts +++ b/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -24,3 +24,5 @@ export default defineConfig({ '@tanstack/react-query', ], }); + +export default config; diff --git a/examples/openapi-ts-tanstack-react-query/src/client/client.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/client.gen.ts index 84318ba67c..c0ceac20e4 100644 --- a/examples/openapi-ts-tanstack-react-query/src/client/client.gen.ts +++ b/examples/openapi-ts-tanstack-react-query/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3' }), ); diff --git a/examples/openapi-ts-tanstack-react-query/src/client/client/utils.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/client/utils.gen.ts index 7800fe4b9d..0499cf988a 100644 --- a/examples/openapi-ts-tanstack-react-query/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-tanstack-react-query/src/client/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -121,9 +121,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-tanstack-react-query/src/client/core/params.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-tanstack-react-query/src/client/core/params.gen.ts +++ b/examples/openapi-ts-tanstack-react-query/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-tanstack-react-query/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-tanstack-react-query/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-tanstack-react-query/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-tanstack-react-query/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-tanstack-react-query/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-tanstack-react-query/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-tanstack-react-query/src/client/core/utils.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-tanstack-react-query/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-tanstack-react-query/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-tanstack-react-query/src/client/sdk.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/sdk.gen.ts index f894ae4236..43b38c26c5 100644 --- a/examples/openapi-ts-tanstack-react-query/src/client/sdk.gen.ts +++ b/examples/openapi-ts-tanstack-react-query/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -107,7 +107,7 @@ class HeyApiRegistry { } export class Sdk extends HeyApiClient { - public static readonly __registry = new HeyApiRegistry(); + public static readonly __registry: HeyApiRegistry = new HeyApiRegistry(); constructor(args?: { client?: Client; key?: string }) { super(args); @@ -119,7 +119,9 @@ export class Sdk extends HeyApiClient { * * Add a new pet to the store. */ - public addPet(options: Options) { + public addPet( + options: Options, + ): RequestResult { return (options.client ?? this.client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -138,7 +140,7 @@ export class Sdk extends HeyApiClient { */ public updatePet( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).put({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -157,7 +159,7 @@ export class Sdk extends HeyApiClient { */ public findPetsByStatus( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< FindPetsByStatusResponses, FindPetsByStatusErrors, @@ -176,7 +178,7 @@ export class Sdk extends HeyApiClient { */ public findPetsByTags( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< FindPetsByTagsResponses, FindPetsByTagsErrors, @@ -195,7 +197,7 @@ export class Sdk extends HeyApiClient { */ public deletePet( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeletePetResponses, DeletePetErrors, @@ -214,7 +216,7 @@ export class Sdk extends HeyApiClient { */ public getPetById( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get( { security: [ @@ -234,7 +236,7 @@ export class Sdk extends HeyApiClient { */ public updatePetWithForm( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -253,7 +255,7 @@ export class Sdk extends HeyApiClient { */ public uploadFile( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).post< UploadFileResponses, UploadFileErrors, @@ -277,7 +279,7 @@ export class Sdk extends HeyApiClient { */ public getInventory( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get< GetInventoryResponses, GetInventoryErrors, @@ -296,7 +298,7 @@ export class Sdk extends HeyApiClient { */ public placeOrder( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).post< PlaceOrderResponses, PlaceOrderErrors, @@ -318,7 +320,7 @@ export class Sdk extends HeyApiClient { */ public deleteOrder( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteOrderResponses, DeleteOrderErrors, @@ -333,7 +335,7 @@ export class Sdk extends HeyApiClient { */ public getOrderById( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< GetOrderByIdResponses, GetOrderByIdErrors, @@ -348,7 +350,7 @@ export class Sdk extends HeyApiClient { */ public createUser( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).post< CreateUserResponses, CreateUserErrors, @@ -370,7 +372,11 @@ export class Sdk extends HeyApiClient { */ public createUsersWithListInput( options?: Options, - ) { + ): RequestResult< + CreateUsersWithListInputResponses, + CreateUsersWithListInputErrors, + ThrowOnError + > { return (options?.client ?? this.client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -392,7 +398,7 @@ export class Sdk extends HeyApiClient { */ public loginUser( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get({ url: '/user/login', ...options, @@ -406,7 +412,7 @@ export class Sdk extends HeyApiClient { */ public logoutUser( options?: Options, - ) { + ): RequestResult { return (options?.client ?? this.client).get< LogoutUserResponses, LogoutUserErrors, @@ -421,7 +427,7 @@ export class Sdk extends HeyApiClient { */ public deleteUser( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).delete< DeleteUserResponses, DeleteUserErrors, @@ -436,7 +442,7 @@ export class Sdk extends HeyApiClient { */ public getUserByName( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).get< GetUserByNameResponses, GetUserByNameErrors, @@ -451,7 +457,7 @@ export class Sdk extends HeyApiClient { */ public updateUser( options: Options, - ) { + ): RequestResult { return (options.client ?? this.client).put( { url: '/user/{username}', diff --git a/examples/openapi-ts-tanstack-svelte-query/openapi-ts.config.ts b/examples/openapi-ts-tanstack-svelte-query/openapi-ts.config.ts index 1b07d49449..636b2f8a87 100644 --- a/examples/openapi-ts-tanstack-svelte-query/openapi-ts.config.ts +++ b/examples/openapi-ts-tanstack-svelte-query/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -21,3 +21,5 @@ export default defineConfig({ '@tanstack/svelte-query', ], }); + +export default config; diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/client.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/client.gen.ts index 84318ba67c..c0ceac20e4 100644 --- a/examples/openapi-ts-tanstack-svelte-query/src/client/client.gen.ts +++ b/examples/openapi-ts-tanstack-svelte-query/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3' }), ); diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/client/utils.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/client/utils.gen.ts index 7800fe4b9d..0499cf988a 100644 --- a/examples/openapi-ts-tanstack-svelte-query/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-tanstack-svelte-query/src/client/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -121,9 +121,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/core/params.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-tanstack-svelte-query/src/client/core/params.gen.ts +++ b/examples/openapi-ts-tanstack-svelte-query/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-tanstack-svelte-query/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-tanstack-svelte-query/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-tanstack-svelte-query/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-tanstack-svelte-query/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/core/utils.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-tanstack-svelte-query/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-tanstack-svelte-query/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/sdk.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/sdk.gen.ts index 6010a7fc0f..984bc10439 100644 --- a/examples/openapi-ts-tanstack-svelte-query/src/client/sdk.gen.ts +++ b/examples/openapi-ts-tanstack-svelte-query/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -87,7 +87,7 @@ export type Options< */ export const addPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -105,7 +105,7 @@ export const addPet = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -123,7 +123,7 @@ export const updatePet = ( */ export const findPetsByStatus = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByStatus', @@ -137,7 +137,7 @@ export const findPetsByStatus = ( */ export const findPetsByTags = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByTags', @@ -151,7 +151,7 @@ export const findPetsByTags = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/{petId}', @@ -165,7 +165,7 @@ export const deletePet = ( */ export const getPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [ { name: 'api_key', type: 'apiKey' }, @@ -182,7 +182,7 @@ export const getPetById = ( */ export const updatePetWithForm = ( options: Options, -) => +): RequestResult => (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -200,7 +200,7 @@ export const updatePetWithForm = ( */ export const uploadFile = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ bodySerializer: null, security: [{ scheme: 'bearer', type: 'http' }], @@ -219,7 +219,7 @@ export const uploadFile = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ security: [{ name: 'api_key', type: 'apiKey' }], url: '/store/inventory', @@ -233,7 +233,7 @@ export const getInventory = ( */ export const placeOrder = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/store/order', ...options, @@ -250,7 +250,7 @@ export const placeOrder = ( */ export const deleteOrder = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/store/order/{orderId}', ...options, @@ -263,7 +263,7 @@ export const deleteOrder = ( */ export const getOrderById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/store/order/{orderId}', ...options, @@ -276,7 +276,7 @@ export const getOrderById = ( */ export const createUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/user', ...options, @@ -293,7 +293,7 @@ export const createUser = ( */ export const createUsersWithListInput = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -314,7 +314,7 @@ export const createUsersWithListInput = ( */ export const loginUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/login', ...options, @@ -327,7 +327,7 @@ export const loginUser = ( */ export const logoutUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/logout', ...options, @@ -340,7 +340,7 @@ export const logoutUser = ( */ export const deleteUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/user/{username}', ...options, @@ -353,7 +353,7 @@ export const deleteUser = ( */ export const getUserByName = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/user/{username}', ...options, @@ -366,7 +366,7 @@ export const getUserByName = ( */ export const updateUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ url: '/user/{username}', ...options, diff --git a/examples/openapi-ts-tanstack-vue-query/openapi-ts.config.ts b/examples/openapi-ts-tanstack-vue-query/openapi-ts.config.ts index af75fc0027..41840c0592 100644 --- a/examples/openapi-ts-tanstack-vue-query/openapi-ts.config.ts +++ b/examples/openapi-ts-tanstack-vue-query/openapi-ts.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from '@hey-api/openapi-ts'; +import { defineConfig, type UserConfig } from '@hey-api/openapi-ts'; -export default defineConfig({ +const config: Promise = defineConfig({ input: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', logs: { @@ -21,3 +21,5 @@ export default defineConfig({ '@tanstack/vue-query', ], }); + +export default config; diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/client.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/client.gen.ts index 84318ba67c..c0ceac20e4 100644 --- a/examples/openapi-ts-tanstack-vue-query/src/client/client.gen.ts +++ b/examples/openapi-ts-tanstack-vue-query/src/client/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -15,6 +15,6 @@ export type CreateClientConfig = ( override?: Config, ) => Config & T>; -export const client = createClient( +export const client: Client = createClient( createConfig({ baseUrl: 'https://petstore3.swagger.io/api/v3' }), ); diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/client/utils.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/client/utils.gen.ts index 7800fe4b9d..0499cf988a 100644 --- a/examples/openapi-ts-tanstack-vue-query/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-tanstack-vue-query/src/client/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -121,9 +121,14 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; +<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { +======= + }): Promise => { + for (const auth of security) { +>>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/core/params.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/examples/openapi-ts-tanstack-vue-query/src/client/core/params.gen.ts +++ b/examples/openapi-ts-tanstack-vue-query/src/client/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/core/pathSerializer.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/core/pathSerializer.gen.ts index 994b2848c6..0e534b9daf 100644 --- a/examples/openapi-ts-tanstack-vue-query/src/client/core/pathSerializer.gen.ts +++ b/examples/openapi-ts-tanstack-vue-query/src/client/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/core/queryKeySerializer.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/core/queryKeySerializer.gen.ts index 5000df606f..531a582e69 100644 --- a/examples/openapi-ts-tanstack-vue-query/src/client/core/queryKeySerializer.gen.ts +++ b/examples/openapi-ts-tanstack-vue-query/src/client/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/core/utils.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/examples/openapi-ts-tanstack-vue-query/src/client/core/utils.gen.ts +++ b/examples/openapi-ts-tanstack-vue-query/src/client/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/sdk.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/sdk.gen.ts index 6010a7fc0f..984bc10439 100644 --- a/examples/openapi-ts-tanstack-vue-query/src/client/sdk.gen.ts +++ b/examples/openapi-ts-tanstack-vue-query/src/client/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AddPetData, @@ -87,7 +87,7 @@ export type Options< */ export const addPet = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -105,7 +105,7 @@ export const addPet = ( */ export const updatePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet', @@ -123,7 +123,7 @@ export const updatePet = ( */ export const findPetsByStatus = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByStatus', @@ -137,7 +137,7 @@ export const findPetsByStatus = ( */ export const findPetsByTags = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/findByTags', @@ -151,7 +151,7 @@ export const findPetsByTags = ( */ export const deletePet = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ security: [{ scheme: 'bearer', type: 'http' }], url: '/pet/{petId}', @@ -165,7 +165,7 @@ export const deletePet = ( */ export const getPetById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ security: [ { name: 'api_key', type: 'apiKey' }, @@ -182,7 +182,7 @@ export const getPetById = ( */ export const updatePetWithForm = ( options: Options, -) => +): RequestResult => (options.client ?? client).post< UpdatePetWithFormResponses, UpdatePetWithFormErrors, @@ -200,7 +200,7 @@ export const updatePetWithForm = ( */ export const uploadFile = ( options: Options, -) => +): RequestResult => (options.client ?? client).post({ bodySerializer: null, security: [{ scheme: 'bearer', type: 'http' }], @@ -219,7 +219,7 @@ export const uploadFile = ( */ export const getInventory = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ security: [{ name: 'api_key', type: 'apiKey' }], url: '/store/inventory', @@ -233,7 +233,7 @@ export const getInventory = ( */ export const placeOrder = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/store/order', ...options, @@ -250,7 +250,7 @@ export const placeOrder = ( */ export const deleteOrder = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/store/order/{orderId}', ...options, @@ -263,7 +263,7 @@ export const deleteOrder = ( */ export const getOrderById = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/store/order/{orderId}', ...options, @@ -276,7 +276,7 @@ export const getOrderById = ( */ export const createUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post({ url: '/user', ...options, @@ -293,7 +293,7 @@ export const createUser = ( */ export const createUsersWithListInput = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).post< CreateUsersWithListInputResponses, CreateUsersWithListInputErrors, @@ -314,7 +314,7 @@ export const createUsersWithListInput = ( */ export const loginUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/login', ...options, @@ -327,7 +327,7 @@ export const loginUser = ( */ export const logoutUser = ( options?: Options, -) => +): RequestResult => (options?.client ?? client).get({ url: '/user/logout', ...options, @@ -340,7 +340,7 @@ export const logoutUser = ( */ export const deleteUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).delete({ url: '/user/{username}', ...options, @@ -353,7 +353,7 @@ export const deleteUser = ( */ export const getUserByName = ( options: Options, -) => +): RequestResult => (options.client ?? client).get({ url: '/user/{username}', ...options, @@ -366,7 +366,7 @@ export const getUserByName = ( */ export const updateUser = ( options: Options, -) => +): RequestResult => (options.client ?? client).put({ url: '/user/{username}', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/sdk.gen.ts index 740911b2cd..bfcb66fa76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { PostFooData, PostFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options: Options) => (options.client ?? client).post({ +export const postFoo = (options: Options): RequestResult => (options.client ?? client).post({ bodySerializer: null, url: '/foo', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/sdk.gen.ts index c5ee86ef34..0283943c35 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape } from './client'; import { client } from './client.gen'; import type { PostV1FooData, PostV1FooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const postV1Foo = (options: Options) => (options.client ?? client).post({ +export const postV1Foo = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/v1/foo', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/sdk.gen.ts index 0f0e66cba9..0fd3ade30b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen'; @@ -18,31 +18,31 @@ export type Options; }; -export const serviceWithEmptyTag = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const serviceWithEmptyTag = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -51,39 +51,39 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterModel: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArrayCSV: { array: { explode: false } }, parameterArraySSV: { array: { explode: false } }, @@ -94,30 +94,30 @@ export const collectionFormat = (options: ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArray: { array: { explode: false } }, parameterDictionary: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/types', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { explode: false, style: 'form' } }, parameterReference: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Body should not be unknown * * Body should not be unknown */ -export const postApiVbyApiVersionBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/sdk.gen.ts index 0f0e66cba9..0fd3ade30b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen'; @@ -18,31 +18,31 @@ export type Options; }; -export const serviceWithEmptyTag = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const serviceWithEmptyTag = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -51,39 +51,39 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterModel: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArrayCSV: { array: { explode: false } }, parameterArraySSV: { array: { explode: false } }, @@ -94,30 +94,30 @@ export const collectionFormat = (options: ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArray: { array: { explode: false } }, parameterDictionary: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/types', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { explode: false, style: 'form' } }, parameterReference: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Body should not be unknown * * Body should not be unknown */ -export const postApiVbyApiVersionBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts index 63c30703ed..476d698571 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://api.example.com/v1' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://api.example.com/v1' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts index 91431a46fb..a84376c551 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { BusinessGetData, BusinessGetResponses, BusinessProvidersDomainsGetData, BusinessProvidersDomainsGetResponses, BusinessProvidersDomainsPostData, BusinessProvidersDomainsPostResponses, GetData, GetResponses, PutBusinessProvidersDomainsData, PutBusinessProvidersDomainsResponses } from './types.gen'; @@ -47,11 +47,11 @@ class HeyApiRegistry { } export class Domains extends HeyApiClient { - public get(options?: Options) { + public get(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/business/providers/domains', ...options }); } - public post(options?: Options) { + public post(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/business/providers/domains', ...options }); } } @@ -64,7 +64,7 @@ export class Providers extends HeyApiClient { } export class Business extends HeyApiClient { - public get(options?: Options) { + public get(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/locations/businesses', ...options }); } @@ -75,7 +75,7 @@ export class Business extends HeyApiClient { } export class NestedSdkWithInstance extends HeyApiClient { - public static readonly __registry = new HeyApiRegistry(); + public static readonly __registry: HeyApiRegistry = new HeyApiRegistry(); constructor(args?: { client?: Client; @@ -85,11 +85,11 @@ export class NestedSdkWithInstance extends HeyApiClient { NestedSdkWithInstance.__registry.set(this, args?.key); } - public putBusinessProvidersDomains(options?: Options) { + public putBusinessProvidersDomains(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/business/providers/domains', ...options }); } - public get(options?: Options) { + public get(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/locations', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts index 63c30703ed..476d698571 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://api.example.com/v1' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://api.example.com/v1' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts index 5e0709364e..28a45393db 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { BusinessGetData, BusinessGetResponses, BusinessProvidersDomainsGetData, BusinessProvidersDomainsGetResponses, BusinessProvidersDomainsPostData, BusinessProvidersDomainsPostResponses, GetData, GetResponses, PutBusinessProvidersDomainsData, PutBusinessProvidersDomainsResponses } from './types.gen'; @@ -19,11 +19,11 @@ export type Options(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/business/providers/domains', ...options }); } - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } } @@ -33,7 +33,7 @@ export class Providers { } export class Business { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/locations/businesses', ...options }); } @@ -45,11 +45,11 @@ export class Business2 { } export class Domains2 { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/business/providers/domains', ...options }); } - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } } @@ -67,11 +67,11 @@ export class Providers3 { } export class Domains3 { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/business/providers/domains', ...options }); } - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } } @@ -85,7 +85,7 @@ export class Business4 { } export class Domains4 { - public static putBusinessProvidersDomains(options?: Options) { + public static putBusinessProvidersDomains(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/business/providers/domains', ...options }); } @@ -93,13 +93,13 @@ export class Domains4 { } export class Business5 { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/locations/businesses', ...options }); } } export class Locations { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/locations', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts index 0f0e66cba9..0fd3ade30b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen'; @@ -18,31 +18,31 @@ export type Options; }; -export const serviceWithEmptyTag = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const serviceWithEmptyTag = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -51,39 +51,39 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterModel: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArrayCSV: { array: { explode: false } }, parameterArraySSV: { array: { explode: false } }, @@ -94,30 +94,30 @@ export const collectionFormat = (options: ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArray: { array: { explode: false } }, parameterDictionary: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/types', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { explode: false, style: 'form' } }, parameterReference: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Body should not be unknown * * Body should not be unknown */ -export const postApiVbyApiVersionBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts index 37d8e7eb09..c544c952a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { FooBarPostData, FooBarPostResponses, FooBarPutData, FooBarPutResponses, FooPostData, FooPostResponses, FooPutData, FooPutResponses, GetFooBarData, GetFooBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -47,21 +47,21 @@ class HeyApiRegistry { } export class Bar extends HeyApiClient { - public post(options?: Options) { + public post(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/foo/bar', ...options }); } - public put(options?: Options) { + public put(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/foo/bar', ...options }); } } export class Foo extends HeyApiClient { - public post(options?: Options) { + public post(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/foo', ...options }); } - public put(options?: Options) { + public put(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/foo', ...options }); } @@ -72,7 +72,7 @@ export class Foo extends HeyApiClient { } export class Sdk extends HeyApiClient { - public static readonly __registry = new HeyApiRegistry(); + public static readonly __registry: HeyApiRegistry = new HeyApiRegistry(); constructor(args?: { client?: Client; @@ -82,11 +82,11 @@ export class Sdk extends HeyApiClient { Sdk.__registry.set(this, args?.key); } - public getFoo(options?: Options) { + public getFoo(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/foo', ...options }); } - public getFooBar(options?: Options) { + public getFooBar(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/foo/bar', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts index f29dcbc48a..fbfe4432d4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base', throwOnError: true })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base', throwOnError: true })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts index b198bcc961..5c5f3c8c6d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen'; @@ -18,31 +18,31 @@ export type Options; }; -export const serviceWithEmptyTag = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const serviceWithEmptyTag = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -51,39 +51,39 @@ export const callWithWeirdParameterNames = } }); -export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterModel: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArrayCSV: { array: { explode: false } }, parameterArraySSV: { array: { explode: false } }, @@ -94,30 +94,30 @@ export const collectionFormat = (options: O ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArray: { array: { explode: false } }, parameterDictionary: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/types', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { explode: false, style: 'form' } }, parameterReference: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Body should not be unknown * * Body should not be unknown */ -export const postApiVbyApiVersionBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts index 1b25cb8c30..37e8f46ff4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { FooBarPostData, FooBarPostResponses, FooBarPutData, FooBarPutResponses, FooPostData, FooPostResponses, FooPutData, FooPutResponses, GetFooBarData, GetFooBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -19,21 +19,21 @@ export type Options(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo/bar', ...options }); } } export class FooService { - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo', ...options }); } @@ -41,7 +41,7 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { + public static getFoo(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/foo', ...options }); } @@ -49,11 +49,11 @@ export class FooBazService { } export class BarService2 { - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo/bar', ...options }); } } @@ -63,7 +63,7 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { + public static getFooBar(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/foo/bar', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts index 0f0e66cba9..0fd3ade30b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen'; @@ -18,31 +18,31 @@ export type Options; }; -export const serviceWithEmptyTag = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const serviceWithEmptyTag = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -51,39 +51,39 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterModel: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArrayCSV: { array: { explode: false } }, parameterArraySSV: { array: { explode: false } }, @@ -94,30 +94,30 @@ export const collectionFormat = (options: ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArray: { array: { explode: false } }, parameterDictionary: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/types', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { explode: false, style: 'form' } }, parameterReference: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Body should not be unknown * * Body should not be unknown */ -export const postApiVbyApiVersionBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/sdk.gen.ts index cef415f96a..97d72d09fd 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { SendEmailData, SendEmailErrors, SendEmailResponses } from './types.gen'; @@ -21,7 +21,7 @@ export type Options(options: Options) => (options.client ?? client).post({ +export const sendEmail = (options: Options): RequestResult => (options.client ?? client).post({ url: '/email', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/sdk.gen.ts index 77b60fb49f..d93b2c02ed 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ in: 'query', name: 'foo', diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/sdk.gen.ts index 105ed3df7b..892dfcf746 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ scheme: 'basic', type: 'http' }], url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/sdk.gen.ts index f4a101c6e6..035123d267 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,4 +18,4 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/foo', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/sdk.gen.ts index f55d9bf294..954e6cc005 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client.gen.ts index 9ab0eabf4e..83aa2f82d2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: '/v1' })); +export const client: Client = createClient(createConfig({ baseUrl: '/v1' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client.gen.ts index 18eaae2482..062d4c760a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://foo.com/v1' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://foo.com/v1' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/sdk.gen.ts index b46d9abdda..3f7e970a68 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { UploadBinaryData, UploadBinaryResponses, UploadPdfData, UploadPdfResponses, UploadZipData, UploadZipResponses } from './types.gen'; @@ -21,7 +21,7 @@ export type Options(options: Options) => (options.client ?? client).post({ +export const uploadZip = (options: Options): RequestResult => (options.client ?? client).post({ bodySerializer: null, url: '/upload-zip', ...options, @@ -34,7 +34,7 @@ export const uploadZip = (options: Options /** * Upload a PDF file */ -export const uploadPdf = (options: Options) => (options.client ?? client).post({ +export const uploadPdf = (options: Options): RequestResult => (options.client ?? client).post({ bodySerializer: null, url: '/upload-pdf', ...options, @@ -47,7 +47,7 @@ export const uploadPdf = (options: Options /** * Upload binary data */ -export const uploadBinary = (options: Options) => (options.client ?? client).post({ +export const uploadBinary = (options: Options): RequestResult => (options.client ?? client).post({ bodySerializer: null, url: '/upload-binary', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/sdk.gen.ts index 740911b2cd..bfcb66fa76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { PostFooData, PostFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options: Options) => (options.client ?? client).post({ +export const postFoo = (options: Options): RequestResult => (options.client ?? client).post({ bodySerializer: null, url: '/foo', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/sdk.gen.ts index 2c65e8b6c0..e66bf74e17 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/sdk.gen.ts index 7992f537a2..c0b898c4fb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { PostFooData, PostFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options?: Options) => (options?.client ?? client).post({ +export const postFoo = (options?: Options): RequestResult => (options?.client ?? client).post({ querySerializer: { parameters: { foo: { array: { explode: false } } } }, url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/sdk.gen.ts index 7992f537a2..c0b898c4fb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { PostFooData, PostFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options?: Options) => (options?.client ?? client).post({ +export const postFoo = (options?: Options): RequestResult => (options?.client ?? client).post({ querySerializer: { parameters: { foo: { array: { explode: false } } } }, url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts index 63c30703ed..476d698571 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://api.example.com/v1' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://api.example.com/v1' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts index 91431a46fb..a84376c551 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { BusinessGetData, BusinessGetResponses, BusinessProvidersDomainsGetData, BusinessProvidersDomainsGetResponses, BusinessProvidersDomainsPostData, BusinessProvidersDomainsPostResponses, GetData, GetResponses, PutBusinessProvidersDomainsData, PutBusinessProvidersDomainsResponses } from './types.gen'; @@ -47,11 +47,11 @@ class HeyApiRegistry { } export class Domains extends HeyApiClient { - public get(options?: Options) { + public get(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/business/providers/domains', ...options }); } - public post(options?: Options) { + public post(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/business/providers/domains', ...options }); } } @@ -64,7 +64,7 @@ export class Providers extends HeyApiClient { } export class Business extends HeyApiClient { - public get(options?: Options) { + public get(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/locations/businesses', ...options }); } @@ -75,7 +75,7 @@ export class Business extends HeyApiClient { } export class NestedSdkWithInstance extends HeyApiClient { - public static readonly __registry = new HeyApiRegistry(); + public static readonly __registry: HeyApiRegistry = new HeyApiRegistry(); constructor(args?: { client?: Client; @@ -85,11 +85,11 @@ export class NestedSdkWithInstance extends HeyApiClient { NestedSdkWithInstance.__registry.set(this, args?.key); } - public putBusinessProvidersDomains(options?: Options) { + public putBusinessProvidersDomains(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/business/providers/domains', ...options }); } - public get(options?: Options) { + public get(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/locations', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts index 63c30703ed..476d698571 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://api.example.com/v1' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://api.example.com/v1' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts index 5e0709364e..28a45393db 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { BusinessGetData, BusinessGetResponses, BusinessProvidersDomainsGetData, BusinessProvidersDomainsGetResponses, BusinessProvidersDomainsPostData, BusinessProvidersDomainsPostResponses, GetData, GetResponses, PutBusinessProvidersDomainsData, PutBusinessProvidersDomainsResponses } from './types.gen'; @@ -19,11 +19,11 @@ export type Options(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/business/providers/domains', ...options }); } - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } } @@ -33,7 +33,7 @@ export class Providers { } export class Business { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/locations/businesses', ...options }); } @@ -45,11 +45,11 @@ export class Business2 { } export class Domains2 { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/business/providers/domains', ...options }); } - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } } @@ -67,11 +67,11 @@ export class Providers3 { } export class Domains3 { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/business/providers/domains', ...options }); } - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } } @@ -85,7 +85,7 @@ export class Business4 { } export class Domains4 { - public static putBusinessProvidersDomains(options?: Options) { + public static putBusinessProvidersDomains(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/business/providers/domains', ...options }); } @@ -93,13 +93,13 @@ export class Domains4 { } export class Business5 { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/locations/businesses', ...options }); } } export class Locations { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/locations', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts index 37d8e7eb09..c544c952a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { FooBarPostData, FooBarPostResponses, FooBarPutData, FooBarPutResponses, FooPostData, FooPostResponses, FooPutData, FooPutResponses, GetFooBarData, GetFooBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -47,21 +47,21 @@ class HeyApiRegistry { } export class Bar extends HeyApiClient { - public post(options?: Options) { + public post(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/foo/bar', ...options }); } - public put(options?: Options) { + public put(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/foo/bar', ...options }); } } export class Foo extends HeyApiClient { - public post(options?: Options) { + public post(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/foo', ...options }); } - public put(options?: Options) { + public put(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/foo', ...options }); } @@ -72,7 +72,7 @@ export class Foo extends HeyApiClient { } export class Sdk extends HeyApiClient { - public static readonly __registry = new HeyApiRegistry(); + public static readonly __registry: HeyApiRegistry = new HeyApiRegistry(); constructor(args?: { client?: Client; @@ -82,11 +82,11 @@ export class Sdk extends HeyApiClient { Sdk.__registry.set(this, args?.key); } - public getFoo(options?: Options) { + public getFoo(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/foo', ...options }); } - public getFooBar(options?: Options) { + public getFooBar(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/foo/bar', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts index f29dcbc48a..fbfe4432d4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base', throwOnError: true })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base', throwOnError: true })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts index 1271b6f7b5..834e28f6d4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options: } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = } }); -export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (op } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = (o } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Options } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opti } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts index 1b25cb8c30..37e8f46ff4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { FooBarPostData, FooBarPostResponses, FooBarPutData, FooBarPutResponses, FooPostData, FooPostResponses, FooPutData, FooPutResponses, GetFooBarData, GetFooBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -19,21 +19,21 @@ export type Options(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo/bar', ...options }); } } export class FooService { - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo', ...options }); } @@ -41,7 +41,7 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { + public static getFoo(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/foo', ...options }); } @@ -49,11 +49,11 @@ export class FooBazService { } export class BarService2 { - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo/bar', ...options }); } } @@ -63,7 +63,7 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { + public static getFooBar(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/foo/bar', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/sdk.gen.ts index 6271eb6862..154e897a5b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetBarData, GetBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ in: 'query', name: 'foo', @@ -28,7 +28,7 @@ export const getFoo = (options?: Options(options?: Options) => (options?.client ?? client).get({ +export const getBar = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ in: 'cookie', name: 'bar', diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/sdk.gen.ts index f4a101c6e6..035123d267 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,4 +18,4 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/foo', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/sdk.gen.ts index f55d9bf294..954e6cc005 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/sdk.gen.ts index f55d9bf294..954e6cc005 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/sdk.gen.ts index f55d9bf294..954e6cc005 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client.gen.ts index 18eaae2482..062d4c760a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://foo.com/v1' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://foo.com/v1' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/sdk.gen.ts index 740911b2cd..bfcb66fa76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { PostFooData, PostFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options: Options) => (options.client ?? client).post({ +export const postFoo = (options: Options): RequestResult => (options.client ?? client).post({ bodySerializer: null, url: '/foo', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client.gen.ts index 8bbb9115b8..975db8b4ac 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://foo.com' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://foo.com' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client.gen.ts index 28b10b0a97..4ae8c41a32 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts index 2239bbe6f7..8ffffba628 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/index.ts index 37cf146fcf..011b400534 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.ts'; export { buildClientParams } from '../core/params.gen.ts'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.ts'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.ts'; export { createClient } from './client.gen.ts'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/utils.gen.ts index 0df2a892b8..8a2106dfe3 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/utils.gen.ts index c8df2941b6..fd9d09afdd 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/sdk.gen.ts index e76187a0e0..93cda92000 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.ts'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.ts'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/sdk.gen.ts index 592c57cc57..3e0ee2f545 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; export type Options = Options2 & { @@ -17,11 +17,11 @@ export type Options; }; -export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => options.client.post({ +export const import_ = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -30,36 +30,36 @@ export const import_ = (options: Options(options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => options.client.post({ +export const callWithParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -68,7 +68,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => options.client.post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -77,7 +77,7 @@ export const callWithWeirdParameterNames = (options: Options) => options.client.get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -86,7 +86,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => options.client.post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -95,7 +95,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -104,7 +104,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -114,39 +114,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => options.client.post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => options.client.put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => options.client.get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => options.client.post({ +export const uploadFile = (options: Options): RequestResult => options.client.post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -156,17 +156,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => options.client.get({ +export const complexTypes = (options: Options): RequestResult => options.client.get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => options.client.post({ +export const multipartRequest = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -176,7 +176,7 @@ export const multipartRequest = (options: } }); -export const complexParams = (options: Options) => options.client.put({ +export const complexParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -185,16 +185,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => options.client.put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client.gen.ts index 5ec626e5ad..0d2e476060 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts index d78f57f48a..4b2e2fa828 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/index.ts index 50acaa57b7..1fdabcccca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/utils.gen.ts index d640c9dbfb..bea872c108 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/sdk.gen.ts index ea3ab06667..02bb1c9d69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client.gen.ts index 5ec626e5ad..0d2e476060 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts index d78f57f48a..4b2e2fa828 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/index.ts index 50acaa57b7..1fdabcccca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/utils.gen.ts index d640c9dbfb..bea872c108 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/sdk.gen.ts index ea3ab06667..02bb1c9d69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client.gen.ts index 1e9d9aac7e..2b11823381 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'https://foo.com' })); +export const client: Client = createClient(createConfig({ baseURL: 'https://foo.com' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/sdk.gen.ts index 20ec7d2cb0..20dc3d8799 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/no+tag', ...options, @@ -32,44 +32,44 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -87,7 +87,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/parameters', ...options, @@ -106,7 +106,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -115,7 +115,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -125,59 +125,59 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, responseType: 'json', url: '/api/v{api-version}/upload', @@ -188,22 +188,22 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'blob', url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, responseType: 'json', url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -213,7 +213,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/complex/{id}', ...options, @@ -223,11 +223,11 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options @@ -236,7 +236,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/sdk.gen.ts index 20ec7d2cb0..20dc3d8799 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/no+tag', ...options, @@ -32,44 +32,44 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -87,7 +87,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/parameters', ...options, @@ -106,7 +106,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -115,7 +115,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -125,59 +125,59 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, responseType: 'json', url: '/api/v{api-version}/upload', @@ -188,22 +188,22 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'blob', url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, responseType: 'json', url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -213,7 +213,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/complex/{id}', ...options, @@ -223,11 +223,11 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options @@ -236,7 +236,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client.gen.ts index 9732f8c950..eb20ab7464 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/client.gen.ts index 6c8585d0e2..50e4640cff 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/index.ts index e19411650a..e2d878c9c1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.ts'; export { buildClientParams } from '../core/params.gen.ts'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.ts'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.ts'; export { createClient } from './client.gen.ts'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/utils.gen.ts index 9e319a908f..4faca05a23 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen. export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/utils.gen.ts index c8df2941b6..fd9d09afdd 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/sdk.gen.ts index 1a7aeca0eb..0c08919865 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.ts'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.ts'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/no+tag', ...options, @@ -32,44 +32,44 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -87,7 +87,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/parameters', ...options, @@ -106,7 +106,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -115,7 +115,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -125,59 +125,59 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, responseType: 'json', url: '/api/v{api-version}/upload', @@ -188,22 +188,22 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'blob', url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, responseType: 'json', url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -213,7 +213,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/complex/{id}', ...options, @@ -223,11 +223,11 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options @@ -236,7 +236,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/sdk.gen.ts index 20ec7d2cb0..20dc3d8799 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/no+tag', ...options, @@ -32,44 +32,44 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -87,7 +87,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/parameters', ...options, @@ -106,7 +106,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -115,7 +115,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -125,59 +125,59 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, responseType: 'json', url: '/api/v{api-version}/upload', @@ -188,22 +188,22 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'blob', url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, responseType: 'json', url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -213,7 +213,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/complex/{id}', ...options, @@ -223,11 +223,11 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options @@ -236,7 +236,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts index 583551be46..bee5ab9e46 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; export type Options = Options2 & { @@ -17,11 +17,11 @@ export type Options; }; -export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => options.client.post({ +export const import_ = (options: Options): RequestResult => options.client.post({ responseType: 'json', url: '/api/v{api-version}/no+tag', ...options, @@ -31,44 +31,44 @@ export const import_ = (options: Options(options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ +export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ responseType: 'json', url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => options.client.get({ responseType: 'json', url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => options.client.post({ +export const callWithParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -77,7 +77,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => options.client.post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -86,7 +86,7 @@ export const callWithWeirdParameterNames = (options: Options) => options.client.get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -95,7 +95,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => options.client.post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ responseType: 'json', url: '/api/v{api-version}/parameters', ...options, @@ -105,7 +105,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -114,7 +114,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -124,59 +124,59 @@ export const postApiVbyApiVersionFormData = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => options.client.get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => options.client.get({ +export const dummyA = (options: Options): RequestResult => options.client.get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => options.client.post({ +export const callWithDuplicateResponses = (options: Options): RequestResult => options.client.post({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => options.client.put({ +export const callWithResponses = (options: Options): RequestResult => options.client.put({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => options.client.get({ +export const types = (options: Options): RequestResult => options.client.get({ responseType: 'json', url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => options.client.post({ +export const uploadFile = (options: Options): RequestResult => options.client.post({ ...urlSearchParamsBodySerializer, responseType: 'json', url: '/api/v{api-version}/upload', @@ -187,22 +187,22 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => options.client.get({ +export const fileResponse = (options: Options): RequestResult => options.client.get({ responseType: 'blob', url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => options.client.get({ +export const complexTypes = (options: Options): RequestResult => options.client.get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, responseType: 'json', url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => options.client.post({ +export const multipartRequest = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -212,7 +212,7 @@ export const multipartRequest = (options: } }); -export const complexParams = (options: Options) => options.client.put({ +export const complexParams = (options: Options): RequestResult => options.client.put({ responseType: 'json', url: '/api/v{api-version}/complex/{id}', ...options, @@ -222,11 +222,11 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ responseType: 'json', url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options @@ -235,7 +235,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client.gen.ts index 0ec36621c6..be61b10fb9 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/client.gen.ts index 25df9d7254..671cdffe1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/index.ts index 8e9b4046c1..6642f8f35e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/utils.gen.ts index 0c223f5ce4..7d7aed1e0a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen. export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/sdk.gen.ts index 1a79549c1d..3151e2a9bc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/no+tag', ...options, @@ -32,44 +32,44 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -87,7 +87,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/parameters', ...options, @@ -106,7 +106,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -115,7 +115,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -125,59 +125,59 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, responseType: 'json', url: '/api/v{api-version}/upload', @@ -188,22 +188,22 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'blob', url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, responseType: 'json', url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -213,7 +213,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/complex/{id}', ...options, @@ -223,11 +223,11 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options @@ -236,7 +236,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client.gen.ts index 0ec36621c6..be61b10fb9 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/client.gen.ts index 25df9d7254..671cdffe1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/index.ts index 8e9b4046c1..6642f8f35e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/utils.gen.ts index 0c223f5ce4..7d7aed1e0a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen. export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/sdk.gen.ts index 1a79549c1d..3151e2a9bc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/no+tag', ...options, @@ -32,44 +32,44 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -87,7 +87,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/parameters', ...options, @@ -106,7 +106,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -115,7 +115,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -125,59 +125,59 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, responseType: 'json', url: '/api/v{api-version}/upload', @@ -188,22 +188,22 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'blob', url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, responseType: 'json', url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -213,7 +213,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/complex/{id}', ...options, @@ -223,11 +223,11 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options @@ -236,7 +236,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client.gen.ts index 8bbb9115b8..975db8b4ac 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://foo.com' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://foo.com' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client.gen.ts index 28b10b0a97..4ae8c41a32 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/client.gen.ts index b845993079..dee85512ed 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/index.ts index 37cf146fcf..011b400534 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.ts'; export { buildClientParams } from '../core/params.gen.ts'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.ts'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.ts'; export { createClient } from './client.gen.ts'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/utils.gen.ts index fda67556f2..3da3c79c2d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen. export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/utils.gen.ts index c8df2941b6..fd9d09afdd 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/sdk.gen.ts index e76187a0e0..93cda92000 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.ts'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.ts'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts index 592c57cc57..3e0ee2f545 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; export type Options = Options2 & { @@ -17,11 +17,11 @@ export type Options; }; -export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => options.client.post({ +export const import_ = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -30,36 +30,36 @@ export const import_ = (options: Options(options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => options.client.post({ +export const callWithParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -68,7 +68,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => options.client.post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -77,7 +77,7 @@ export const callWithWeirdParameterNames = (options: Options) => options.client.get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -86,7 +86,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => options.client.post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -95,7 +95,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -104,7 +104,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -114,39 +114,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => options.client.post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => options.client.put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => options.client.get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => options.client.post({ +export const uploadFile = (options: Options): RequestResult => options.client.post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -156,17 +156,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => options.client.get({ +export const complexTypes = (options: Options): RequestResult => options.client.get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => options.client.post({ +export const multipartRequest = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -176,7 +176,7 @@ export const multipartRequest = (options: } }); -export const complexParams = (options: Options) => options.client.put({ +export const complexParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -185,16 +185,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => options.client.put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client.gen.ts index 5ec626e5ad..0d2e476060 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/client.gen.ts index f3c1fa9b8d..f8b5032ab4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/index.ts index 50acaa57b7..1fdabcccca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/utils.gen.ts index 271852e167..e40240758b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen. export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/sdk.gen.ts index ea3ab06667..02bb1c9d69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client.gen.ts index 5ec626e5ad..0d2e476060 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/client.gen.ts index f3c1fa9b8d..f8b5032ab4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/index.ts index 50acaa57b7..1fdabcccca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/utils.gen.ts index 271852e167..e40240758b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen. export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/sdk.gen.ts index ea3ab06667..02bb1c9d69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/client.gen.ts index 6d0f8e60bc..6c1a6c4a08 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/utils.gen.ts index 68fa7b2d79..37d079334d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/client.gen.ts index 6d0f8e60bc..6c1a6c4a08 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/utils.gen.ts index 68fa7b2d79..37d079334d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/client.gen.ts index 6d0f8e60bc..6c1a6c4a08 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/utils.gen.ts index 68fa7b2d79..37d079334d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client.gen.ts index 8bbb9115b8..975db8b4ac 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://foo.com' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://foo.com' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/client.gen.ts index 6d0f8e60bc..6c1a6c4a08 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/utils.gen.ts index 68fa7b2d79..37d079334d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/client.gen.ts index 6d0f8e60bc..6c1a6c4a08 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/utils.gen.ts index 68fa7b2d79..37d079334d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/client.gen.ts index 6d0f8e60bc..6c1a6c4a08 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/utils.gen.ts index 68fa7b2d79..37d079334d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client.gen.ts index 28b10b0a97..4ae8c41a32 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/client.gen.ts index 7fb562ca8d..f00d12648a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/index.ts index 37cf146fcf..011b400534 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.ts'; export { buildClientParams } from '../core/params.gen.ts'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.ts'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.ts'; export { createClient } from './client.gen.ts'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/utils.gen.ts index 6b859a7767..08504ab260 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen. export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/utils.gen.ts index c8df2941b6..fd9d09afdd 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/sdk.gen.ts index e76187a0e0..93cda92000 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.ts'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.ts'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/client.gen.ts index 6d0f8e60bc..6c1a6c4a08 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/utils.gen.ts index 68fa7b2d79..37d079334d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/client.gen.ts index 6d0f8e60bc..6c1a6c4a08 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/utils.gen.ts index 68fa7b2d79..37d079334d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/sdk.gen.ts index 592c57cc57..3e0ee2f545 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; export type Options = Options2 & { @@ -17,11 +17,11 @@ export type Options; }; -export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => options.client.post({ +export const import_ = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -30,36 +30,36 @@ export const import_ = (options: Options(options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => options.client.post({ +export const callWithParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -68,7 +68,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => options.client.post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -77,7 +77,7 @@ export const callWithWeirdParameterNames = (options: Options) => options.client.get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -86,7 +86,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => options.client.post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -95,7 +95,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -104,7 +104,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -114,39 +114,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => options.client.post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => options.client.put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => options.client.get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => options.client.post({ +export const uploadFile = (options: Options): RequestResult => options.client.post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -156,17 +156,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => options.client.get({ +export const complexTypes = (options: Options): RequestResult => options.client.get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => options.client.post({ +export const multipartRequest = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -176,7 +176,7 @@ export const multipartRequest = (options: } }); -export const complexParams = (options: Options) => options.client.put({ +export const complexParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -185,16 +185,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => options.client.put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client.gen.ts index 5ec626e5ad..0d2e476060 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/client.gen.ts index e80dbeb097..25e51dc170 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/index.ts index 50acaa57b7..1fdabcccca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/utils.gen.ts index 660508ff0b..633bde5c85 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen. export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/sdk.gen.ts index ea3ab06667..02bb1c9d69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client.gen.ts index 5ec626e5ad..0d2e476060 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/client.gen.ts index e80dbeb097..25e51dc170 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/client.gen.ts @@ -52,7 +52,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/index.ts index 50acaa57b7..1fdabcccca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/utils.gen.ts index 660508ff0b..633bde5c85 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen. export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -116,12 +116,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -150,7 +152,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/sdk.gen.ts index ea3ab06667..02bb1c9d69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/client.gen.ts index 5e7ac14691..1e8882f023 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/utils.gen.ts index f00cd1fd1e..c34b11e5a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/client.gen.ts index 5e7ac14691..1e8882f023 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/utils.gen.ts index f00cd1fd1e..c34b11e5a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/client.gen.ts index 5e7ac14691..1e8882f023 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/utils.gen.ts index f00cd1fd1e..c34b11e5a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client.gen.ts index 8bbb9115b8..975db8b4ac 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://foo.com' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://foo.com' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/client.gen.ts index 5e7ac14691..1e8882f023 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/utils.gen.ts index f00cd1fd1e..c34b11e5a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/client.gen.ts index 5e7ac14691..1e8882f023 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/utils.gen.ts index f00cd1fd1e..c34b11e5a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/client.gen.ts index 5e7ac14691..1e8882f023 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/utils.gen.ts index f00cd1fd1e..c34b11e5a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client.gen.ts index 28b10b0a97..4ae8c41a32 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/client.gen.ts index 6ab5c8aa47..465230e975 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/index.ts index e19411650a..e2d878c9c1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.ts'; export { buildClientParams } from '../core/params.gen.ts'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.ts'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.ts'; export { createClient } from './client.gen.ts'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/utils.gen.ts index d8722917fc..c34ec961b6 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/utils.gen.ts index c8df2941b6..fd9d09afdd 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/sdk.gen.ts index e76187a0e0..93cda92000 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.ts'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.ts'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/client.gen.ts index 5e7ac14691..1e8882f023 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/utils.gen.ts index f00cd1fd1e..c34b11e5a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/client.gen.ts index 5e7ac14691..1e8882f023 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/utils.gen.ts index f00cd1fd1e..c34b11e5a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts index 592c57cc57..3e0ee2f545 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; export type Options = Options2 & { @@ -17,11 +17,11 @@ export type Options; }; -export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => options.client.post({ +export const import_ = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -30,36 +30,36 @@ export const import_ = (options: Options(options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => options.client.post({ +export const callWithParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -68,7 +68,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => options.client.post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -77,7 +77,7 @@ export const callWithWeirdParameterNames = (options: Options) => options.client.get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -86,7 +86,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => options.client.post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -95,7 +95,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -104,7 +104,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -114,39 +114,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => options.client.post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => options.client.put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => options.client.get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => options.client.post({ +export const uploadFile = (options: Options): RequestResult => options.client.post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -156,17 +156,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => options.client.get({ +export const complexTypes = (options: Options): RequestResult => options.client.get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => options.client.post({ +export const multipartRequest = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -176,7 +176,7 @@ export const multipartRequest = (options: } }); -export const complexParams = (options: Options) => options.client.put({ +export const complexParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -185,16 +185,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => options.client.put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client.gen.ts index 5ec626e5ad..0d2e476060 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/client.gen.ts index 5beaa4194c..fe58f5be3a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/index.ts index 8e9b4046c1..6642f8f35e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/utils.gen.ts index 310ba88634..fcea84a47e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/sdk.gen.ts index ea3ab06667..02bb1c9d69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client.gen.ts index 5ec626e5ad..0d2e476060 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/client.gen.ts index 5beaa4194c..fe58f5be3a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/index.ts index 8e9b4046c1..6642f8f35e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/utils.gen.ts index 310ba88634..fcea84a47e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/sdk.gen.ts index ea3ab06667..02bb1c9d69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/client.gen.ts index 46e7a8a77a..2bb44b288f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/index.ts index e0ebeab894..80ebbf95dc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/utils.gen.ts index cae4007917..c131ed0046 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/client.gen.ts index 46e7a8a77a..2bb44b288f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/index.ts index e0ebeab894..80ebbf95dc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/utils.gen.ts index cae4007917..c131ed0046 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/client.gen.ts index 46e7a8a77a..2bb44b288f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/index.ts index e0ebeab894..80ebbf95dc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/utils.gen.ts index cae4007917..c131ed0046 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client.gen.ts index 1e9d9aac7e..2b11823381 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'https://foo.com' })); +export const client: Client = createClient(createConfig({ baseURL: 'https://foo.com' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/client.gen.ts index 46e7a8a77a..2bb44b288f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/index.ts index e0ebeab894..80ebbf95dc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/utils.gen.ts index cae4007917..c131ed0046 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/client.gen.ts index 46e7a8a77a..2bb44b288f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/index.ts index e0ebeab894..80ebbf95dc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/utils.gen.ts index cae4007917..c131ed0046 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts index 6831ba331c..e755a1776f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => (options.client ?? client).post({ +export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/client.gen.ts index 46e7a8a77a..2bb44b288f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/index.ts index e0ebeab894..80ebbf95dc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/utils.gen.ts index cae4007917..c131ed0046 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts index 6831ba331c..e755a1776f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => (options.client ?? client).post({ +export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client.gen.ts index 9732f8c950..eb20ab7464 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/client.gen.ts index 87e2bb604d..315c53a1e3 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/index.ts index 019cea1119..e5aa53315b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.ts'; export { buildClientParams } from '../core/params.gen.ts'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.ts'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.ts'; export { createClient } from './client.gen.ts'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/utils.gen.ts index 60b404cb19..0a46cde977 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/utils.gen.ts index c8df2941b6..fd9d09afdd 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts index fec09b78c1..7e4bc91c88 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.ts'; -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.ts'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => (options.client ?? client).post({ +export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/client.gen.ts index 46e7a8a77a..2bb44b288f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/index.ts index e0ebeab894..80ebbf95dc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/utils.gen.ts index cae4007917..c131ed0046 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts index 6831ba331c..e755a1776f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => (options.client ?? client).post({ +export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/client.gen.ts index 46e7a8a77a..2bb44b288f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/index.ts index e0ebeab894..80ebbf95dc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/utils.gen.ts index cae4007917..c131ed0046 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts index f8bc833c8c..059f33a403 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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 type Options = Options2 & { @@ -17,11 +17,11 @@ export type Options; }; -export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => options.client.post({ +export const import_ = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -30,36 +30,36 @@ export const import_ = (options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => options.client.post({ +export const callWithParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -68,7 +68,7 @@ export const callWithParameters = (options: Options) => options.client.post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -77,7 +77,7 @@ export const callWithWeirdParameterNames = (options: Options) => options.client.get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -86,7 +86,7 @@ export const getCallWithOptionalParam = (options: Options) => options.client.post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -95,7 +95,7 @@ export const postCallWithOptionalParam = (options: Options) => options.client.post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -104,7 +104,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -114,39 +114,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => options.client.post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => options.client.put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => options.client.get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => options.client.post({ +export const uploadFile = (options: Options): RequestResult => options.client.post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -156,17 +156,17 @@ export const uploadFile = (options: Options) => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => options.client.get({ +export const complexTypes = (options: Options): RequestResult => options.client.get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => options.client.post({ +export const multipartRequest = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -176,7 +176,7 @@ export const multipartRequest = (options: Options) => options.client.put({ +export const complexParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -185,16 +185,16 @@ export const complexParams = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => options.client.put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client.gen.ts index 0ec36621c6..be61b10fb9 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/client.gen.ts index 74291d3dc9..5eadd37a84 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/index.ts index 6e1cded27e..23c02d0ca8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/utils.gen.ts index b965c3fbf7..202243f37c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts index f04292d813..711f1017eb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => (options.client ?? client).post({ +export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client.gen.ts index 0ec36621c6..be61b10fb9 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/client.gen.ts index 74291d3dc9..5eadd37a84 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/index.ts index 6e1cded27e..23c02d0ca8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/utils.gen.ts index b965c3fbf7..202243f37c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts index f04292d813..711f1017eb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => (options.client ?? client).post({ +export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/client.gen.ts index 6d997f95ef..849bdb19e8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/utils.gen.ts index 06bcad1bdc..4c2116287a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/client.gen.ts index 6d997f95ef..849bdb19e8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/utils.gen.ts index 06bcad1bdc..4c2116287a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/client.gen.ts index 6d997f95ef..849bdb19e8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/utils.gen.ts index 06bcad1bdc..4c2116287a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client.gen.ts index 8bbb9115b8..975db8b4ac 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://foo.com' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://foo.com' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/client.gen.ts index 6d997f95ef..849bdb19e8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/utils.gen.ts index 06bcad1bdc..4c2116287a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/client.gen.ts index 6d997f95ef..849bdb19e8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/utils.gen.ts index 06bcad1bdc..4c2116287a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/client.gen.ts index 6d997f95ef..849bdb19e8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/utils.gen.ts index 06bcad1bdc..4c2116287a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client.gen.ts index 28b10b0a97..4ae8c41a32 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.ts'; import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.ts'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/client.gen.ts index fe583ddb70..99995d59a6 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/index.ts index 37cf146fcf..011b400534 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.ts'; export { buildClientParams } from '../core/params.gen.ts'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.ts'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.ts'; export { createClient } from './client.gen.ts'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/utils.gen.ts index 1702f2880d..be7295de1b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/utils.gen.ts index c8df2941b6..fd9d09afdd 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/sdk.gen.ts index e76187a0e0..93cda92000 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.ts'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.ts'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/client.gen.ts index 6d997f95ef..849bdb19e8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/utils.gen.ts index 06bcad1bdc..4c2116287a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/client.gen.ts index 6d997f95ef..849bdb19e8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/utils.gen.ts index 06bcad1bdc..4c2116287a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts index 592c57cc57..3e0ee2f545 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; export type Options = Options2 & { @@ -17,11 +17,11 @@ export type Options; }; -export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => options.client.post({ +export const import_ = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -30,36 +30,36 @@ export const import_ = (options: Options(options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => options.client.post({ +export const callWithParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -68,7 +68,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => options.client.post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -77,7 +77,7 @@ export const callWithWeirdParameterNames = (options: Options) => options.client.get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -86,7 +86,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => options.client.post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -95,7 +95,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -104,7 +104,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -114,39 +114,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => options.client.post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => options.client.put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => options.client.get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => options.client.post({ +export const uploadFile = (options: Options): RequestResult => options.client.post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -156,17 +156,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => options.client.get({ +export const complexTypes = (options: Options): RequestResult => options.client.get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => options.client.post({ +export const multipartRequest = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -176,7 +176,7 @@ export const multipartRequest = (options: } }); -export const complexParams = (options: Options) => options.client.put({ +export const complexParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -185,16 +185,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => options.client.put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client.gen.ts index 5ec626e5ad..0d2e476060 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/client.gen.ts index 2c1a2d1b3d..6878e5152f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/index.ts index 50acaa57b7..1fdabcccca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/utils.gen.ts index 3ac3b23861..db1e18fb69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/sdk.gen.ts index ea3ab06667..02bb1c9d69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client.gen.ts index 5ec626e5ad..0d2e476060 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client/index.js'; import type { ClientOptions as ClientOptions2 } from './types.gen.js'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen.js'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/client.gen.ts index 2c1a2d1b3d..6878e5152f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/index.ts index 50acaa57b7..1fdabcccca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen.js'; export { buildClientParams } from '../core/params.gen.js'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen.js'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen.js'; export { createClient } from './client.gen.js'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/utils.gen.ts index 3ac3b23861..db1e18fb69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/utils.gen.ts index fad9c2df67..53c009e2ec 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/sdk.gen.ts index ea3ab06667..02bb1c9d69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen.js'; export type Options = Options2 & { @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-false/custom-client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-false/custom-client.gen.ts index 5ce6077444..a525298499 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-false/custom-client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-false/custom-client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; @@ -14,4 +14,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-number/custom-client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-number/custom-client.gen.ts index 2c52cf6492..18755cc7d1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-number/custom-client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-number/custom-client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; @@ -14,4 +14,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-strict/custom-client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-strict/custom-client.gen.ts index 2c52cf6492..18755cc7d1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-strict/custom-client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-strict/custom-client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; @@ -14,4 +14,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-string/custom-client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-string/custom-client.gen.ts index e285d60ed1..77fe379685 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-string/custom-client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/base-url-string/custom-client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; @@ -14,4 +14,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://foo.com' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://foo.com' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/custom-client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/custom-client.gen.ts index 2c52cf6492..18755cc7d1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/custom-client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/custom-client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; @@ -14,4 +14,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/sdk.gen.ts index bef8d7acb1..212fa5adeb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from '@hey-api/custom-client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from '@hey-api/custom-client'; import { client } from './custom-client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -19,11 +19,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -32,36 +32,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -70,7 +70,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -79,7 +79,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -88,7 +88,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -97,7 +97,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -106,7 +106,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -116,39 +116,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -158,17 +158,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -178,7 +178,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -187,16 +187,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/custom-client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/custom-client.gen.ts index 2c52cf6492..18755cc7d1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/custom-client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/custom-client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; @@ -14,4 +14,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/sdk.gen.ts index bef8d7acb1..212fa5adeb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-optional/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from '@hey-api/custom-client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from '@hey-api/custom-client'; import { client } from './custom-client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -19,11 +19,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -32,36 +32,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -70,7 +70,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -79,7 +79,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -88,7 +88,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -97,7 +97,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -106,7 +106,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -116,39 +116,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -158,17 +158,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -178,7 +178,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -187,16 +187,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/custom-client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/custom-client.gen.ts index 2c52cf6492..18755cc7d1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/custom-client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/custom-client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from '@hey-api/custom-client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; @@ -14,4 +14,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts index 4cdad566c4..2e1731cb78 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from '@hey-api/custom-client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from '@hey-api/custom-client'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => options.client.post({ +export const import_ = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => options.client.post({ +export const callWithParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => options.client.post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => options.client.get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => options.client.post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => options.client.post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => options.client.put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => options.client.get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => options.client.post({ +export const uploadFile = (options: Options): RequestResult => options.client.post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => options.client.get({ +export const complexTypes = (options: Options): RequestResult => options.client.get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => options.client.post({ +export const multipartRequest = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options: } }); -export const complexParams = (options: Options) => options.client.put({ +export const complexParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => options.client.put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/custom.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/custom.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/custom.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/custom.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/custom.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/custom.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/custom.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/custom.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/custom.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/custom.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/custom.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/custom.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/custom.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/custom.gen.ts index 8bbb9115b8..975db8b4ac 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/custom.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/custom.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://foo.com' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://foo.com' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/custom.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/custom.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/custom.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/custom.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/sdk.gen.ts index c70815d0f4..5cd65ac81e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './custom.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/custom.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/custom.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/custom.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/custom.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/sdk.gen.ts index c70815d0f4..5cd65ac81e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './custom.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/custom.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/custom.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/custom.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/custom.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/sdk.gen.ts index c70815d0f4..5cd65ac81e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './custom.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/custom.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/custom.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/custom.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/custom.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts index 592c57cc57..3e0ee2f545 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; export type Options = Options2 & { @@ -17,11 +17,11 @@ export type Options; }; -export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => options.client.post({ +export const import_ = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -30,36 +30,36 @@ export const import_ = (options: Options(options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => options.client.post({ +export const callWithParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -68,7 +68,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => options.client.post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -77,7 +77,7 @@ export const callWithWeirdParameterNames = (options: Options) => options.client.get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -86,7 +86,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => options.client.post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -95,7 +95,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -104,7 +104,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -114,39 +114,39 @@ export const postApiVbyApiVersionFormData = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options) => options.client.post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options) => options.client.put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => options.client.get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => options.client.post({ +export const uploadFile = (options: Options): RequestResult => options.client.post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -156,17 +156,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => options.client.get({ +export const complexTypes = (options: Options): RequestResult => options.client.get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options: Options) => options.client.post({ +export const multipartRequest = (options: Options): RequestResult => options.client.post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -176,7 +176,7 @@ export const multipartRequest = (options: } }); -export const complexParams = (options: Options) => options.client.put({ +export const complexParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -185,16 +185,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => options.client.put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/sdk.gen.ts index 2c65e8b6c0..e66bf74e17 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/sdk.gen.ts index 356f765d0d..ccf80d6d92 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses, PatchFooData, PatchFooResponses, PostFooData, PostFooResponses, PutFooData, PutFooResponses } from './types.gen'; @@ -18,9 +18,9 @@ export type Options; }; -export const getFoo = (options: Options) => (options.client ?? client).get({ url: '/foo', ...options }); +export const getFoo = (options: Options): RequestResult => (options.client ?? client).get({ url: '/foo', ...options }); -export const patchFoo = (options?: Options) => (options?.client ?? client).patch({ +export const patchFoo = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/foo', ...options, headers: { @@ -29,7 +29,7 @@ export const patchFoo = (options?: Options } }); -export const postFoo = (options: Options) => (options.client ?? client).post({ +export const postFoo = (options: Options): RequestResult => (options.client ?? client).post({ url: '/foo', ...options, headers: { @@ -38,7 +38,7 @@ export const postFoo = (options: Options

(options: Options) => (options.client ?? client).put({ +export const putFoo = (options: Options): RequestResult => (options.client ?? client).put({ url: '/foo', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/sdk.gen.ts index 7992f537a2..c0b898c4fb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { PostFooData, PostFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options?: Options) => (options?.client ?? client).post({ +export const postFoo = (options?: Options): RequestResult => (options?.client ?? client).post({ querySerializer: { parameters: { foo: { array: { explode: false } } } }, url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/sdk.gen.ts index 7992f537a2..c0b898c4fb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { PostFooData, PostFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options?: Options) => (options?.client ?? client).post({ +export const postFoo = (options?: Options): RequestResult => (options?.client ?? client).post({ querySerializer: { parameters: { foo: { array: { explode: false } } } }, url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts index 91431a46fb..a84376c551 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { BusinessGetData, BusinessGetResponses, BusinessProvidersDomainsGetData, BusinessProvidersDomainsGetResponses, BusinessProvidersDomainsPostData, BusinessProvidersDomainsPostResponses, GetData, GetResponses, PutBusinessProvidersDomainsData, PutBusinessProvidersDomainsResponses } from './types.gen'; @@ -47,11 +47,11 @@ class HeyApiRegistry { } export class Domains extends HeyApiClient { - public get(options?: Options) { + public get(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/business/providers/domains', ...options }); } - public post(options?: Options) { + public post(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/business/providers/domains', ...options }); } } @@ -64,7 +64,7 @@ export class Providers extends HeyApiClient { } export class Business extends HeyApiClient { - public get(options?: Options) { + public get(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/locations/businesses', ...options }); } @@ -75,7 +75,7 @@ export class Business extends HeyApiClient { } export class NestedSdkWithInstance extends HeyApiClient { - public static readonly __registry = new HeyApiRegistry(); + public static readonly __registry: HeyApiRegistry = new HeyApiRegistry(); constructor(args?: { client?: Client; @@ -85,11 +85,11 @@ export class NestedSdkWithInstance extends HeyApiClient { NestedSdkWithInstance.__registry.set(this, args?.key); } - public putBusinessProvidersDomains(options?: Options) { + public putBusinessProvidersDomains(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/business/providers/domains', ...options }); } - public get(options?: Options) { + public get(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/locations', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts index 5e0709364e..28a45393db 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { BusinessGetData, BusinessGetResponses, BusinessProvidersDomainsGetData, BusinessProvidersDomainsGetResponses, BusinessProvidersDomainsPostData, BusinessProvidersDomainsPostResponses, GetData, GetResponses, PutBusinessProvidersDomainsData, PutBusinessProvidersDomainsResponses } from './types.gen'; @@ -19,11 +19,11 @@ export type Options(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/business/providers/domains', ...options }); } - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } } @@ -33,7 +33,7 @@ export class Providers { } export class Business { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/locations/businesses', ...options }); } @@ -45,11 +45,11 @@ export class Business2 { } export class Domains2 { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/business/providers/domains', ...options }); } - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } } @@ -67,11 +67,11 @@ export class Providers3 { } export class Domains3 { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/business/providers/domains', ...options }); } - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } } @@ -85,7 +85,7 @@ export class Business4 { } export class Domains4 { - public static putBusinessProvidersDomains(options?: Options) { + public static putBusinessProvidersDomains(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/business/providers/domains', ...options }); } @@ -93,13 +93,13 @@ export class Domains4 { } export class Business5 { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/locations/businesses', ...options }); } } export class Locations { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/locations', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/sdk.gen.ts index 37d8e7eb09..c544c952a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { FooBarPostData, FooBarPostResponses, FooBarPutData, FooBarPutResponses, FooPostData, FooPostResponses, FooPutData, FooPutResponses, GetFooBarData, GetFooBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -47,21 +47,21 @@ class HeyApiRegistry { } export class Bar extends HeyApiClient { - public post(options?: Options) { + public post(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/foo/bar', ...options }); } - public put(options?: Options) { + public put(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/foo/bar', ...options }); } } export class Foo extends HeyApiClient { - public post(options?: Options) { + public post(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/foo', ...options }); } - public put(options?: Options) { + public put(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/foo', ...options }); } @@ -72,7 +72,7 @@ export class Foo extends HeyApiClient { } export class Sdk extends HeyApiClient { - public static readonly __registry = new HeyApiRegistry(); + public static readonly __registry: HeyApiRegistry = new HeyApiRegistry(); constructor(args?: { client?: Client; @@ -82,11 +82,11 @@ export class Sdk extends HeyApiClient { Sdk.__registry.set(this, args?.key); } - public getFoo(options?: Options) { + public getFoo(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/foo', ...options }); } - public getFooBar(options?: Options) { + public getFooBar(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/foo/bar', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts index f29dcbc48a..fbfe4432d4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base', throwOnError: true })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base', throwOnError: true })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts index 1271b6f7b5..834e28f6d4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options: } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = } }); -export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (op } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = (o } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Options } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opti } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/sdk.gen.ts index 1b25cb8c30..37e8f46ff4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { FooBarPostData, FooBarPostResponses, FooBarPutData, FooBarPutResponses, FooPostData, FooPostResponses, FooPutData, FooPutResponses, GetFooBarData, GetFooBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -19,21 +19,21 @@ export type Options(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo/bar', ...options }); } } export class FooService { - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo', ...options }); } @@ -41,7 +41,7 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { + public static getFoo(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/foo', ...options }); } @@ -49,11 +49,11 @@ export class FooBazService { } export class BarService2 { - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo/bar', ...options }); } } @@ -63,7 +63,7 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { + public static getFooBar(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/foo/bar', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/sdk.gen.ts index 6271eb6862..154e897a5b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetBarData, GetBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ in: 'query', name: 'foo', @@ -28,7 +28,7 @@ export const getFoo = (options?: Options(options?: Options) => (options?.client ?? client).get({ +export const getBar = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ in: 'cookie', name: 'bar', diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/sdk.gen.ts index f4a101c6e6..035123d267 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,4 +18,4 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/foo', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/sdk.gen.ts index f55d9bf294..954e6cc005 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/sdk.gen.ts index f55d9bf294..954e6cc005 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/sdk.gen.ts index f55d9bf294..954e6cc005 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { GetFooData, GetFooResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client.gen.ts index 18eaae2482..062d4c760a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'https://foo.com/v1' })); +export const client: Client = createClient(createConfig({ baseUrl: 'https://foo.com/v1' })); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts index 230de2cf1e..2446e5d146 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts @@ -108,7 +108,10 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/utils.gen.ts index 3ecc10481a..33dd0e56bb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/utils.gen.ts @@ -95,8 +95,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -182,12 +182,13 @@ export const getParseAs = ( return; }; -export async function setAuthParams( - options: Pick & { - headers: HttpHeaders; - }, -): Promise { - for (const auth of options.security ?? []) { +export const setAuthParams = async ( + options: Pick, 'security'> & + Pick & { + headers: HttpHeaders; + }, +): Promise => { + for (const auth of options.security) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -214,7 +215,7 @@ export async function setAuthParams( return; } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -242,7 +243,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts index 17e3dbb590..6257b4a972 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -23,4 +23,4 @@ export type Options(options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); +export const eventSubscribe = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts index f0eea98863..662a5f3949 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -23,7 +23,7 @@ export type Options(options?: Options) => (options?.client ?? client).sse.get({ +export const eventSubscribe = (options?: Options): Promise> => (options?.client ?? client).sse.get({ responseType: 'text', url: '/event', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts index 17e3dbb590..6257b4a972 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -23,4 +23,4 @@ export type Options(options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); +export const eventSubscribe = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/client.gen.ts index 5e7ac14691..1e8882f023 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/client.gen.ts @@ -47,7 +47,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/utils.gen.ts index f00cd1fd1e..c34b11e5a1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/utils.gen.ts @@ -94,8 +94,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -198,12 +198,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -231,7 +233,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -259,7 +261,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts index 17e3dbb590..6257b4a972 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -23,4 +23,4 @@ export type Options(options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); +export const eventSubscribe = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/client.gen.ts index 46e7a8a77a..2bb44b288f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/client.gen.ts @@ -40,7 +40,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { @@ -71,16 +74,12 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - const authOpts: Parameters[0] = { + await setAuthParams({ auth: opts.auth, headers: options.headers, query: options.query, security, - }; - await setAuthParams(authOpts); - if (authOpts.query !== options.query) { - options.query = authOpts.query; - } + }); } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/index.ts index e0ebeab894..80ebbf95dc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/utils.gen.ts index cae4007917..c131ed0046 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/utils.gen.ts @@ -97,8 +97,8 @@ const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; const qParams = toValue(queryParams); if (qParams && typeof qParams === 'object') { @@ -165,12 +165,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -202,7 +204,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ @@ -227,7 +229,7 @@ export const getUrl = ({ }: Pick & { baseUrl?: string; querySerializer: QuerySerializer; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts index 7dcd68e14c..fc31bb9d40 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Composable, Options as Options2, TDataShape } from './client'; +import type { Client, Composable, Options as Options2, RequestResult, ServerSentEventsResult, TDataShape } from './client'; import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse } from './types.gen'; @@ -23,4 +23,4 @@ export type Options(options: Options) => (options.client ?? client).sse.get({ url: '/event', ...options }); +export const eventSubscribe = (options: Options): Promise>> => (options.client ?? client).sse.get({ url: '/event', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/client.gen.ts index 6d997f95ef..849bdb19e8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/client.gen.ts @@ -49,7 +49,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/utils.gen.ts index 06bcad1bdc..4c2116287a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/utils.gen.ts @@ -23,8 +23,8 @@ import type { export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -149,12 +149,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -183,7 +185,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts index 17e3dbb590..6257b4a972 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -23,4 +23,4 @@ export type Options(options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); +export const eventSubscribe = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/params.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/index.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/index.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/params.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/params.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/sdk.gen.ts index d34f222efa..9efa19fc06 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape } from './client'; import { client } from './client.gen'; import type { ApiVVersionApiVersionOdataAccountingCompaniesCountData, ApiVVersionApiVersionOdataAccountingCompaniesCountResponses, ApiVVersionApiVersionOdataAccountingCompaniesData, ApiVVersionApiVersionOdataAccountingCompaniesResponses, ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountData, ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountResponses, ApiVVersionApiVersionOdataAccountingCompanyMembershipsData, ApiVVersionApiVersionOdataAccountingCompanyMembershipsResponses, ApiVVersionApiVersionOdataBankAccountsCountData, ApiVVersionApiVersionOdataBankAccountsCountResponses, ApiVVersionApiVersionOdataBankAccountsData, ApiVVersionApiVersionOdataBankAccountsResponses, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountData, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountResponses, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsData, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsResponses, ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountData, ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountResponses, ApiVVersionApiVersionOdataBusinessDocumentActivitiesData, ApiVVersionApiVersionOdataBusinessDocumentActivitiesResponses, ApiVVersionApiVersionOdataBusinessDocumentsCountData, ApiVVersionApiVersionOdataBusinessDocumentsCountResponses, ApiVVersionApiVersionOdataBusinessDocumentsData, ApiVVersionApiVersionOdataBusinessDocumentsResponses, ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountData, ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountResponses, ApiVVersionApiVersionOdataBusinessDocumentsSummariesData, ApiVVersionApiVersionOdataBusinessDocumentsSummariesResponses, ApiVVersionApiVersionOdataBusinessesCountData, ApiVVersionApiVersionOdataBusinessesCountResponses, ApiVVersionApiVersionOdataBusinessesData, ApiVVersionApiVersionOdataBusinessesKey2Data, ApiVVersionApiVersionOdataBusinessesKey2Responses, ApiVVersionApiVersionOdataBusinessesKeyData, ApiVVersionApiVersionOdataBusinessesKeyResponses, ApiVVersionApiVersionOdataBusinessesResponses, ApiVVersionApiVersionOdataBusinessSummariesCountData, ApiVVersionApiVersionOdataBusinessSummariesCountResponses, ApiVVersionApiVersionOdataBusinessSummariesData, ApiVVersionApiVersionOdataBusinessSummariesResponses, ApiVVersionApiVersionOdataCounterpartiesCountData, ApiVVersionApiVersionOdataCounterpartiesCountResponses, ApiVVersionApiVersionOdataCounterpartiesData, ApiVVersionApiVersionOdataCounterpartiesResponses, ApiVVersionApiVersionOdataDataBoxCredentialsCountData, ApiVVersionApiVersionOdataDataBoxCredentialsCountResponses, ApiVVersionApiVersionOdataDataBoxCredentialsData, ApiVVersionApiVersionOdataDataBoxCredentialsResponses, ApiVVersionApiVersionOdataDocumentTypesCountData, ApiVVersionApiVersionOdataDocumentTypesCountResponses, ApiVVersionApiVersionOdataDocumentTypesData, ApiVVersionApiVersionOdataDocumentTypesResponses, ApiVVersionApiVersionOdataInvitationsCountData, ApiVVersionApiVersionOdataInvitationsCountResponses, ApiVVersionApiVersionOdataInvitationsData, ApiVVersionApiVersionOdataInvitationsResponses, ApiVVersionApiVersionOdataInvoicesCountData, ApiVVersionApiVersionOdataInvoicesCountResponses, ApiVVersionApiVersionOdataInvoicesData, ApiVVersionApiVersionOdataInvoiceSettingsCountData, ApiVVersionApiVersionOdataInvoiceSettingsCountResponses, ApiVVersionApiVersionOdataInvoiceSettingsData, ApiVVersionApiVersionOdataInvoiceSettingsResponses, ApiVVersionApiVersionOdataInvoicesResponses, ApiVVersionApiVersionOdataLicensesCountData, ApiVVersionApiVersionOdataLicensesCountResponses, ApiVVersionApiVersionOdataLicensesData, ApiVVersionApiVersionOdataLicensesResponses, ApiVVersionApiVersionOdataPersonalDocumentsCountData, ApiVVersionApiVersionOdataPersonalDocumentsCountResponses, ApiVVersionApiVersionOdataPersonalDocumentsData, ApiVVersionApiVersionOdataPersonalDocumentsResponses, ApiVVersionApiVersionOdataRecurringTasksCountData, ApiVVersionApiVersionOdataRecurringTasksCountResponses, ApiVVersionApiVersionOdataRecurringTasksData, ApiVVersionApiVersionOdataRecurringTasksResponses, ApiVVersionApiVersionOdataTasksCountData, ApiVVersionApiVersionOdataTasksCountResponses, ApiVVersionApiVersionOdataTasksData, ApiVVersionApiVersionOdataTasksKey2Data, ApiVVersionApiVersionOdataTasksKey2Responses, ApiVVersionApiVersionOdataTasksKeyData, ApiVVersionApiVersionOdataTasksKeyResponses, ApiVVersionApiVersionOdataTasksResponses, DeleteApiV1AccountingCompaniesByIdData, DeleteApiV1AccountingCompaniesByIdResponses, DeleteApiV1AccountingCompanyMembershipsByIdData, DeleteApiV1AccountingCompanyMembershipsByIdResponses, DeleteApiV1BankAccountsByIdData, DeleteApiV1BankAccountsByIdResponses, DeleteApiV1BusinessAccountantAssignmentsByIdData, DeleteApiV1BusinessAccountantAssignmentsByIdResponses, DeleteApiV1BusinessDocumentsByIdData, DeleteApiV1BusinessDocumentsByIdResponses, DeleteApiV1BusinessesByIdData, DeleteApiV1BusinessesByIdResponses, DeleteApiV1CounterpartiesByIdData, DeleteApiV1CounterpartiesByIdResponses, DeleteApiV1DataBoxCredentialsByIdData, DeleteApiV1DataBoxCredentialsByIdResponses, DeleteApiV1InvitationsByIdData, DeleteApiV1InvitationsByIdResponses, DeleteApiV1InvoicesByIdData, DeleteApiV1InvoicesByIdResponses, DeleteApiV1NotificationsDeviceTokensData, DeleteApiV1NotificationsDeviceTokensResponses, DeleteApiV1PersonalDocumentsByIdData, DeleteApiV1PersonalDocumentsByIdResponses, DeleteApiV1RecurringTasksByIdData, DeleteApiV1RecurringTasksByIdResponses, DeleteApiV1UserData, DeleteApiV1UserResponses, GetApiDevConfirmEmailData, GetApiDevConfirmEmailResponses, GetApiDevData, GetApiDevDbCreateData, GetApiDevDbCreateResponses, GetApiDevDbReset2Data, GetApiDevDbReset2Responses, GetApiDevDbResetData, GetApiDevDbResetResponses, GetApiDevDbTouchData, GetApiDevDbTouchResponses, GetApiDevEmailSendTestData, GetApiDevEmailSendTestResponses, GetApiDevJobProcessRecurringTasksData, GetApiDevJobProcessRecurringTasksResponses, GetApiDevNotificationsSendTestData, GetApiDevNotificationsSendTestResponses, GetApiDevReseedDbData, GetApiDevReseedDbResponses, GetApiDevResponses, GetApiDevSeedAllData, GetApiDevSeedAllResponses, GetApiDevSeedData, GetApiDevSeedProdData, GetApiDevSeedProdResponses, GetApiDevSeedResponses, GetApiV1BusinessDocumentsByIdRawData, GetApiV1BusinessDocumentsByIdRawResponses, GetApiV1BusinessesByIdDocumentTypesSummaryData, GetApiV1BusinessesByIdDocumentTypesSummaryResponses, GetApiV1InvoicesByIdPreviewData, GetApiV1InvoicesByIdPreviewResponses, GetApiV1PersonalDocumentsByIdRawData, GetApiV1PersonalDocumentsByIdRawResponses, GetApiV1PersonalDocumentsSummaryData, GetApiV1PersonalDocumentsSummaryResponses, GetApiV1TasksByIdCommentsData, GetApiV1TasksByIdCommentsResponses, GetApiV1TasksByIdDocumentsData, GetApiV1TasksByIdDocumentsResponses, GetApiV1UserDocumentsSummaryData, GetApiV1UserDocumentsSummaryResponses, GetApiV1UserManageInfoData, GetApiV1UserManageInfoErrors, GetApiV1UserManageInfoResponses, GetApiV1UsersMeData, GetApiV1UsersMeResponses, GetData, GetResponses, MapIdentityApiApiVVersionApiVersionUserConfirmEmailData, MapIdentityApiApiVVersionApiVersionUserConfirmEmailResponses, PatchApiV1CounterpartiesByIdData, PatchApiV1CounterpartiesByIdResponses, PatchApiV1InvitationsByIdData, PatchApiV1InvitationsByIdResponses, PatchApiV1InvoicesByIdData, PatchApiV1InvoicesByIdResponses, PatchApiV1RecurringTasksByIdData, PatchApiV1RecurringTasksByIdResponses, PatchApiV1UsersByIdData, PatchApiV1UsersByIdResponses, PostApiV1AccountingCompaniesByIdData, PostApiV1AccountingCompaniesByIdResponses, PostApiV1AccountingCompaniesData, PostApiV1AccountingCompaniesResponses, PostApiV1BusinessDocumentsByIdApproveData, PostApiV1BusinessDocumentsByIdApproveResponses, PostApiV1BusinessDocumentsByIdMoveToBusinessData, PostApiV1BusinessDocumentsByIdMoveToBusinessResponses, PostApiV1BusinessDocumentsByIdMoveToPersonalData, PostApiV1BusinessDocumentsByIdMoveToPersonalResponses, PostApiV1BusinessDocumentsByIdUnapproveData, PostApiV1BusinessDocumentsByIdUnapproveResponses, PostApiV1BusinessDocumentsData, PostApiV1BusinessDocumentsResponses, PostApiV1BusinessesByIdDisconnectData, PostApiV1BusinessesByIdDisconnectResponses, PostApiV1BusinessesData, PostApiV1BusinessesResponses, PostApiV1CounterpartiesData, PostApiV1CounterpartiesResponses, PostApiV1FeedbackData, PostApiV1FeedbackResponses, PostApiV1InvitationsByIdAcceptData, PostApiV1InvitationsByIdAcceptResponses, PostApiV1InvitationsByIdRejectData, PostApiV1InvitationsByIdRejectResponses, PostApiV1InvitationsData, PostApiV1InvitationsResponses, PostApiV1InvoicesByIdSendData, PostApiV1InvoicesByIdSendResponses, PostApiV1InvoicesByIdSnapshotData, PostApiV1InvoicesByIdSnapshotResponses, PostApiV1InvoicesData, PostApiV1InvoicesResponses, PostApiV1NotificationsTestData, PostApiV1NotificationsTestResponses, PostApiV1PersonalDocumentsByIdMoveToBusinessData, PostApiV1PersonalDocumentsByIdMoveToBusinessResponses, PostApiV1PersonalDocumentsData, PostApiV1PersonalDocumentsResponses, PostApiV1RecurringTasksData, PostApiV1RecurringTasksResponses, PostApiV1TasksByIdApproveData, PostApiV1TasksByIdApproveResponses, PostApiV1TasksByIdRejectData, PostApiV1TasksByIdRejectResponses, PostApiV1TasksByIdSubmitData, PostApiV1TasksByIdSubmitResponses, PostApiV1TasksData, PostApiV1TasksResponses, PostApiV1UserForgotPasswordData, PostApiV1UserForgotPasswordErrors, PostApiV1UserForgotPasswordResponses, PostApiV1UserLoginData, PostApiV1UserLoginResponses, PostApiV1UserLogoutData, PostApiV1UserLogoutResponses, PostApiV1UserManage2FaData, PostApiV1UserManage2FaErrors, PostApiV1UserManage2FaResponses, PostApiV1UserManageInfoData, PostApiV1UserManageInfoErrors, PostApiV1UserManageInfoResponses, PostApiV1UserRefreshData, PostApiV1UserRefreshResponses, PostApiV1UserRegisterData, PostApiV1UserRegisterErrors, PostApiV1UserRegisterResponses, PostApiV1UserResendConfirmationEmailData, PostApiV1UserResendConfirmationEmailResponses, PostApiV1UserResetPasswordData, PostApiV1UserResetPasswordErrors, PostApiV1UserResetPasswordResponses, PutApiV1AccountingCompanyMembershipsData, PutApiV1AccountingCompanyMembershipsResponses, PutApiV1BankAccountsData, PutApiV1BankAccountsResponses, PutApiV1BusinessAccountantAssignmentsData, PutApiV1BusinessAccountantAssignmentsResponses, PutApiV1BusinessDocumentsByIdData, PutApiV1BusinessDocumentsByIdResponses, PutApiV1BusinessesByIdContactData, PutApiV1BusinessesByIdContactResponses, PutApiV1BusinessesByIdData, PutApiV1BusinessesByIdResponses, PutApiV1BusinessMembershipsData, PutApiV1BusinessMembershipsResponses, PutApiV1DataBoxCredentialsData, PutApiV1DataBoxCredentialsResponses, PutApiV1InvoiceSettingsData, PutApiV1InvoiceSettingsResponses, PutApiV1NotificationsDeviceTokensData, PutApiV1NotificationsDeviceTokensResponses, PutApiV1TasksByIdData, PutApiV1TasksByIdResponses } from './types.gen'; @@ -19,13 +19,13 @@ export type Options(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanies/$count', ...options }); } } export class Odata { - public static accountingCompanies(options?: Options) { + public static accountingCompanies(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanies', ...options }); } @@ -41,7 +41,7 @@ export class Api { } export class AccountingCompanies2 { - public static postApiV1AccountingCompanies(options?: Options) { + public static postApiV1AccountingCompanies(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/api/v1/accounting-companies', ...options, @@ -52,11 +52,11 @@ export class AccountingCompanies2 { }); } - public static deleteApiV1AccountingCompaniesById(options: Options) { + public static deleteApiV1AccountingCompaniesById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/accounting-companies/{id}', ...options }); } - public static postApiV1AccountingCompaniesById(options: Options) { + public static postApiV1AccountingCompaniesById(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/accounting-companies/{id}', ...options, @@ -71,13 +71,13 @@ export class AccountingCompanies2 { } export class AccountingCompanyMemberships { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanyMemberships/$count', ...options }); } } export class Odata2 { - public static accountingCompanyMemberships(options?: Options) { + public static accountingCompanyMemberships(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanyMemberships', ...options }); } @@ -93,7 +93,7 @@ export class Api2 { } export class AccountingCompanyMemberships2 { - public static putApiV1AccountingCompanyMemberships(options?: Options) { + public static putApiV1AccountingCompanyMemberships(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/api/v1/accounting-company-memberships', ...options, @@ -104,7 +104,7 @@ export class AccountingCompanyMemberships2 { }); } - public static deleteApiV1AccountingCompanyMembershipsById(options: Options) { + public static deleteApiV1AccountingCompanyMembershipsById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/accounting-company-memberships/{id}', ...options }); } @@ -112,13 +112,13 @@ export class AccountingCompanyMemberships2 { } export class BankAccounts { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BankAccounts/$count', ...options }); } } export class Odata3 { - public static bankAccounts(options?: Options) { + public static bankAccounts(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BankAccounts', ...options }); } @@ -134,7 +134,7 @@ export class Api3 { } export class BankAccounts2 { - public static putApiV1BankAccounts(options?: Options) { + public static putApiV1BankAccounts(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/api/v1/bank-accounts', ...options, @@ -145,7 +145,7 @@ export class BankAccounts2 { }); } - public static deleteApiV1BankAccountsById(options: Options) { + public static deleteApiV1BankAccountsById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/bank-accounts/{id}', ...options }); } @@ -153,13 +153,13 @@ export class BankAccounts2 { } export class BusinessAccountantAssignments { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BusinessAccountantAssignments/$count', ...options }); } } export class Odata4 { - public static businessAccountantAssignments(options?: Options) { + public static businessAccountantAssignments(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BusinessAccountantAssignments', ...options }); } @@ -175,7 +175,7 @@ export class Api4 { } export class BusinessAccountantAssignments2 { - public static putApiV1BusinessAccountantAssignments(options?: Options) { + public static putApiV1BusinessAccountantAssignments(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/api/v1/business-accountant-assignments', ...options, @@ -186,7 +186,7 @@ export class BusinessAccountantAssignments2 { }); } - public static deleteApiV1BusinessAccountantAssignmentsById(options: Options) { + public static deleteApiV1BusinessAccountantAssignmentsById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/business-accountant-assignments/{id}', ...options }); } @@ -194,23 +194,23 @@ export class BusinessAccountantAssignments2 { } export class BusinessDocumentActivities { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentActivities/$count', ...options }); } } export class BusinessDocuments { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocuments/$count', ...options }); } } export class Odata5 { - public static businessDocumentActivities(options?: Options) { + public static businessDocumentActivities(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentActivities', ...options }); } - public static businessDocuments(options?: Options) { + public static businessDocuments(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocuments', ...options }); } @@ -228,11 +228,11 @@ export class Api5 { } export class BusinessDocuments2 { - public static getApiV1BusinessDocumentsByIdRaw(options: Options) { + public static getApiV1BusinessDocumentsByIdRaw(options: Options): RequestResult { return (options.client ?? client).get({ url: '/api/v1/business-documents/{id}/raw', ...options }); } - public static postApiV1BusinessDocuments(options?: Options) { + public static postApiV1BusinessDocuments(options?: Options): RequestResult { return (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v1/business-documents', @@ -244,11 +244,11 @@ export class BusinessDocuments2 { }); } - public static deleteApiV1BusinessDocumentsById(options: Options) { + public static deleteApiV1BusinessDocumentsById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/business-documents/{id}', ...options }); } - public static putApiV1BusinessDocumentsById(options: Options) { + public static putApiV1BusinessDocumentsById(options: Options): RequestResult { return (options.client ?? client).put({ url: '/api/v1/business-documents/{id}', ...options, @@ -259,19 +259,19 @@ export class BusinessDocuments2 { }); } - public static postApiV1BusinessDocumentsByIdApprove(options: Options) { + public static postApiV1BusinessDocumentsByIdApprove(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/approve', ...options }); } - public static postApiV1BusinessDocumentsByIdUnapprove(options: Options) { + public static postApiV1BusinessDocumentsByIdUnapprove(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/unapprove', ...options }); } - public static postApiV1BusinessDocumentsByIdMoveToPersonal(options: Options) { + public static postApiV1BusinessDocumentsByIdMoveToPersonal(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/move-to-personal', ...options }); } - public static postApiV1BusinessDocumentsByIdMoveToBusiness(options: Options) { + public static postApiV1BusinessDocumentsByIdMoveToBusiness(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/move-to-business', ...options, @@ -289,7 +289,7 @@ export class BusinessDocumentsSummaries { /** * @deprecated */ - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentsSummaries/$count', ...options }); } } @@ -298,7 +298,7 @@ export class Odata6 { /** * @deprecated */ - public static businessDocumentsSummaries(options?: Options) { + public static businessDocumentsSummaries(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentsSummaries', ...options }); } @@ -318,21 +318,21 @@ export class BusinessDocumentsSummaries2 { } export class Businesses { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Businesses/$count', ...options }); } - public static key(options?: Options) { + public static key(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Businesses/{key}', ...options }); } } export class Odata7 { - public static businesses(options?: Options) { + public static businesses(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Businesses', ...options }); } - public static businessesKey(options?: Options) { + public static businessesKey(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Businesses({key})', ...options }); } @@ -348,11 +348,11 @@ export class Api7 { } export class Businesses2 { - public static getApiV1BusinessesByIdDocumentTypesSummary(options: Options) { + public static getApiV1BusinessesByIdDocumentTypesSummary(options: Options): RequestResult { return (options.client ?? client).get({ url: '/api/v1/businesses/{id}/document-types-summary', ...options }); } - public static postApiV1Businesses(options?: Options) { + public static postApiV1Businesses(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/api/v1/businesses', ...options, @@ -363,11 +363,11 @@ export class Businesses2 { }); } - public static deleteApiV1BusinessesById(options: Options) { + public static deleteApiV1BusinessesById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/businesses/{id}', ...options }); } - public static putApiV1BusinessesById(options: Options) { + public static putApiV1BusinessesById(options: Options): RequestResult { return (options.client ?? client).put({ url: '/api/v1/businesses/{id}', ...options, @@ -378,7 +378,7 @@ export class Businesses2 { }); } - public static putApiV1BusinessesByIdContact(options: Options) { + public static putApiV1BusinessesByIdContact(options: Options): RequestResult { return (options.client ?? client).put({ url: '/api/v1/businesses/{id}/contact', ...options, @@ -389,7 +389,7 @@ export class Businesses2 { }); } - public static postApiV1BusinessesByIdDisconnect(options: Options) { + public static postApiV1BusinessesByIdDisconnect(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/businesses/{id}/disconnect', ...options }); } @@ -397,7 +397,7 @@ export class Businesses2 { } export class BusinessesMemberships { - public static putApiV1BusinessMemberships(options?: Options) { + public static putApiV1BusinessMemberships(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/api/v1/business-memberships', ...options, @@ -410,13 +410,13 @@ export class BusinessesMemberships { } export class BusinessSummaries { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BusinessSummaries/$count', ...options }); } } export class Odata8 { - public static businessSummaries(options?: Options) { + public static businessSummaries(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/BusinessSummaries', ...options }); } @@ -436,13 +436,13 @@ export class BusinessSummaries2 { } export class Counterparties { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Counterparties/$count', ...options }); } } export class Odata9 { - public static counterparties(options?: Options) { + public static counterparties(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Counterparties', ...options }); } @@ -458,7 +458,7 @@ export class Api9 { } export class Counterparties2 { - public static postApiV1Counterparties(options?: Options) { + public static postApiV1Counterparties(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/api/v1/counterparties', ...options, @@ -469,11 +469,11 @@ export class Counterparties2 { }); } - public static deleteApiV1CounterpartiesById(options: Options) { + public static deleteApiV1CounterpartiesById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/counterparties/{id}', ...options }); } - public static patchApiV1CounterpartiesById(options: Options) { + public static patchApiV1CounterpartiesById(options: Options): RequestResult { return (options.client ?? client).patch({ url: '/api/v1/counterparties/{id}', ...options, @@ -488,13 +488,13 @@ export class Counterparties2 { } export class DataBoxCredentials { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/DataBoxCredentials/$count', ...options }); } } export class Odata10 { - public static dataBoxCredentials(options?: Options) { + public static dataBoxCredentials(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/DataBoxCredentials', ...options }); } @@ -510,7 +510,7 @@ export class Api10 { } export class DataBoxCredentials2 { - public static putApiV1DataBoxCredentials(options?: Options) { + public static putApiV1DataBoxCredentials(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/api/v1/data-box-credentials', ...options, @@ -521,7 +521,7 @@ export class DataBoxCredentials2 { }); } - public static deleteApiV1DataBoxCredentialsById(options: Options) { + public static deleteApiV1DataBoxCredentialsById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/data-box-credentials/{id}', ...options }); } @@ -529,61 +529,61 @@ export class DataBoxCredentials2 { } export class Dev { - public static getApiDev(options?: Options) { + public static getApiDev(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev', ...options }); } - public static getApiDevReseedDb(options?: Options) { + public static getApiDevReseedDb(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/reseed-db', ...options }); } - public static getApiDevDbReset(options?: Options) { + public static getApiDevDbReset(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/db-reset', ...options }); } - public static getApiDevDbReset2(options?: Options) { + public static getApiDevDbReset2(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/db/reset', ...options }); } - public static getApiDevDbCreate(options?: Options) { + public static getApiDevDbCreate(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/db/create', ...options }); } - public static getApiDevDbTouch(options?: Options) { + public static getApiDevDbTouch(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/db/touch', ...options }); } - public static getApiDevSeed(options?: Options) { + public static getApiDevSeed(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/seed', ...options }); } - public static getApiDevSeedAll(options?: Options) { + public static getApiDevSeedAll(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/seed-all', ...options }); } - public static getApiDevSeedProd(options?: Options) { + public static getApiDevSeedProd(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/seed-prod', ...options }); } - public static getApiDevJobProcessRecurringTasks(options?: Options) { + public static getApiDevJobProcessRecurringTasks(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/job/process-recurring-tasks', ...options }); } - public static getApiDevNotificationsSendTest(options?: Options) { + public static getApiDevNotificationsSendTest(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/notifications/send-test', ...options }); } - public static getApiDevConfirmEmail(options?: Options) { + public static getApiDevConfirmEmail(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/confirm-email', ...options }); } - public static getApiDevEmailSendTest(options?: Options) { + public static getApiDevEmailSendTest(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/dev/email/send-test', ...options }); } } export class DeviceTokens { - public static deleteApiV1NotificationsDeviceTokens(options?: Options) { + public static deleteApiV1NotificationsDeviceTokens(options?: Options): RequestResult { return (options?.client ?? client).delete({ url: '/api/v1/notifications/device-tokens', ...options, @@ -594,7 +594,7 @@ export class DeviceTokens { }); } - public static putApiV1NotificationsDeviceTokens(options?: Options) { + public static putApiV1NotificationsDeviceTokens(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/api/v1/notifications/device-tokens', ...options, @@ -607,13 +607,13 @@ export class DeviceTokens { } export class DocumentTypes { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/DocumentTypes/$count', ...options }); } } export class Odata11 { - public static documentTypes(options?: Options) { + public static documentTypes(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/DocumentTypes', ...options }); } @@ -633,7 +633,7 @@ export class DocumentTypes2 { } export class Feedback { - public static postApiV1Feedback(options?: Options) { + public static postApiV1Feedback(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/api/v1/feedback', ...options, @@ -646,13 +646,13 @@ export class Feedback { } export class Invitations { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Invitations/$count', ...options }); } } export class Odata12 { - public static invitations(options?: Options) { + public static invitations(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Invitations', ...options }); } @@ -668,7 +668,7 @@ export class Api12 { } export class Invitations2 { - public static postApiV1Invitations(options?: Options) { + public static postApiV1Invitations(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/api/v1/invitations', ...options, @@ -679,7 +679,7 @@ export class Invitations2 { }); } - public static postApiV1InvitationsByIdAccept(options: Options) { + public static postApiV1InvitationsByIdAccept(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/invitations/{id}/accept', ...options, @@ -690,15 +690,15 @@ export class Invitations2 { }); } - public static postApiV1InvitationsByIdReject(options: Options) { + public static postApiV1InvitationsByIdReject(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/invitations/{id}/reject', ...options }); } - public static deleteApiV1InvitationsById(options: Options) { + public static deleteApiV1InvitationsById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/invitations/{id}', ...options }); } - public static patchApiV1InvitationsById(options: Options) { + public static patchApiV1InvitationsById(options: Options): RequestResult { return (options.client ?? client).patch({ url: '/api/v1/invitations/{id}', ...options, @@ -713,13 +713,13 @@ export class Invitations2 { } export class Invoices { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Invoices/$count', ...options }); } } export class Odata13 { - public static invoices(options?: Options) { + public static invoices(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Invoices', ...options }); } @@ -735,7 +735,7 @@ export class Api13 { } export class Invoices2 { - public static postApiV1Invoices(options?: Options) { + public static postApiV1Invoices(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/api/v1/invoices', ...options, @@ -746,11 +746,11 @@ export class Invoices2 { }); } - public static deleteApiV1InvoicesById(options: Options) { + public static deleteApiV1InvoicesById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/invoices/{id}', ...options }); } - public static patchApiV1InvoicesById(options: Options) { + public static patchApiV1InvoicesById(options: Options): RequestResult { return (options.client ?? client).patch({ url: '/api/v1/invoices/{id}', ...options, @@ -761,11 +761,11 @@ export class Invoices2 { }); } - public static getApiV1InvoicesByIdPreview(options: Options) { + public static getApiV1InvoicesByIdPreview(options: Options): RequestResult { return (options.client ?? client).get({ url: '/api/v1/invoices/{id}/preview', ...options }); } - public static postApiV1InvoicesByIdSend(options: Options) { + public static postApiV1InvoicesByIdSend(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/invoices/{id}/send', ...options, @@ -776,7 +776,7 @@ export class Invoices2 { }); } - public static postApiV1InvoicesByIdSnapshot(options: Options) { + public static postApiV1InvoicesByIdSnapshot(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/invoices/{id}/snapshot', ...options }); } @@ -784,13 +784,13 @@ export class Invoices2 { } export class InvoiceSettings { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/InvoiceSettings/$count', ...options }); } } export class Odata14 { - public static invoiceSettings(options?: Options) { + public static invoiceSettings(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/InvoiceSettings', ...options }); } @@ -806,7 +806,7 @@ export class Api14 { } export class InvoiceSettings2 { - public static putApiV1InvoiceSettings(options?: Options) { + public static putApiV1InvoiceSettings(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/api/v1/invoice-settings', ...options, @@ -821,13 +821,13 @@ export class InvoiceSettings2 { } export class Licenses { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Licenses/$count', ...options }); } } export class Odata15 { - public static licenses(options?: Options) { + public static licenses(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Licenses', ...options }); } @@ -847,7 +847,7 @@ export class Licenses2 { } export class Notifications { - public static postApiV1NotificationsTest(options?: Options) { + public static postApiV1NotificationsTest(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/api/v1/notifications/test', ...options, @@ -860,13 +860,13 @@ export class Notifications { } export class PersonalDocuments { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/PersonalDocuments/$count', ...options }); } } export class Odata16 { - public static personalDocuments(options?: Options) { + public static personalDocuments(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/PersonalDocuments', ...options }); } @@ -882,11 +882,11 @@ export class Api16 { } export class PersonalDocuments2 { - public static getApiV1PersonalDocumentsByIdRaw(options: Options) { + public static getApiV1PersonalDocumentsByIdRaw(options: Options): RequestResult { return (options.client ?? client).get({ url: '/api/v1/personal-documents/{id}/raw', ...options }); } - public static postApiV1PersonalDocuments(options?: Options) { + public static postApiV1PersonalDocuments(options?: Options): RequestResult { return (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v1/personal-documents', @@ -898,7 +898,7 @@ export class PersonalDocuments2 { }); } - public static postApiV1PersonalDocumentsByIdMoveToBusiness(options: Options) { + public static postApiV1PersonalDocumentsByIdMoveToBusiness(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/personal-documents/{id}/move-to-business', ...options, @@ -909,11 +909,11 @@ export class PersonalDocuments2 { }); } - public static deleteApiV1PersonalDocumentsById(options: Options) { + public static deleteApiV1PersonalDocumentsById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/personal-documents/{id}', ...options }); } - public static getApiV1PersonalDocumentsSummary(options?: Options) { + public static getApiV1PersonalDocumentsSummary(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/personal-documents/summary', ...options }); } @@ -921,13 +921,13 @@ export class PersonalDocuments2 { } export class RecurringTasks { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/RecurringTasks/$count', ...options }); } } export class Odata17 { - public static recurringTasks(options?: Options) { + public static recurringTasks(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/RecurringTasks', ...options }); } @@ -943,7 +943,7 @@ export class Api17 { } export class RecurringTasks2 { - public static postApiV1RecurringTasks(options?: Options) { + public static postApiV1RecurringTasks(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/api/v1/recurring-tasks', ...options, @@ -954,11 +954,11 @@ export class RecurringTasks2 { }); } - public static deleteApiV1RecurringTasksById(options: Options) { + public static deleteApiV1RecurringTasksById(options: Options): RequestResult { return (options.client ?? client).delete({ url: '/api/v1/recurring-tasks/{id}', ...options }); } - public static patchApiV1RecurringTasksById(options: Options) { + public static patchApiV1RecurringTasksById(options: Options): RequestResult { return (options.client ?? client).patch({ url: '/api/v1/recurring-tasks/{id}', ...options, @@ -973,27 +973,27 @@ export class RecurringTasks2 { } export class Root { - public static get(options?: Options) { + public static get(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/', ...options }); } } export class Tasks { - public static count(options?: Options) { + public static count(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Tasks/$count', ...options }); } - public static key(options?: Options) { + public static key(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Tasks/{key}', ...options }); } } export class Odata18 { - public static tasks(options?: Options) { + public static tasks(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Tasks', ...options }); } - public static tasksKey(options?: Options) { + public static tasksKey(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/odata/Tasks({key})', ...options }); } @@ -1009,7 +1009,7 @@ export class Api18 { } export class Tasks2 { - public static postApiV1Tasks(options?: Options) { + public static postApiV1Tasks(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/api/v1/tasks', ...options, @@ -1020,7 +1020,7 @@ export class Tasks2 { }); } - public static putApiV1TasksById(options: Options) { + public static putApiV1TasksById(options: Options): RequestResult { return (options.client ?? client).put({ url: '/api/v1/tasks/{id}', ...options, @@ -1031,7 +1031,7 @@ export class Tasks2 { }); } - public static postApiV1TasksByIdSubmit(options: Options) { + public static postApiV1TasksByIdSubmit(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/tasks/{id}/submit', ...options, @@ -1042,11 +1042,11 @@ export class Tasks2 { }); } - public static postApiV1TasksByIdApprove(options: Options) { + public static postApiV1TasksByIdApprove(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/tasks/{id}/approve', ...options }); } - public static postApiV1TasksByIdReject(options: Options) { + public static postApiV1TasksByIdReject(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/tasks/{id}/reject', ...options, @@ -1057,11 +1057,11 @@ export class Tasks2 { }); } - public static getApiV1TasksByIdComments(options: Options) { + public static getApiV1TasksByIdComments(options: Options): RequestResult { return (options.client ?? client).get({ url: '/api/v1/tasks/{id}/comments', ...options }); } - public static getApiV1TasksByIdDocuments(options: Options) { + public static getApiV1TasksByIdDocuments(options: Options): RequestResult { return (options.client ?? client).get({ url: '/api/v1/tasks/{id}/documents', ...options }); } @@ -1069,7 +1069,7 @@ export class Tasks2 { } export class User { - public static confirmEmail(options: Options) { + public static confirmEmail(options: Options): RequestResult { return (options.client ?? client).get({ url: '/api/v1/user/confirmEmail', ...options }); } } @@ -1087,7 +1087,7 @@ export class MapIdentityApi { } export class User2 { - public static postApiV1UserRegister(options: Options) { + public static postApiV1UserRegister(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/user/register', ...options, @@ -1098,7 +1098,7 @@ export class User2 { }); } - public static postApiV1UserLogin(options: Options) { + public static postApiV1UserLogin(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/user/login', ...options, @@ -1109,7 +1109,7 @@ export class User2 { }); } - public static postApiV1UserRefresh(options: Options) { + public static postApiV1UserRefresh(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/user/refresh', ...options, @@ -1120,7 +1120,7 @@ export class User2 { }); } - public static postApiV1UserResendConfirmationEmail(options: Options) { + public static postApiV1UserResendConfirmationEmail(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/user/resendConfirmationEmail', ...options, @@ -1131,7 +1131,7 @@ export class User2 { }); } - public static postApiV1UserForgotPassword(options: Options) { + public static postApiV1UserForgotPassword(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/user/forgotPassword', ...options, @@ -1142,7 +1142,7 @@ export class User2 { }); } - public static postApiV1UserResetPassword(options: Options) { + public static postApiV1UserResetPassword(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/user/resetPassword', ...options, @@ -1153,7 +1153,7 @@ export class User2 { }); } - public static postApiV1UserManage2Fa(options: Options) { + public static postApiV1UserManage2Fa(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/user/manage/2fa', ...options, @@ -1164,11 +1164,11 @@ export class User2 { }); } - public static getApiV1UserManageInfo(options?: Options) { + public static getApiV1UserManageInfo(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/user/manage/info', ...options }); } - public static postApiV1UserManageInfo(options: Options) { + public static postApiV1UserManageInfo(options: Options): RequestResult { return (options.client ?? client).post({ url: '/api/v1/user/manage/info', ...options, @@ -1179,7 +1179,7 @@ export class User2 { }); } - public static postApiV1UserLogout(options?: Options) { + public static postApiV1UserLogout(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/api/v1/user/logout', ...options, @@ -1193,11 +1193,11 @@ export class User2 { /** * @deprecated */ - public static getApiV1UserDocumentsSummary(options?: Options) { + public static getApiV1UserDocumentsSummary(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/user/documents-summary', ...options }); } - public static deleteApiV1User(options?: Options) { + public static deleteApiV1User(options?: Options): RequestResult { return (options?.client ?? client).delete({ url: '/api/v1/user', ...options }); } @@ -1205,11 +1205,11 @@ export class User2 { } export class Users { - public static getApiV1UsersMe(options?: Options) { + public static getApiV1UsersMe(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/api/v1/users/me', ...options }); } - public static patchApiV1UsersById(options: Options) { + public static patchApiV1UsersById(options: Options): RequestResult { return (options.client ?? client).patch({ url: '/api/v1/users/{id}', ...options, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/index.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/index.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/params.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/params.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/sdk.gen.ts index 0e20c11b53..2c7e4a4ead 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape } from './client'; import { client } from './client.gen'; import type { ApiVVersionApiVersionOdataAccountingCompaniesCountData, ApiVVersionApiVersionOdataAccountingCompaniesCountResponses, ApiVVersionApiVersionOdataAccountingCompaniesData, ApiVVersionApiVersionOdataAccountingCompaniesResponses, ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountData, ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountResponses, ApiVVersionApiVersionOdataAccountingCompanyMembershipsData, ApiVVersionApiVersionOdataAccountingCompanyMembershipsResponses, ApiVVersionApiVersionOdataBankAccountsCountData, ApiVVersionApiVersionOdataBankAccountsCountResponses, ApiVVersionApiVersionOdataBankAccountsData, ApiVVersionApiVersionOdataBankAccountsResponses, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountData, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountResponses, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsData, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsResponses, ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountData, ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountResponses, ApiVVersionApiVersionOdataBusinessDocumentActivitiesData, ApiVVersionApiVersionOdataBusinessDocumentActivitiesResponses, ApiVVersionApiVersionOdataBusinessDocumentsCountData, ApiVVersionApiVersionOdataBusinessDocumentsCountResponses, ApiVVersionApiVersionOdataBusinessDocumentsData, ApiVVersionApiVersionOdataBusinessDocumentsResponses, ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountData, ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountResponses, ApiVVersionApiVersionOdataBusinessDocumentsSummariesData, ApiVVersionApiVersionOdataBusinessDocumentsSummariesResponses, ApiVVersionApiVersionOdataBusinessesCountData, ApiVVersionApiVersionOdataBusinessesCountResponses, ApiVVersionApiVersionOdataBusinessesData, ApiVVersionApiVersionOdataBusinessesKey2Data, ApiVVersionApiVersionOdataBusinessesKey2Responses, ApiVVersionApiVersionOdataBusinessesKeyData, ApiVVersionApiVersionOdataBusinessesKeyResponses, ApiVVersionApiVersionOdataBusinessesResponses, ApiVVersionApiVersionOdataBusinessSummariesCountData, ApiVVersionApiVersionOdataBusinessSummariesCountResponses, ApiVVersionApiVersionOdataBusinessSummariesData, ApiVVersionApiVersionOdataBusinessSummariesResponses, ApiVVersionApiVersionOdataCounterpartiesCountData, ApiVVersionApiVersionOdataCounterpartiesCountResponses, ApiVVersionApiVersionOdataCounterpartiesData, ApiVVersionApiVersionOdataCounterpartiesResponses, ApiVVersionApiVersionOdataDataBoxCredentialsCountData, ApiVVersionApiVersionOdataDataBoxCredentialsCountResponses, ApiVVersionApiVersionOdataDataBoxCredentialsData, ApiVVersionApiVersionOdataDataBoxCredentialsResponses, ApiVVersionApiVersionOdataDocumentTypesCountData, ApiVVersionApiVersionOdataDocumentTypesCountResponses, ApiVVersionApiVersionOdataDocumentTypesData, ApiVVersionApiVersionOdataDocumentTypesResponses, ApiVVersionApiVersionOdataInvitationsCountData, ApiVVersionApiVersionOdataInvitationsCountResponses, ApiVVersionApiVersionOdataInvitationsData, ApiVVersionApiVersionOdataInvitationsResponses, ApiVVersionApiVersionOdataInvoicesCountData, ApiVVersionApiVersionOdataInvoicesCountResponses, ApiVVersionApiVersionOdataInvoicesData, ApiVVersionApiVersionOdataInvoiceSettingsCountData, ApiVVersionApiVersionOdataInvoiceSettingsCountResponses, ApiVVersionApiVersionOdataInvoiceSettingsData, ApiVVersionApiVersionOdataInvoiceSettingsResponses, ApiVVersionApiVersionOdataInvoicesResponses, ApiVVersionApiVersionOdataLicensesCountData, ApiVVersionApiVersionOdataLicensesCountResponses, ApiVVersionApiVersionOdataLicensesData, ApiVVersionApiVersionOdataLicensesResponses, ApiVVersionApiVersionOdataPersonalDocumentsCountData, ApiVVersionApiVersionOdataPersonalDocumentsCountResponses, ApiVVersionApiVersionOdataPersonalDocumentsData, ApiVVersionApiVersionOdataPersonalDocumentsResponses, ApiVVersionApiVersionOdataRecurringTasksCountData, ApiVVersionApiVersionOdataRecurringTasksCountResponses, ApiVVersionApiVersionOdataRecurringTasksData, ApiVVersionApiVersionOdataRecurringTasksResponses, ApiVVersionApiVersionOdataTasksCountData, ApiVVersionApiVersionOdataTasksCountResponses, ApiVVersionApiVersionOdataTasksData, ApiVVersionApiVersionOdataTasksKey2Data, ApiVVersionApiVersionOdataTasksKey2Responses, ApiVVersionApiVersionOdataTasksKeyData, ApiVVersionApiVersionOdataTasksKeyResponses, ApiVVersionApiVersionOdataTasksResponses, DeleteApiV1AccountingCompaniesByIdData, DeleteApiV1AccountingCompaniesByIdResponses, DeleteApiV1AccountingCompanyMembershipsByIdData, DeleteApiV1AccountingCompanyMembershipsByIdResponses, DeleteApiV1BankAccountsByIdData, DeleteApiV1BankAccountsByIdResponses, DeleteApiV1BusinessAccountantAssignmentsByIdData, DeleteApiV1BusinessAccountantAssignmentsByIdResponses, DeleteApiV1BusinessDocumentsByIdData, DeleteApiV1BusinessDocumentsByIdResponses, DeleteApiV1BusinessesByIdData, DeleteApiV1BusinessesByIdResponses, DeleteApiV1CounterpartiesByIdData, DeleteApiV1CounterpartiesByIdResponses, DeleteApiV1DataBoxCredentialsByIdData, DeleteApiV1DataBoxCredentialsByIdResponses, DeleteApiV1InvitationsByIdData, DeleteApiV1InvitationsByIdResponses, DeleteApiV1InvoicesByIdData, DeleteApiV1InvoicesByIdResponses, DeleteApiV1NotificationsDeviceTokensData, DeleteApiV1NotificationsDeviceTokensResponses, DeleteApiV1PersonalDocumentsByIdData, DeleteApiV1PersonalDocumentsByIdResponses, DeleteApiV1RecurringTasksByIdData, DeleteApiV1RecurringTasksByIdResponses, DeleteApiV1UserData, DeleteApiV1UserResponses, GetApiDevConfirmEmailData, GetApiDevConfirmEmailResponses, GetApiDevData, GetApiDevDbCreateData, GetApiDevDbCreateResponses, GetApiDevDbReset2Data, GetApiDevDbReset2Responses, GetApiDevDbResetData, GetApiDevDbResetResponses, GetApiDevDbTouchData, GetApiDevDbTouchResponses, GetApiDevEmailSendTestData, GetApiDevEmailSendTestResponses, GetApiDevJobProcessRecurringTasksData, GetApiDevJobProcessRecurringTasksResponses, GetApiDevNotificationsSendTestData, GetApiDevNotificationsSendTestResponses, GetApiDevReseedDbData, GetApiDevReseedDbResponses, GetApiDevResponses, GetApiDevSeedAllData, GetApiDevSeedAllResponses, GetApiDevSeedData, GetApiDevSeedProdData, GetApiDevSeedProdResponses, GetApiDevSeedResponses, GetApiV1BusinessDocumentsByIdRawData, GetApiV1BusinessDocumentsByIdRawResponses, GetApiV1BusinessesByIdDocumentTypesSummaryData, GetApiV1BusinessesByIdDocumentTypesSummaryResponses, GetApiV1InvoicesByIdPreviewData, GetApiV1InvoicesByIdPreviewResponses, GetApiV1PersonalDocumentsByIdRawData, GetApiV1PersonalDocumentsByIdRawResponses, GetApiV1PersonalDocumentsSummaryData, GetApiV1PersonalDocumentsSummaryResponses, GetApiV1TasksByIdCommentsData, GetApiV1TasksByIdCommentsResponses, GetApiV1TasksByIdDocumentsData, GetApiV1TasksByIdDocumentsResponses, GetApiV1UserDocumentsSummaryData, GetApiV1UserDocumentsSummaryResponses, GetApiV1UserManageInfoData, GetApiV1UserManageInfoErrors, GetApiV1UserManageInfoResponses, GetApiV1UsersMeData, GetApiV1UsersMeResponses, GetData, GetResponses, MapIdentityApiApiVVersionApiVersionUserConfirmEmailData, MapIdentityApiApiVVersionApiVersionUserConfirmEmailResponses, PatchApiV1CounterpartiesByIdData, PatchApiV1CounterpartiesByIdResponses, PatchApiV1InvitationsByIdData, PatchApiV1InvitationsByIdResponses, PatchApiV1InvoicesByIdData, PatchApiV1InvoicesByIdResponses, PatchApiV1RecurringTasksByIdData, PatchApiV1RecurringTasksByIdResponses, PatchApiV1UsersByIdData, PatchApiV1UsersByIdResponses, PostApiV1AccountingCompaniesByIdData, PostApiV1AccountingCompaniesByIdResponses, PostApiV1AccountingCompaniesData, PostApiV1AccountingCompaniesResponses, PostApiV1BusinessDocumentsByIdApproveData, PostApiV1BusinessDocumentsByIdApproveResponses, PostApiV1BusinessDocumentsByIdMoveToBusinessData, PostApiV1BusinessDocumentsByIdMoveToBusinessResponses, PostApiV1BusinessDocumentsByIdMoveToPersonalData, PostApiV1BusinessDocumentsByIdMoveToPersonalResponses, PostApiV1BusinessDocumentsByIdUnapproveData, PostApiV1BusinessDocumentsByIdUnapproveResponses, PostApiV1BusinessDocumentsData, PostApiV1BusinessDocumentsResponses, PostApiV1BusinessesByIdDisconnectData, PostApiV1BusinessesByIdDisconnectResponses, PostApiV1BusinessesData, PostApiV1BusinessesResponses, PostApiV1CounterpartiesData, PostApiV1CounterpartiesResponses, PostApiV1FeedbackData, PostApiV1FeedbackResponses, PostApiV1InvitationsByIdAcceptData, PostApiV1InvitationsByIdAcceptResponses, PostApiV1InvitationsByIdRejectData, PostApiV1InvitationsByIdRejectResponses, PostApiV1InvitationsData, PostApiV1InvitationsResponses, PostApiV1InvoicesByIdSendData, PostApiV1InvoicesByIdSendResponses, PostApiV1InvoicesByIdSnapshotData, PostApiV1InvoicesByIdSnapshotResponses, PostApiV1InvoicesData, PostApiV1InvoicesResponses, PostApiV1NotificationsTestData, PostApiV1NotificationsTestResponses, PostApiV1PersonalDocumentsByIdMoveToBusinessData, PostApiV1PersonalDocumentsByIdMoveToBusinessResponses, PostApiV1PersonalDocumentsData, PostApiV1PersonalDocumentsResponses, PostApiV1RecurringTasksData, PostApiV1RecurringTasksResponses, PostApiV1TasksByIdApproveData, PostApiV1TasksByIdApproveResponses, PostApiV1TasksByIdRejectData, PostApiV1TasksByIdRejectResponses, PostApiV1TasksByIdSubmitData, PostApiV1TasksByIdSubmitResponses, PostApiV1TasksData, PostApiV1TasksResponses, PostApiV1UserForgotPasswordData, PostApiV1UserForgotPasswordErrors, PostApiV1UserForgotPasswordResponses, PostApiV1UserLoginData, PostApiV1UserLoginResponses, PostApiV1UserLogoutData, PostApiV1UserLogoutResponses, PostApiV1UserManage2FaData, PostApiV1UserManage2FaErrors, PostApiV1UserManage2FaResponses, PostApiV1UserManageInfoData, PostApiV1UserManageInfoErrors, PostApiV1UserManageInfoResponses, PostApiV1UserRefreshData, PostApiV1UserRefreshResponses, PostApiV1UserRegisterData, PostApiV1UserRegisterErrors, PostApiV1UserRegisterResponses, PostApiV1UserResendConfirmationEmailData, PostApiV1UserResendConfirmationEmailResponses, PostApiV1UserResetPasswordData, PostApiV1UserResetPasswordErrors, PostApiV1UserResetPasswordResponses, PutApiV1AccountingCompanyMembershipsData, PutApiV1AccountingCompanyMembershipsResponses, PutApiV1BankAccountsData, PutApiV1BankAccountsResponses, PutApiV1BusinessAccountantAssignmentsData, PutApiV1BusinessAccountantAssignmentsResponses, PutApiV1BusinessDocumentsByIdData, PutApiV1BusinessDocumentsByIdResponses, PutApiV1BusinessesByIdContactData, PutApiV1BusinessesByIdContactResponses, PutApiV1BusinessesByIdData, PutApiV1BusinessesByIdResponses, PutApiV1BusinessMembershipsData, PutApiV1BusinessMembershipsResponses, PutApiV1DataBoxCredentialsData, PutApiV1DataBoxCredentialsResponses, PutApiV1InvoiceSettingsData, PutApiV1InvoiceSettingsResponses, PutApiV1NotificationsDeviceTokensData, PutApiV1NotificationsDeviceTokensResponses, PutApiV1TasksByIdData, PutApiV1TasksByIdResponses } from './types.gen'; @@ -18,7 +18,7 @@ export type Options; }; -export const postApiV1AccountingCompanies = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1AccountingCompanies = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v1/accounting-companies', ...options, headers: { @@ -27,9 +27,9 @@ export const postApiV1AccountingCompanies = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/accounting-companies/{id}', ...options }); +export const deleteApiV1AccountingCompaniesById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/accounting-companies/{id}', ...options }); -export const postApiV1AccountingCompaniesById = (options: Options) => (options.client ?? client).post({ +export const postApiV1AccountingCompaniesById = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/accounting-companies/{id}', ...options, headers: { @@ -38,11 +38,11 @@ export const postApiV1AccountingCompaniesById = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanies', ...options }); +export const apiVVersionApiVersionOdataAccountingCompanies = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanies', ...options }); -export const apiVVersionApiVersionOdataAccountingCompaniesCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanies/$count', ...options }); +export const apiVVersionApiVersionOdataAccountingCompaniesCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanies/$count', ...options }); -export const putApiV1AccountingCompanyMemberships = (options?: Options) => (options?.client ?? client).put({ +export const putApiV1AccountingCompanyMemberships = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v1/accounting-company-memberships', ...options, headers: { @@ -51,13 +51,13 @@ export const putApiV1AccountingCompanyMemberships = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/accounting-company-memberships/{id}', ...options }); +export const deleteApiV1AccountingCompanyMembershipsById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/accounting-company-memberships/{id}', ...options }); -export const apiVVersionApiVersionOdataAccountingCompanyMemberships = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanyMemberships', ...options }); +export const apiVVersionApiVersionOdataAccountingCompanyMemberships = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanyMemberships', ...options }); -export const apiVVersionApiVersionOdataAccountingCompanyMembershipsCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanyMemberships/$count', ...options }); +export const apiVVersionApiVersionOdataAccountingCompanyMembershipsCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/AccountingCompanyMemberships/$count', ...options }); -export const putApiV1BankAccounts = (options?: Options) => (options?.client ?? client).put({ +export const putApiV1BankAccounts = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v1/bank-accounts', ...options, headers: { @@ -66,13 +66,13 @@ export const putApiV1BankAccounts = (optio } }); -export const deleteApiV1BankAccountsById = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/bank-accounts/{id}', ...options }); +export const deleteApiV1BankAccountsById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/bank-accounts/{id}', ...options }); -export const apiVVersionApiVersionOdataBankAccounts = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BankAccounts', ...options }); +export const apiVVersionApiVersionOdataBankAccounts = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BankAccounts', ...options }); -export const apiVVersionApiVersionOdataBankAccountsCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BankAccounts/$count', ...options }); +export const apiVVersionApiVersionOdataBankAccountsCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BankAccounts/$count', ...options }); -export const putApiV1BusinessAccountantAssignments = (options?: Options) => (options?.client ?? client).put({ +export const putApiV1BusinessAccountantAssignments = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v1/business-accountant-assignments', ...options, headers: { @@ -81,15 +81,15 @@ export const putApiV1BusinessAccountantAssignments = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/business-accountant-assignments/{id}', ...options }); +export const deleteApiV1BusinessAccountantAssignmentsById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/business-accountant-assignments/{id}', ...options }); -export const apiVVersionApiVersionOdataBusinessAccountantAssignments = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessAccountantAssignments', ...options }); +export const apiVVersionApiVersionOdataBusinessAccountantAssignments = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessAccountantAssignments', ...options }); -export const apiVVersionApiVersionOdataBusinessAccountantAssignmentsCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessAccountantAssignments/$count', ...options }); +export const apiVVersionApiVersionOdataBusinessAccountantAssignmentsCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessAccountantAssignments/$count', ...options }); -export const getApiV1BusinessDocumentsByIdRaw = (options: Options) => (options.client ?? client).get({ url: '/api/v1/business-documents/{id}/raw', ...options }); +export const getApiV1BusinessDocumentsByIdRaw = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v1/business-documents/{id}/raw', ...options }); -export const postApiV1BusinessDocuments = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1BusinessDocuments = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v1/business-documents', ...options, @@ -99,9 +99,9 @@ export const postApiV1BusinessDocuments = } }); -export const deleteApiV1BusinessDocumentsById = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/business-documents/{id}', ...options }); +export const deleteApiV1BusinessDocumentsById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/business-documents/{id}', ...options }); -export const putApiV1BusinessDocumentsById = (options: Options) => (options.client ?? client).put({ +export const putApiV1BusinessDocumentsById = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v1/business-documents/{id}', ...options, headers: { @@ -110,13 +110,13 @@ export const putApiV1BusinessDocumentsById = (options: Options) => (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/approve', ...options }); +export const postApiV1BusinessDocumentsByIdApprove = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/approve', ...options }); -export const postApiV1BusinessDocumentsByIdUnapprove = (options: Options) => (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/unapprove', ...options }); +export const postApiV1BusinessDocumentsByIdUnapprove = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/unapprove', ...options }); -export const postApiV1BusinessDocumentsByIdMoveToPersonal = (options: Options) => (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/move-to-personal', ...options }); +export const postApiV1BusinessDocumentsByIdMoveToPersonal = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/move-to-personal', ...options }); -export const postApiV1BusinessDocumentsByIdMoveToBusiness = (options: Options) => (options.client ?? client).post({ +export const postApiV1BusinessDocumentsByIdMoveToBusiness = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/business-documents/{id}/move-to-business', ...options, headers: { @@ -125,27 +125,27 @@ export const postApiV1BusinessDocumentsByIdMoveToBusiness = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentActivities', ...options }); +export const apiVVersionApiVersionOdataBusinessDocumentActivities = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentActivities', ...options }); -export const apiVVersionApiVersionOdataBusinessDocumentActivitiesCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentActivities/$count', ...options }); +export const apiVVersionApiVersionOdataBusinessDocumentActivitiesCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentActivities/$count', ...options }); -export const apiVVersionApiVersionOdataBusinessDocuments = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocuments', ...options }); +export const apiVVersionApiVersionOdataBusinessDocuments = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocuments', ...options }); -export const apiVVersionApiVersionOdataBusinessDocumentsCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocuments/$count', ...options }); +export const apiVVersionApiVersionOdataBusinessDocumentsCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocuments/$count', ...options }); /** * @deprecated */ -export const apiVVersionApiVersionOdataBusinessDocumentsSummaries = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentsSummaries', ...options }); +export const apiVVersionApiVersionOdataBusinessDocumentsSummaries = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentsSummaries', ...options }); /** * @deprecated */ -export const apiVVersionApiVersionOdataBusinessDocumentsSummariesCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentsSummaries/$count', ...options }); +export const apiVVersionApiVersionOdataBusinessDocumentsSummariesCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessDocumentsSummaries/$count', ...options }); -export const getApiV1BusinessesByIdDocumentTypesSummary = (options: Options) => (options.client ?? client).get({ url: '/api/v1/businesses/{id}/document-types-summary', ...options }); +export const getApiV1BusinessesByIdDocumentTypesSummary = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v1/businesses/{id}/document-types-summary', ...options }); -export const postApiV1Businesses = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1Businesses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v1/businesses', ...options, headers: { @@ -154,9 +154,9 @@ export const postApiV1Businesses = (option } }); -export const deleteApiV1BusinessesById = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/businesses/{id}', ...options }); +export const deleteApiV1BusinessesById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/businesses/{id}', ...options }); -export const putApiV1BusinessesById = (options: Options) => (options.client ?? client).put({ +export const putApiV1BusinessesById = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v1/businesses/{id}', ...options, headers: { @@ -165,7 +165,7 @@ export const putApiV1BusinessesById = (opt } }); -export const putApiV1BusinessesByIdContact = (options: Options) => (options.client ?? client).put({ +export const putApiV1BusinessesByIdContact = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v1/businesses/{id}/contact', ...options, headers: { @@ -174,17 +174,17 @@ export const putApiV1BusinessesByIdContact = (options: Options) => (options.client ?? client).post({ url: '/api/v1/businesses/{id}/disconnect', ...options }); +export const postApiV1BusinessesByIdDisconnect = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/businesses/{id}/disconnect', ...options }); -export const apiVVersionApiVersionOdataBusinesses = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Businesses', ...options }); +export const apiVVersionApiVersionOdataBusinesses = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Businesses', ...options }); -export const apiVVersionApiVersionOdataBusinessesCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Businesses/$count', ...options }); +export const apiVVersionApiVersionOdataBusinessesCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Businesses/$count', ...options }); -export const apiVVersionApiVersionOdataBusinessesKey = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Businesses({key})', ...options }); +export const apiVVersionApiVersionOdataBusinessesKey = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Businesses({key})', ...options }); -export const apiVVersionApiVersionOdataBusinessesKey2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Businesses/{key}', ...options }); +export const apiVVersionApiVersionOdataBusinessesKey2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Businesses/{key}', ...options }); -export const putApiV1BusinessMemberships = (options?: Options) => (options?.client ?? client).put({ +export const putApiV1BusinessMemberships = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v1/business-memberships', ...options, headers: { @@ -193,11 +193,11 @@ export const putApiV1BusinessMemberships = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessSummaries', ...options }); +export const apiVVersionApiVersionOdataBusinessSummaries = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessSummaries', ...options }); -export const apiVVersionApiVersionOdataBusinessSummariesCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessSummaries/$count', ...options }); +export const apiVVersionApiVersionOdataBusinessSummariesCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/BusinessSummaries/$count', ...options }); -export const postApiV1Counterparties = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1Counterparties = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v1/counterparties', ...options, headers: { @@ -206,9 +206,9 @@ export const postApiV1Counterparties = (op } }); -export const deleteApiV1CounterpartiesById = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/counterparties/{id}', ...options }); +export const deleteApiV1CounterpartiesById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/counterparties/{id}', ...options }); -export const patchApiV1CounterpartiesById = (options: Options) => (options.client ?? client).patch({ +export const patchApiV1CounterpartiesById = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v1/counterparties/{id}', ...options, headers: { @@ -217,11 +217,11 @@ export const patchApiV1CounterpartiesById = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Counterparties', ...options }); +export const apiVVersionApiVersionOdataCounterparties = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Counterparties', ...options }); -export const apiVVersionApiVersionOdataCounterpartiesCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Counterparties/$count', ...options }); +export const apiVVersionApiVersionOdataCounterpartiesCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Counterparties/$count', ...options }); -export const putApiV1DataBoxCredentials = (options?: Options) => (options?.client ?? client).put({ +export const putApiV1DataBoxCredentials = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v1/data-box-credentials', ...options, headers: { @@ -230,39 +230,39 @@ export const putApiV1DataBoxCredentials = } }); -export const deleteApiV1DataBoxCredentialsById = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/data-box-credentials/{id}', ...options }); +export const deleteApiV1DataBoxCredentialsById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/data-box-credentials/{id}', ...options }); -export const apiVVersionApiVersionOdataDataBoxCredentials = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/DataBoxCredentials', ...options }); +export const apiVVersionApiVersionOdataDataBoxCredentials = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/DataBoxCredentials', ...options }); -export const apiVVersionApiVersionOdataDataBoxCredentialsCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/DataBoxCredentials/$count', ...options }); +export const apiVVersionApiVersionOdataDataBoxCredentialsCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/DataBoxCredentials/$count', ...options }); -export const getApiDev = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev', ...options }); +export const getApiDev = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev', ...options }); -export const getApiDevReseedDb = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/reseed-db', ...options }); +export const getApiDevReseedDb = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/reseed-db', ...options }); -export const getApiDevDbReset = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/db-reset', ...options }); +export const getApiDevDbReset = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/db-reset', ...options }); -export const getApiDevDbReset2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/db/reset', ...options }); +export const getApiDevDbReset2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/db/reset', ...options }); -export const getApiDevDbCreate = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/db/create', ...options }); +export const getApiDevDbCreate = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/db/create', ...options }); -export const getApiDevDbTouch = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/db/touch', ...options }); +export const getApiDevDbTouch = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/db/touch', ...options }); -export const getApiDevSeed = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/seed', ...options }); +export const getApiDevSeed = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/seed', ...options }); -export const getApiDevSeedAll = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/seed-all', ...options }); +export const getApiDevSeedAll = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/seed-all', ...options }); -export const getApiDevSeedProd = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/seed-prod', ...options }); +export const getApiDevSeedProd = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/seed-prod', ...options }); -export const getApiDevJobProcessRecurringTasks = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/job/process-recurring-tasks', ...options }); +export const getApiDevJobProcessRecurringTasks = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/job/process-recurring-tasks', ...options }); -export const getApiDevNotificationsSendTest = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/notifications/send-test', ...options }); +export const getApiDevNotificationsSendTest = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/notifications/send-test', ...options }); -export const getApiDevConfirmEmail = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/confirm-email', ...options }); +export const getApiDevConfirmEmail = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/confirm-email', ...options }); -export const getApiDevEmailSendTest = (options?: Options) => (options?.client ?? client).get({ url: '/api/dev/email/send-test', ...options }); +export const getApiDevEmailSendTest = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/dev/email/send-test', ...options }); -export const deleteApiV1NotificationsDeviceTokens = (options?: Options) => (options?.client ?? client).delete({ +export const deleteApiV1NotificationsDeviceTokens = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v1/notifications/device-tokens', ...options, headers: { @@ -271,7 +271,7 @@ export const deleteApiV1NotificationsDeviceTokens = (options?: Options) => (options?.client ?? client).put({ +export const putApiV1NotificationsDeviceTokens = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v1/notifications/device-tokens', ...options, headers: { @@ -280,11 +280,11 @@ export const putApiV1NotificationsDeviceTokens = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/DocumentTypes', ...options }); +export const apiVVersionApiVersionOdataDocumentTypes = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/DocumentTypes', ...options }); -export const apiVVersionApiVersionOdataDocumentTypesCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/DocumentTypes/$count', ...options }); +export const apiVVersionApiVersionOdataDocumentTypesCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/DocumentTypes/$count', ...options }); -export const postApiV1Feedback = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1Feedback = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v1/feedback', ...options, headers: { @@ -293,7 +293,7 @@ export const postApiV1Feedback = (options? } }); -export const postApiV1Invitations = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1Invitations = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v1/invitations', ...options, headers: { @@ -302,7 +302,7 @@ export const postApiV1Invitations = (optio } }); -export const postApiV1InvitationsByIdAccept = (options: Options) => (options.client ?? client).post({ +export const postApiV1InvitationsByIdAccept = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/invitations/{id}/accept', ...options, headers: { @@ -311,11 +311,11 @@ export const postApiV1InvitationsByIdAccept = (options: Options) => (options.client ?? client).post({ url: '/api/v1/invitations/{id}/reject', ...options }); +export const postApiV1InvitationsByIdReject = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/invitations/{id}/reject', ...options }); -export const deleteApiV1InvitationsById = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/invitations/{id}', ...options }); +export const deleteApiV1InvitationsById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/invitations/{id}', ...options }); -export const patchApiV1InvitationsById = (options: Options) => (options.client ?? client).patch({ +export const patchApiV1InvitationsById = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v1/invitations/{id}', ...options, headers: { @@ -324,11 +324,11 @@ export const patchApiV1InvitationsById = ( } }); -export const apiVVersionApiVersionOdataInvitations = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Invitations', ...options }); +export const apiVVersionApiVersionOdataInvitations = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Invitations', ...options }); -export const apiVVersionApiVersionOdataInvitationsCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Invitations/$count', ...options }); +export const apiVVersionApiVersionOdataInvitationsCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Invitations/$count', ...options }); -export const postApiV1Invoices = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1Invoices = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v1/invoices', ...options, headers: { @@ -337,9 +337,9 @@ export const postApiV1Invoices = (options? } }); -export const deleteApiV1InvoicesById = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/invoices/{id}', ...options }); +export const deleteApiV1InvoicesById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/invoices/{id}', ...options }); -export const patchApiV1InvoicesById = (options: Options) => (options.client ?? client).patch({ +export const patchApiV1InvoicesById = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v1/invoices/{id}', ...options, headers: { @@ -348,9 +348,9 @@ export const patchApiV1InvoicesById = (opt } }); -export const getApiV1InvoicesByIdPreview = (options: Options) => (options.client ?? client).get({ url: '/api/v1/invoices/{id}/preview', ...options }); +export const getApiV1InvoicesByIdPreview = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v1/invoices/{id}/preview', ...options }); -export const postApiV1InvoicesByIdSend = (options: Options) => (options.client ?? client).post({ +export const postApiV1InvoicesByIdSend = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/invoices/{id}/send', ...options, headers: { @@ -359,13 +359,13 @@ export const postApiV1InvoicesByIdSend = ( } }); -export const postApiV1InvoicesByIdSnapshot = (options: Options) => (options.client ?? client).post({ url: '/api/v1/invoices/{id}/snapshot', ...options }); +export const postApiV1InvoicesByIdSnapshot = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/invoices/{id}/snapshot', ...options }); -export const apiVVersionApiVersionOdataInvoices = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Invoices', ...options }); +export const apiVVersionApiVersionOdataInvoices = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Invoices', ...options }); -export const apiVVersionApiVersionOdataInvoicesCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Invoices/$count', ...options }); +export const apiVVersionApiVersionOdataInvoicesCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Invoices/$count', ...options }); -export const putApiV1InvoiceSettings = (options?: Options) => (options?.client ?? client).put({ +export const putApiV1InvoiceSettings = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v1/invoice-settings', ...options, headers: { @@ -374,15 +374,15 @@ export const putApiV1InvoiceSettings = (op } }); -export const apiVVersionApiVersionOdataInvoiceSettings = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/InvoiceSettings', ...options }); +export const apiVVersionApiVersionOdataInvoiceSettings = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/InvoiceSettings', ...options }); -export const apiVVersionApiVersionOdataInvoiceSettingsCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/InvoiceSettings/$count', ...options }); +export const apiVVersionApiVersionOdataInvoiceSettingsCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/InvoiceSettings/$count', ...options }); -export const apiVVersionApiVersionOdataLicenses = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Licenses', ...options }); +export const apiVVersionApiVersionOdataLicenses = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Licenses', ...options }); -export const apiVVersionApiVersionOdataLicensesCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Licenses/$count', ...options }); +export const apiVVersionApiVersionOdataLicensesCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Licenses/$count', ...options }); -export const postApiV1NotificationsTest = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1NotificationsTest = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v1/notifications/test', ...options, headers: { @@ -391,9 +391,9 @@ export const postApiV1NotificationsTest = } }); -export const getApiV1PersonalDocumentsByIdRaw = (options: Options) => (options.client ?? client).get({ url: '/api/v1/personal-documents/{id}/raw', ...options }); +export const getApiV1PersonalDocumentsByIdRaw = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v1/personal-documents/{id}/raw', ...options }); -export const postApiV1PersonalDocuments = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1PersonalDocuments = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v1/personal-documents', ...options, @@ -403,7 +403,7 @@ export const postApiV1PersonalDocuments = } }); -export const postApiV1PersonalDocumentsByIdMoveToBusiness = (options: Options) => (options.client ?? client).post({ +export const postApiV1PersonalDocumentsByIdMoveToBusiness = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/personal-documents/{id}/move-to-business', ...options, headers: { @@ -412,15 +412,15 @@ export const postApiV1PersonalDocumentsByIdMoveToBusiness = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/personal-documents/{id}', ...options }); +export const deleteApiV1PersonalDocumentsById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/personal-documents/{id}', ...options }); -export const getApiV1PersonalDocumentsSummary = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/personal-documents/summary', ...options }); +export const getApiV1PersonalDocumentsSummary = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/personal-documents/summary', ...options }); -export const apiVVersionApiVersionOdataPersonalDocuments = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/PersonalDocuments', ...options }); +export const apiVVersionApiVersionOdataPersonalDocuments = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/PersonalDocuments', ...options }); -export const apiVVersionApiVersionOdataPersonalDocumentsCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/PersonalDocuments/$count', ...options }); +export const apiVVersionApiVersionOdataPersonalDocumentsCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/PersonalDocuments/$count', ...options }); -export const postApiV1RecurringTasks = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1RecurringTasks = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v1/recurring-tasks', ...options, headers: { @@ -429,9 +429,9 @@ export const postApiV1RecurringTasks = (op } }); -export const deleteApiV1RecurringTasksById = (options: Options) => (options.client ?? client).delete({ url: '/api/v1/recurring-tasks/{id}', ...options }); +export const deleteApiV1RecurringTasksById = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v1/recurring-tasks/{id}', ...options }); -export const patchApiV1RecurringTasksById = (options: Options) => (options.client ?? client).patch({ +export const patchApiV1RecurringTasksById = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v1/recurring-tasks/{id}', ...options, headers: { @@ -440,13 +440,13 @@ export const patchApiV1RecurringTasksById = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/RecurringTasks', ...options }); +export const apiVVersionApiVersionOdataRecurringTasks = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/RecurringTasks', ...options }); -export const apiVVersionApiVersionOdataRecurringTasksCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/RecurringTasks/$count', ...options }); +export const apiVVersionApiVersionOdataRecurringTasksCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/RecurringTasks/$count', ...options }); -export const get = (options?: Options) => (options?.client ?? client).get({ url: '/', ...options }); +export const get = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/', ...options }); -export const postApiV1Tasks = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1Tasks = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v1/tasks', ...options, headers: { @@ -455,7 +455,7 @@ export const postApiV1Tasks = (options?: O } }); -export const putApiV1TasksById = (options: Options) => (options.client ?? client).put({ +export const putApiV1TasksById = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v1/tasks/{id}', ...options, headers: { @@ -464,7 +464,7 @@ export const putApiV1TasksById = (options: } }); -export const postApiV1TasksByIdSubmit = (options: Options) => (options.client ?? client).post({ +export const postApiV1TasksByIdSubmit = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/tasks/{id}/submit', ...options, headers: { @@ -473,9 +473,9 @@ export const postApiV1TasksByIdSubmit = (o } }); -export const postApiV1TasksByIdApprove = (options: Options) => (options.client ?? client).post({ url: '/api/v1/tasks/{id}/approve', ...options }); +export const postApiV1TasksByIdApprove = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/tasks/{id}/approve', ...options }); -export const postApiV1TasksByIdReject = (options: Options) => (options.client ?? client).post({ +export const postApiV1TasksByIdReject = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/tasks/{id}/reject', ...options, headers: { @@ -484,19 +484,19 @@ export const postApiV1TasksByIdReject = (o } }); -export const getApiV1TasksByIdComments = (options: Options) => (options.client ?? client).get({ url: '/api/v1/tasks/{id}/comments', ...options }); +export const getApiV1TasksByIdComments = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v1/tasks/{id}/comments', ...options }); -export const getApiV1TasksByIdDocuments = (options: Options) => (options.client ?? client).get({ url: '/api/v1/tasks/{id}/documents', ...options }); +export const getApiV1TasksByIdDocuments = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v1/tasks/{id}/documents', ...options }); -export const apiVVersionApiVersionOdataTasks = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Tasks', ...options }); +export const apiVVersionApiVersionOdataTasks = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Tasks', ...options }); -export const apiVVersionApiVersionOdataTasksCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Tasks/$count', ...options }); +export const apiVVersionApiVersionOdataTasksCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Tasks/$count', ...options }); -export const apiVVersionApiVersionOdataTasksKey = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Tasks({key})', ...options }); +export const apiVVersionApiVersionOdataTasksKey = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Tasks({key})', ...options }); -export const apiVVersionApiVersionOdataTasksKey2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/odata/Tasks/{key}', ...options }); +export const apiVVersionApiVersionOdataTasksKey2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/odata/Tasks/{key}', ...options }); -export const postApiV1UserRegister = (options: Options) => (options.client ?? client).post({ +export const postApiV1UserRegister = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/user/register', ...options, headers: { @@ -505,7 +505,7 @@ export const postApiV1UserRegister = (opti } }); -export const postApiV1UserLogin = (options: Options) => (options.client ?? client).post({ +export const postApiV1UserLogin = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/user/login', ...options, headers: { @@ -514,7 +514,7 @@ export const postApiV1UserLogin = (options } }); -export const postApiV1UserRefresh = (options: Options) => (options.client ?? client).post({ +export const postApiV1UserRefresh = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/user/refresh', ...options, headers: { @@ -523,9 +523,9 @@ export const postApiV1UserRefresh = (optio } }); -export const mapIdentityApiApiVVersionApiVersionUserConfirmEmail = (options: Options) => (options.client ?? client).get({ url: '/api/v1/user/confirmEmail', ...options }); +export const mapIdentityApiApiVVersionApiVersionUserConfirmEmail = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v1/user/confirmEmail', ...options }); -export const postApiV1UserResendConfirmationEmail = (options: Options) => (options.client ?? client).post({ +export const postApiV1UserResendConfirmationEmail = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/user/resendConfirmationEmail', ...options, headers: { @@ -534,7 +534,7 @@ export const postApiV1UserResendConfirmationEmail = (options: Options) => (options.client ?? client).post({ +export const postApiV1UserForgotPassword = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/user/forgotPassword', ...options, headers: { @@ -543,7 +543,7 @@ export const postApiV1UserForgotPassword = (options: Options) => (options.client ?? client).post({ +export const postApiV1UserResetPassword = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/user/resetPassword', ...options, headers: { @@ -552,7 +552,7 @@ export const postApiV1UserResetPassword = } }); -export const postApiV1UserManage2Fa = (options: Options) => (options.client ?? client).post({ +export const postApiV1UserManage2Fa = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/user/manage/2fa', ...options, headers: { @@ -561,9 +561,9 @@ export const postApiV1UserManage2Fa = (opt } }); -export const getApiV1UserManageInfo = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/user/manage/info', ...options }); +export const getApiV1UserManageInfo = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/user/manage/info', ...options }); -export const postApiV1UserManageInfo = (options: Options) => (options.client ?? client).post({ +export const postApiV1UserManageInfo = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v1/user/manage/info', ...options, headers: { @@ -572,7 +572,7 @@ export const postApiV1UserManageInfo = (op } }); -export const postApiV1UserLogout = (options?: Options) => (options?.client ?? client).post({ +export const postApiV1UserLogout = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v1/user/logout', ...options, headers: { @@ -584,13 +584,13 @@ export const postApiV1UserLogout = (option /** * @deprecated */ -export const getApiV1UserDocumentsSummary = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/user/documents-summary', ...options }); +export const getApiV1UserDocumentsSummary = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/user/documents-summary', ...options }); -export const deleteApiV1User = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v1/user', ...options }); +export const deleteApiV1User = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v1/user', ...options }); -export const getApiV1UsersMe = (options?: Options) => (options?.client ?? client).get({ url: '/api/v1/users/me', ...options }); +export const getApiV1UsersMe = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v1/users/me', ...options }); -export const patchApiV1UsersById = (options: Options) => (options.client ?? client).patch({ +export const patchApiV1UsersById = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v1/users/{id}', ...options, headers: { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/index.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/index.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/params.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/params.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/sdk.gen.ts index 57fb5ec645..95dd6a5748 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape } from './client'; import { client } from './client.gen'; import type { ApiVVersionApiVersionOdataAccountingCompaniesCountData, ApiVVersionApiVersionOdataAccountingCompaniesCountResponses, ApiVVersionApiVersionOdataAccountingCompaniesData, ApiVVersionApiVersionOdataAccountingCompaniesResponses, ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountData, ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountResponses, ApiVVersionApiVersionOdataAccountingCompanyMembershipsData, ApiVVersionApiVersionOdataAccountingCompanyMembershipsResponses, ApiVVersionApiVersionOdataBankAccountsCountData, ApiVVersionApiVersionOdataBankAccountsCountResponses, ApiVVersionApiVersionOdataBankAccountsData, ApiVVersionApiVersionOdataBankAccountsResponses, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountData, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountResponses, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsData, ApiVVersionApiVersionOdataBusinessAccountantAssignmentsResponses, ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountData, ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountResponses, ApiVVersionApiVersionOdataBusinessDocumentActivitiesData, ApiVVersionApiVersionOdataBusinessDocumentActivitiesResponses, ApiVVersionApiVersionOdataBusinessDocumentsCountData, ApiVVersionApiVersionOdataBusinessDocumentsCountResponses, ApiVVersionApiVersionOdataBusinessDocumentsData, ApiVVersionApiVersionOdataBusinessDocumentsResponses, ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountData, ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountResponses, ApiVVersionApiVersionOdataBusinessDocumentsSummariesData, ApiVVersionApiVersionOdataBusinessDocumentsSummariesResponses, ApiVVersionApiVersionOdataBusinessesCountData, ApiVVersionApiVersionOdataBusinessesCountResponses, ApiVVersionApiVersionOdataBusinessesData, ApiVVersionApiVersionOdataBusinessesKey2Data, ApiVVersionApiVersionOdataBusinessesKey2Responses, ApiVVersionApiVersionOdataBusinessesKeyData, ApiVVersionApiVersionOdataBusinessesKeyResponses, ApiVVersionApiVersionOdataBusinessesResponses, ApiVVersionApiVersionOdataBusinessSummariesCountData, ApiVVersionApiVersionOdataBusinessSummariesCountResponses, ApiVVersionApiVersionOdataBusinessSummariesData, ApiVVersionApiVersionOdataBusinessSummariesResponses, ApiVVersionApiVersionOdataCounterpartiesCountData, ApiVVersionApiVersionOdataCounterpartiesCountResponses, ApiVVersionApiVersionOdataCounterpartiesData, ApiVVersionApiVersionOdataCounterpartiesResponses, ApiVVersionApiVersionOdataDataBoxCredentialsCountData, ApiVVersionApiVersionOdataDataBoxCredentialsCountResponses, ApiVVersionApiVersionOdataDataBoxCredentialsData, ApiVVersionApiVersionOdataDataBoxCredentialsResponses, ApiVVersionApiVersionOdataDocumentTypesCountData, ApiVVersionApiVersionOdataDocumentTypesCountResponses, ApiVVersionApiVersionOdataDocumentTypesData, ApiVVersionApiVersionOdataDocumentTypesResponses, ApiVVersionApiVersionOdataInvitationsCountData, ApiVVersionApiVersionOdataInvitationsCountResponses, ApiVVersionApiVersionOdataInvitationsData, ApiVVersionApiVersionOdataInvitationsResponses, ApiVVersionApiVersionOdataInvoicesCountData, ApiVVersionApiVersionOdataInvoicesCountResponses, ApiVVersionApiVersionOdataInvoicesData, ApiVVersionApiVersionOdataInvoiceSettingsCountData, ApiVVersionApiVersionOdataInvoiceSettingsCountResponses, ApiVVersionApiVersionOdataInvoiceSettingsData, ApiVVersionApiVersionOdataInvoiceSettingsResponses, ApiVVersionApiVersionOdataInvoicesResponses, ApiVVersionApiVersionOdataLicensesCountData, ApiVVersionApiVersionOdataLicensesCountResponses, ApiVVersionApiVersionOdataLicensesData, ApiVVersionApiVersionOdataLicensesResponses, ApiVVersionApiVersionOdataPersonalDocumentsCountData, ApiVVersionApiVersionOdataPersonalDocumentsCountResponses, ApiVVersionApiVersionOdataPersonalDocumentsData, ApiVVersionApiVersionOdataPersonalDocumentsResponses, ApiVVersionApiVersionOdataRecurringTasksCountData, ApiVVersionApiVersionOdataRecurringTasksCountResponses, ApiVVersionApiVersionOdataRecurringTasksData, ApiVVersionApiVersionOdataRecurringTasksResponses, ApiVVersionApiVersionOdataTasksCountData, ApiVVersionApiVersionOdataTasksCountResponses, ApiVVersionApiVersionOdataTasksData, ApiVVersionApiVersionOdataTasksKey2Data, ApiVVersionApiVersionOdataTasksKey2Responses, ApiVVersionApiVersionOdataTasksKeyData, ApiVVersionApiVersionOdataTasksKeyResponses, ApiVVersionApiVersionOdataTasksResponses, DeleteApiV1AccountingCompaniesByIdData, DeleteApiV1AccountingCompaniesByIdResponses, DeleteApiV1AccountingCompanyMembershipsByIdData, DeleteApiV1AccountingCompanyMembershipsByIdResponses, DeleteApiV1BankAccountsByIdData, DeleteApiV1BankAccountsByIdResponses, DeleteApiV1BusinessAccountantAssignmentsByIdData, DeleteApiV1BusinessAccountantAssignmentsByIdResponses, DeleteApiV1BusinessDocumentsByIdData, DeleteApiV1BusinessDocumentsByIdResponses, DeleteApiV1BusinessesByIdData, DeleteApiV1BusinessesByIdResponses, DeleteApiV1CounterpartiesByIdData, DeleteApiV1CounterpartiesByIdResponses, DeleteApiV1DataBoxCredentialsByIdData, DeleteApiV1DataBoxCredentialsByIdResponses, DeleteApiV1InvitationsByIdData, DeleteApiV1InvitationsByIdResponses, DeleteApiV1InvoicesByIdData, DeleteApiV1InvoicesByIdResponses, DeleteApiV1NotificationsDeviceTokensData, DeleteApiV1NotificationsDeviceTokensResponses, DeleteApiV1PersonalDocumentsByIdData, DeleteApiV1PersonalDocumentsByIdResponses, DeleteApiV1RecurringTasksByIdData, DeleteApiV1RecurringTasksByIdResponses, DeleteApiV1UserData, DeleteApiV1UserResponses, GetApiDevConfirmEmailData, GetApiDevConfirmEmailResponses, GetApiDevData, GetApiDevDbCreateData, GetApiDevDbCreateResponses, GetApiDevDbReset2Data, GetApiDevDbReset2Responses, GetApiDevDbResetData, GetApiDevDbResetResponses, GetApiDevDbTouchData, GetApiDevDbTouchResponses, GetApiDevEmailSendTestData, GetApiDevEmailSendTestResponses, GetApiDevJobProcessRecurringTasksData, GetApiDevJobProcessRecurringTasksResponses, GetApiDevNotificationsSendTestData, GetApiDevNotificationsSendTestResponses, GetApiDevReseedDbData, GetApiDevReseedDbResponses, GetApiDevResponses, GetApiDevSeedAllData, GetApiDevSeedAllResponses, GetApiDevSeedData, GetApiDevSeedProdData, GetApiDevSeedProdResponses, GetApiDevSeedResponses, GetApiV1BusinessDocumentsByIdRawData, GetApiV1BusinessDocumentsByIdRawResponses, GetApiV1BusinessesByIdDocumentTypesSummaryData, GetApiV1BusinessesByIdDocumentTypesSummaryResponses, GetApiV1InvoicesByIdPreviewData, GetApiV1InvoicesByIdPreviewResponses, GetApiV1PersonalDocumentsByIdRawData, GetApiV1PersonalDocumentsByIdRawResponses, GetApiV1PersonalDocumentsSummaryData, GetApiV1PersonalDocumentsSummaryResponses, GetApiV1TasksByIdCommentsData, GetApiV1TasksByIdCommentsResponses, GetApiV1TasksByIdDocumentsData, GetApiV1TasksByIdDocumentsResponses, GetApiV1UserDocumentsSummaryData, GetApiV1UserDocumentsSummaryResponses, GetApiV1UserManageInfoData, GetApiV1UserManageInfoErrors, GetApiV1UserManageInfoResponses, GetApiV1UsersMeData, GetApiV1UsersMeResponses, GetData, GetResponses, MapIdentityApiApiVVersionApiVersionUserConfirmEmailData, MapIdentityApiApiVVersionApiVersionUserConfirmEmailResponses, PatchApiV1CounterpartiesByIdData, PatchApiV1CounterpartiesByIdResponses, PatchApiV1InvitationsByIdData, PatchApiV1InvitationsByIdResponses, PatchApiV1InvoicesByIdData, PatchApiV1InvoicesByIdResponses, PatchApiV1RecurringTasksByIdData, PatchApiV1RecurringTasksByIdResponses, PatchApiV1UsersByIdData, PatchApiV1UsersByIdResponses, PostApiV1AccountingCompaniesByIdData, PostApiV1AccountingCompaniesByIdResponses, PostApiV1AccountingCompaniesData, PostApiV1AccountingCompaniesResponses, PostApiV1BusinessDocumentsByIdApproveData, PostApiV1BusinessDocumentsByIdApproveResponses, PostApiV1BusinessDocumentsByIdMoveToBusinessData, PostApiV1BusinessDocumentsByIdMoveToBusinessResponses, PostApiV1BusinessDocumentsByIdMoveToPersonalData, PostApiV1BusinessDocumentsByIdMoveToPersonalResponses, PostApiV1BusinessDocumentsByIdUnapproveData, PostApiV1BusinessDocumentsByIdUnapproveResponses, PostApiV1BusinessDocumentsData, PostApiV1BusinessDocumentsResponses, PostApiV1BusinessesByIdDisconnectData, PostApiV1BusinessesByIdDisconnectResponses, PostApiV1BusinessesData, PostApiV1BusinessesResponses, PostApiV1CounterpartiesData, PostApiV1CounterpartiesResponses, PostApiV1FeedbackData, PostApiV1FeedbackResponses, PostApiV1InvitationsByIdAcceptData, PostApiV1InvitationsByIdAcceptResponses, PostApiV1InvitationsByIdRejectData, PostApiV1InvitationsByIdRejectResponses, PostApiV1InvitationsData, PostApiV1InvitationsResponses, PostApiV1InvoicesByIdSendData, PostApiV1InvoicesByIdSendResponses, PostApiV1InvoicesByIdSnapshotData, PostApiV1InvoicesByIdSnapshotResponses, PostApiV1InvoicesData, PostApiV1InvoicesResponses, PostApiV1NotificationsTestData, PostApiV1NotificationsTestResponses, PostApiV1PersonalDocumentsByIdMoveToBusinessData, PostApiV1PersonalDocumentsByIdMoveToBusinessResponses, PostApiV1PersonalDocumentsData, PostApiV1PersonalDocumentsResponses, PostApiV1RecurringTasksData, PostApiV1RecurringTasksResponses, PostApiV1TasksByIdApproveData, PostApiV1TasksByIdApproveResponses, PostApiV1TasksByIdRejectData, PostApiV1TasksByIdRejectResponses, PostApiV1TasksByIdSubmitData, PostApiV1TasksByIdSubmitResponses, PostApiV1TasksData, PostApiV1TasksResponses, PostApiV1UserForgotPasswordData, PostApiV1UserForgotPasswordErrors, PostApiV1UserForgotPasswordResponses, PostApiV1UserLoginData, PostApiV1UserLoginResponses, PostApiV1UserLogoutData, PostApiV1UserLogoutResponses, PostApiV1UserManage2FaData, PostApiV1UserManage2FaErrors, PostApiV1UserManage2FaResponses, PostApiV1UserManageInfoData, PostApiV1UserManageInfoErrors, PostApiV1UserManageInfoResponses, PostApiV1UserRefreshData, PostApiV1UserRefreshResponses, PostApiV1UserRegisterData, PostApiV1UserRegisterErrors, PostApiV1UserRegisterResponses, PostApiV1UserResendConfirmationEmailData, PostApiV1UserResendConfirmationEmailResponses, PostApiV1UserResetPasswordData, PostApiV1UserResetPasswordErrors, PostApiV1UserResetPasswordResponses, PutApiV1AccountingCompanyMembershipsData, PutApiV1AccountingCompanyMembershipsResponses, PutApiV1BankAccountsData, PutApiV1BankAccountsResponses, PutApiV1BusinessAccountantAssignmentsData, PutApiV1BusinessAccountantAssignmentsResponses, PutApiV1BusinessDocumentsByIdData, PutApiV1BusinessDocumentsByIdResponses, PutApiV1BusinessesByIdContactData, PutApiV1BusinessesByIdContactResponses, PutApiV1BusinessesByIdData, PutApiV1BusinessesByIdResponses, PutApiV1BusinessMembershipsData, PutApiV1BusinessMembershipsResponses, PutApiV1DataBoxCredentialsData, PutApiV1DataBoxCredentialsResponses, PutApiV1InvoiceSettingsData, PutApiV1InvoiceSettingsResponses, PutApiV1NotificationsDeviceTokensData, PutApiV1NotificationsDeviceTokensResponses, PutApiV1TasksByIdData, PutApiV1TasksByIdResponses } from './types.gen'; @@ -47,37 +47,37 @@ class HeyApiRegistry { } export class AccountingCompanies extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/AccountingCompanies/$count', ...options }); } } export class AccountingCompanyMemberships extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/AccountingCompanyMemberships/$count', ...options }); } } export class BankAccounts extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BankAccounts/$count', ...options }); } } export class BusinessAccountantAssignments extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BusinessAccountantAssignments/$count', ...options }); } } export class BusinessDocumentActivities extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BusinessDocumentActivities/$count', ...options }); } } export class BusinessDocuments extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BusinessDocuments/$count', ...options }); } } @@ -86,176 +86,176 @@ export class BusinessDocumentsSummaries extends HeyApiClient { /** * @deprecated */ - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BusinessDocumentsSummaries/$count', ...options }); } } export class Businesses extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Businesses/$count', ...options }); } - public key(options?: Options) { + public key(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Businesses/{key}', ...options }); } } export class BusinessSummaries extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BusinessSummaries/$count', ...options }); } } export class Counterparties extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Counterparties/$count', ...options }); } } export class DataBoxCredentials extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/DataBoxCredentials/$count', ...options }); } } export class DocumentTypes extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/DocumentTypes/$count', ...options }); } } export class Invitations extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Invitations/$count', ...options }); } } export class Invoices extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Invoices/$count', ...options }); } } export class InvoiceSettings extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/InvoiceSettings/$count', ...options }); } } export class Licenses extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Licenses/$count', ...options }); } } export class PersonalDocuments extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/PersonalDocuments/$count', ...options }); } } export class RecurringTasks extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/RecurringTasks/$count', ...options }); } } export class Tasks extends HeyApiClient { - public count(options?: Options) { + public count(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Tasks/$count', ...options }); } - public key(options?: Options) { + public key(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Tasks/{key}', ...options }); } } export class Odata extends HeyApiClient { - public accountingCompanies(options?: Options) { + public accountingCompanies(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/AccountingCompanies', ...options }); } - public accountingCompanyMemberships(options?: Options) { + public accountingCompanyMemberships(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/AccountingCompanyMemberships', ...options }); } - public bankAccounts(options?: Options) { + public bankAccounts(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BankAccounts', ...options }); } - public businessAccountantAssignments(options?: Options) { + public businessAccountantAssignments(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BusinessAccountantAssignments', ...options }); } - public businessDocumentActivities(options?: Options) { + public businessDocumentActivities(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BusinessDocumentActivities', ...options }); } - public businessDocuments(options?: Options) { + public businessDocuments(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BusinessDocuments', ...options }); } /** * @deprecated */ - public businessDocumentsSummaries(options?: Options) { + public businessDocumentsSummaries(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BusinessDocumentsSummaries', ...options }); } - public businesses(options?: Options) { + public businesses(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Businesses', ...options }); } - public businessesKey(options?: Options) { + public businessesKey(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Businesses({key})', ...options }); } - public businessSummaries(options?: Options) { + public businessSummaries(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/BusinessSummaries', ...options }); } - public counterparties(options?: Options) { + public counterparties(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Counterparties', ...options }); } - public dataBoxCredentials(options?: Options) { + public dataBoxCredentials(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/DataBoxCredentials', ...options }); } - public documentTypes(options?: Options) { + public documentTypes(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/DocumentTypes', ...options }); } - public invitations(options?: Options) { + public invitations(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Invitations', ...options }); } - public invoices(options?: Options) { + public invoices(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Invoices', ...options }); } - public invoiceSettings(options?: Options) { + public invoiceSettings(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/InvoiceSettings', ...options }); } - public licenses(options?: Options) { + public licenses(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Licenses', ...options }); } - public personalDocuments(options?: Options) { + public personalDocuments(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/PersonalDocuments', ...options }); } - public recurringTasks(options?: Options) { + public recurringTasks(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/RecurringTasks', ...options }); } - public tasks(options?: Options) { + public tasks(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Tasks', ...options }); } - public tasksKey(options?: Options) { + public tasksKey(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/odata/Tasks({key})', ...options }); } @@ -370,7 +370,7 @@ export class Api extends HeyApiClient { } export class User extends HeyApiClient { - public confirmEmail(options: Options) { + public confirmEmail(options: Options): RequestResult { return (options.client ?? this.client).get({ url: '/api/v1/user/confirmEmail', ...options }); } } @@ -397,7 +397,7 @@ export class MapIdentityApi extends HeyApiClient { } export class Sdk extends HeyApiClient { - public static readonly __registry = new HeyApiRegistry(); + public static readonly __registry: HeyApiRegistry = new HeyApiRegistry(); constructor(args?: { client?: Client; @@ -407,7 +407,7 @@ export class Sdk extends HeyApiClient { Sdk.__registry.set(this, args?.key); } - public postApiV1AccountingCompanies(options?: Options) { + public postApiV1AccountingCompanies(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/api/v1/accounting-companies', ...options, @@ -418,11 +418,11 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1AccountingCompaniesById(options: Options) { + public deleteApiV1AccountingCompaniesById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/accounting-companies/{id}', ...options }); } - public postApiV1AccountingCompaniesById(options: Options) { + public postApiV1AccountingCompaniesById(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/accounting-companies/{id}', ...options, @@ -433,7 +433,7 @@ export class Sdk extends HeyApiClient { }); } - public putApiV1AccountingCompanyMemberships(options?: Options) { + public putApiV1AccountingCompanyMemberships(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/api/v1/accounting-company-memberships', ...options, @@ -444,11 +444,11 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1AccountingCompanyMembershipsById(options: Options) { + public deleteApiV1AccountingCompanyMembershipsById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/accounting-company-memberships/{id}', ...options }); } - public putApiV1BankAccounts(options?: Options) { + public putApiV1BankAccounts(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/api/v1/bank-accounts', ...options, @@ -459,11 +459,11 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1BankAccountsById(options: Options) { + public deleteApiV1BankAccountsById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/bank-accounts/{id}', ...options }); } - public putApiV1BusinessAccountantAssignments(options?: Options) { + public putApiV1BusinessAccountantAssignments(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/api/v1/business-accountant-assignments', ...options, @@ -474,15 +474,15 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1BusinessAccountantAssignmentsById(options: Options) { + public deleteApiV1BusinessAccountantAssignmentsById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/business-accountant-assignments/{id}', ...options }); } - public getApiV1BusinessDocumentsByIdRaw(options: Options) { + public getApiV1BusinessDocumentsByIdRaw(options: Options): RequestResult { return (options.client ?? this.client).get({ url: '/api/v1/business-documents/{id}/raw', ...options }); } - public postApiV1BusinessDocuments(options?: Options) { + public postApiV1BusinessDocuments(options?: Options): RequestResult { return (options?.client ?? this.client).post({ ...formDataBodySerializer, url: '/api/v1/business-documents', @@ -494,11 +494,11 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1BusinessDocumentsById(options: Options) { + public deleteApiV1BusinessDocumentsById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/business-documents/{id}', ...options }); } - public putApiV1BusinessDocumentsById(options: Options) { + public putApiV1BusinessDocumentsById(options: Options): RequestResult { return (options.client ?? this.client).put({ url: '/api/v1/business-documents/{id}', ...options, @@ -509,19 +509,19 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1BusinessDocumentsByIdApprove(options: Options) { + public postApiV1BusinessDocumentsByIdApprove(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/business-documents/{id}/approve', ...options }); } - public postApiV1BusinessDocumentsByIdUnapprove(options: Options) { + public postApiV1BusinessDocumentsByIdUnapprove(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/business-documents/{id}/unapprove', ...options }); } - public postApiV1BusinessDocumentsByIdMoveToPersonal(options: Options) { + public postApiV1BusinessDocumentsByIdMoveToPersonal(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/business-documents/{id}/move-to-personal', ...options }); } - public postApiV1BusinessDocumentsByIdMoveToBusiness(options: Options) { + public postApiV1BusinessDocumentsByIdMoveToBusiness(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/business-documents/{id}/move-to-business', ...options, @@ -532,11 +532,11 @@ export class Sdk extends HeyApiClient { }); } - public getApiV1BusinessesByIdDocumentTypesSummary(options: Options) { + public getApiV1BusinessesByIdDocumentTypesSummary(options: Options): RequestResult { return (options.client ?? this.client).get({ url: '/api/v1/businesses/{id}/document-types-summary', ...options }); } - public postApiV1Businesses(options?: Options) { + public postApiV1Businesses(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/api/v1/businesses', ...options, @@ -547,11 +547,11 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1BusinessesById(options: Options) { + public deleteApiV1BusinessesById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/businesses/{id}', ...options }); } - public putApiV1BusinessesById(options: Options) { + public putApiV1BusinessesById(options: Options): RequestResult { return (options.client ?? this.client).put({ url: '/api/v1/businesses/{id}', ...options, @@ -562,7 +562,7 @@ export class Sdk extends HeyApiClient { }); } - public putApiV1BusinessesByIdContact(options: Options) { + public putApiV1BusinessesByIdContact(options: Options): RequestResult { return (options.client ?? this.client).put({ url: '/api/v1/businesses/{id}/contact', ...options, @@ -573,11 +573,11 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1BusinessesByIdDisconnect(options: Options) { + public postApiV1BusinessesByIdDisconnect(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/businesses/{id}/disconnect', ...options }); } - public putApiV1BusinessMemberships(options?: Options) { + public putApiV1BusinessMemberships(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/api/v1/business-memberships', ...options, @@ -588,7 +588,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1Counterparties(options?: Options) { + public postApiV1Counterparties(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/api/v1/counterparties', ...options, @@ -599,11 +599,11 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1CounterpartiesById(options: Options) { + public deleteApiV1CounterpartiesById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/counterparties/{id}', ...options }); } - public patchApiV1CounterpartiesById(options: Options) { + public patchApiV1CounterpartiesById(options: Options): RequestResult { return (options.client ?? this.client).patch({ url: '/api/v1/counterparties/{id}', ...options, @@ -614,7 +614,7 @@ export class Sdk extends HeyApiClient { }); } - public putApiV1DataBoxCredentials(options?: Options) { + public putApiV1DataBoxCredentials(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/api/v1/data-box-credentials', ...options, @@ -625,63 +625,63 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1DataBoxCredentialsById(options: Options) { + public deleteApiV1DataBoxCredentialsById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/data-box-credentials/{id}', ...options }); } - public getApiDev(options?: Options) { + public getApiDev(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev', ...options }); } - public getApiDevReseedDb(options?: Options) { + public getApiDevReseedDb(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/reseed-db', ...options }); } - public getApiDevDbReset(options?: Options) { + public getApiDevDbReset(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/db-reset', ...options }); } - public getApiDevDbReset2(options?: Options) { + public getApiDevDbReset2(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/db/reset', ...options }); } - public getApiDevDbCreate(options?: Options) { + public getApiDevDbCreate(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/db/create', ...options }); } - public getApiDevDbTouch(options?: Options) { + public getApiDevDbTouch(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/db/touch', ...options }); } - public getApiDevSeed(options?: Options) { + public getApiDevSeed(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/seed', ...options }); } - public getApiDevSeedAll(options?: Options) { + public getApiDevSeedAll(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/seed-all', ...options }); } - public getApiDevSeedProd(options?: Options) { + public getApiDevSeedProd(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/seed-prod', ...options }); } - public getApiDevJobProcessRecurringTasks(options?: Options) { + public getApiDevJobProcessRecurringTasks(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/job/process-recurring-tasks', ...options }); } - public getApiDevNotificationsSendTest(options?: Options) { + public getApiDevNotificationsSendTest(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/notifications/send-test', ...options }); } - public getApiDevConfirmEmail(options?: Options) { + public getApiDevConfirmEmail(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/confirm-email', ...options }); } - public getApiDevEmailSendTest(options?: Options) { + public getApiDevEmailSendTest(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/dev/email/send-test', ...options }); } - public deleteApiV1NotificationsDeviceTokens(options?: Options) { + public deleteApiV1NotificationsDeviceTokens(options?: Options): RequestResult { return (options?.client ?? this.client).delete({ url: '/api/v1/notifications/device-tokens', ...options, @@ -692,7 +692,7 @@ export class Sdk extends HeyApiClient { }); } - public putApiV1NotificationsDeviceTokens(options?: Options) { + public putApiV1NotificationsDeviceTokens(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/api/v1/notifications/device-tokens', ...options, @@ -703,7 +703,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1Feedback(options?: Options) { + public postApiV1Feedback(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/api/v1/feedback', ...options, @@ -714,7 +714,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1Invitations(options?: Options) { + public postApiV1Invitations(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/api/v1/invitations', ...options, @@ -725,7 +725,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1InvitationsByIdAccept(options: Options) { + public postApiV1InvitationsByIdAccept(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/invitations/{id}/accept', ...options, @@ -736,15 +736,15 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1InvitationsByIdReject(options: Options) { + public postApiV1InvitationsByIdReject(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/invitations/{id}/reject', ...options }); } - public deleteApiV1InvitationsById(options: Options) { + public deleteApiV1InvitationsById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/invitations/{id}', ...options }); } - public patchApiV1InvitationsById(options: Options) { + public patchApiV1InvitationsById(options: Options): RequestResult { return (options.client ?? this.client).patch({ url: '/api/v1/invitations/{id}', ...options, @@ -755,7 +755,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1Invoices(options?: Options) { + public postApiV1Invoices(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/api/v1/invoices', ...options, @@ -766,11 +766,11 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1InvoicesById(options: Options) { + public deleteApiV1InvoicesById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/invoices/{id}', ...options }); } - public patchApiV1InvoicesById(options: Options) { + public patchApiV1InvoicesById(options: Options): RequestResult { return (options.client ?? this.client).patch({ url: '/api/v1/invoices/{id}', ...options, @@ -781,11 +781,11 @@ export class Sdk extends HeyApiClient { }); } - public getApiV1InvoicesByIdPreview(options: Options) { + public getApiV1InvoicesByIdPreview(options: Options): RequestResult { return (options.client ?? this.client).get({ url: '/api/v1/invoices/{id}/preview', ...options }); } - public postApiV1InvoicesByIdSend(options: Options) { + public postApiV1InvoicesByIdSend(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/invoices/{id}/send', ...options, @@ -796,11 +796,11 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1InvoicesByIdSnapshot(options: Options) { + public postApiV1InvoicesByIdSnapshot(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/invoices/{id}/snapshot', ...options }); } - public putApiV1InvoiceSettings(options?: Options) { + public putApiV1InvoiceSettings(options?: Options): RequestResult { return (options?.client ?? this.client).put({ url: '/api/v1/invoice-settings', ...options, @@ -811,7 +811,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1NotificationsTest(options?: Options) { + public postApiV1NotificationsTest(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/api/v1/notifications/test', ...options, @@ -822,11 +822,11 @@ export class Sdk extends HeyApiClient { }); } - public getApiV1PersonalDocumentsByIdRaw(options: Options) { + public getApiV1PersonalDocumentsByIdRaw(options: Options): RequestResult { return (options.client ?? this.client).get({ url: '/api/v1/personal-documents/{id}/raw', ...options }); } - public postApiV1PersonalDocuments(options?: Options) { + public postApiV1PersonalDocuments(options?: Options): RequestResult { return (options?.client ?? this.client).post({ ...formDataBodySerializer, url: '/api/v1/personal-documents', @@ -838,7 +838,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1PersonalDocumentsByIdMoveToBusiness(options: Options) { + public postApiV1PersonalDocumentsByIdMoveToBusiness(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/personal-documents/{id}/move-to-business', ...options, @@ -849,15 +849,15 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1PersonalDocumentsById(options: Options) { + public deleteApiV1PersonalDocumentsById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/personal-documents/{id}', ...options }); } - public getApiV1PersonalDocumentsSummary(options?: Options) { + public getApiV1PersonalDocumentsSummary(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/personal-documents/summary', ...options }); } - public postApiV1RecurringTasks(options?: Options) { + public postApiV1RecurringTasks(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/api/v1/recurring-tasks', ...options, @@ -868,11 +868,11 @@ export class Sdk extends HeyApiClient { }); } - public deleteApiV1RecurringTasksById(options: Options) { + public deleteApiV1RecurringTasksById(options: Options): RequestResult { return (options.client ?? this.client).delete({ url: '/api/v1/recurring-tasks/{id}', ...options }); } - public patchApiV1RecurringTasksById(options: Options) { + public patchApiV1RecurringTasksById(options: Options): RequestResult { return (options.client ?? this.client).patch({ url: '/api/v1/recurring-tasks/{id}', ...options, @@ -883,11 +883,11 @@ export class Sdk extends HeyApiClient { }); } - public get(options?: Options) { + public get(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/', ...options }); } - public postApiV1Tasks(options?: Options) { + public postApiV1Tasks(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/api/v1/tasks', ...options, @@ -898,7 +898,7 @@ export class Sdk extends HeyApiClient { }); } - public putApiV1TasksById(options: Options) { + public putApiV1TasksById(options: Options): RequestResult { return (options.client ?? this.client).put({ url: '/api/v1/tasks/{id}', ...options, @@ -909,7 +909,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1TasksByIdSubmit(options: Options) { + public postApiV1TasksByIdSubmit(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/tasks/{id}/submit', ...options, @@ -920,11 +920,11 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1TasksByIdApprove(options: Options) { + public postApiV1TasksByIdApprove(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/tasks/{id}/approve', ...options }); } - public postApiV1TasksByIdReject(options: Options) { + public postApiV1TasksByIdReject(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/tasks/{id}/reject', ...options, @@ -935,15 +935,15 @@ export class Sdk extends HeyApiClient { }); } - public getApiV1TasksByIdComments(options: Options) { + public getApiV1TasksByIdComments(options: Options): RequestResult { return (options.client ?? this.client).get({ url: '/api/v1/tasks/{id}/comments', ...options }); } - public getApiV1TasksByIdDocuments(options: Options) { + public getApiV1TasksByIdDocuments(options: Options): RequestResult { return (options.client ?? this.client).get({ url: '/api/v1/tasks/{id}/documents', ...options }); } - public postApiV1UserRegister(options: Options) { + public postApiV1UserRegister(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/user/register', ...options, @@ -954,7 +954,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1UserLogin(options: Options) { + public postApiV1UserLogin(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/user/login', ...options, @@ -965,7 +965,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1UserRefresh(options: Options) { + public postApiV1UserRefresh(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/user/refresh', ...options, @@ -976,7 +976,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1UserResendConfirmationEmail(options: Options) { + public postApiV1UserResendConfirmationEmail(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/user/resendConfirmationEmail', ...options, @@ -987,7 +987,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1UserForgotPassword(options: Options) { + public postApiV1UserForgotPassword(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/user/forgotPassword', ...options, @@ -998,7 +998,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1UserResetPassword(options: Options) { + public postApiV1UserResetPassword(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/user/resetPassword', ...options, @@ -1009,7 +1009,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1UserManage2Fa(options: Options) { + public postApiV1UserManage2Fa(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/user/manage/2fa', ...options, @@ -1020,11 +1020,11 @@ export class Sdk extends HeyApiClient { }); } - public getApiV1UserManageInfo(options?: Options) { + public getApiV1UserManageInfo(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/user/manage/info', ...options }); } - public postApiV1UserManageInfo(options: Options) { + public postApiV1UserManageInfo(options: Options): RequestResult { return (options.client ?? this.client).post({ url: '/api/v1/user/manage/info', ...options, @@ -1035,7 +1035,7 @@ export class Sdk extends HeyApiClient { }); } - public postApiV1UserLogout(options?: Options) { + public postApiV1UserLogout(options?: Options): RequestResult { return (options?.client ?? this.client).post({ url: '/api/v1/user/logout', ...options, @@ -1049,19 +1049,19 @@ export class Sdk extends HeyApiClient { /** * @deprecated */ - public getApiV1UserDocumentsSummary(options?: Options) { + public getApiV1UserDocumentsSummary(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/user/documents-summary', ...options }); } - public deleteApiV1User(options?: Options) { + public deleteApiV1User(options?: Options): RequestResult { return (options?.client ?? this.client).delete({ url: '/api/v1/user', ...options }); } - public getApiV1UsersMe(options?: Options) { + public getApiV1UsersMe(options?: Options): RequestResult { return (options?.client ?? this.client).get({ url: '/api/v1/users/me', ...options }); } - public patchApiV1UsersById(options: Options) { + public patchApiV1UsersById(options: Options): RequestResult { return (options.client ?? this.client).patch({ url: '/api/v1/users/{id}', ...options, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/index.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/index.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/params.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/params.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts index d7d469d0b3..8a7359680d 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { buildClientParams, type Client, type Options as Options2, type TDataShape } from './client'; +import { buildClientParams, type Client, type Options as Options2, type RequestResult, type ServerSentEventsResult, type TDataShape } from './client'; import { client } from './client.gen'; import type { AgentPartInput, AppAgentsResponses, AppLogErrors, AppLogResponses, Auth, AuthSetErrors, AuthSetResponses, CommandListResponses, Config, ConfigGetResponses, ConfigProvidersResponses, ConfigUpdateErrors, ConfigUpdateResponses, EventSubscribeResponse, EventSubscribeResponses, EventTuiCommandExecute, EventTuiPromptAppend, EventTuiToastShow, FileListResponses, FilePartInput, FileReadResponses, FileStatusResponses, FindFilesResponses, FindSymbolsResponses, FindTextResponses, FormatterStatusResponses, GlobalDisposeResponses, GlobalEventResponse, GlobalEventResponses, GlobalHealthResponses, InstanceDisposeResponses, LspStatusResponses, McpAddErrors, McpAddResponses, McpAuthAuthenticateErrors, McpAuthAuthenticateResponses, McpAuthCallbackErrors, McpAuthCallbackResponses, McpAuthRemoveErrors, McpAuthRemoveResponses, McpAuthStartErrors, McpAuthStartResponses, McpConnectResponses, McpDisconnectResponses, McpLocalConfig, McpRemoteConfig, McpStatusResponses, Part, PartDeleteErrors, PartDeleteResponses, PartUpdateErrors, PartUpdateResponses, PathGetResponses, PermissionListResponses, PermissionReplyErrors, PermissionReplyResponses, PermissionRespondErrors, PermissionRespondResponses, PermissionRuleset, ProjectCurrentResponses, ProjectListResponses, ProjectUpdateErrors, ProjectUpdateResponses, ProviderAuthResponses, ProviderListResponses, ProviderOauthAuthorizeErrors, ProviderOauthAuthorizeResponses, ProviderOauthCallbackErrors, ProviderOauthCallbackResponses, PtyConnectErrors, PtyConnectResponses, PtyCreateErrors, PtyCreateResponses, PtyGetErrors, PtyGetResponses, PtyListResponses, PtyRemoveErrors, PtyRemoveResponses, PtyUpdateErrors, PtyUpdateResponses, SessionAbortErrors, SessionAbortResponses, SessionChildrenErrors, SessionChildrenResponses, SessionCommandErrors, SessionCommandResponses, SessionCreateErrors, SessionCreateResponses, SessionDeleteErrors, SessionDeleteResponses, SessionDiffErrors, SessionDiffResponses, SessionForkResponses, SessionGetErrors, SessionGetResponses, SessionInitErrors, SessionInitResponses, SessionListResponses, SessionMessageErrors, SessionMessageResponses, SessionMessagesErrors, SessionMessagesResponses, SessionPromptAsyncErrors, SessionPromptAsyncResponses, SessionPromptErrors, SessionPromptResponses, SessionRevertErrors, SessionRevertResponses, SessionShareErrors, SessionShareResponses, SessionShellErrors, SessionShellResponses, SessionStatusErrors, SessionStatusResponses, SessionSummarizeErrors, SessionSummarizeResponses, SessionTodoErrors, SessionTodoResponses, SessionUnrevertErrors, SessionUnrevertResponses, SessionUnshareErrors, SessionUnshareResponses, SessionUpdateErrors, SessionUpdateResponses, SubtaskPartInput, TextPartInput, ToolIdsErrors, ToolIdsResponses, ToolListErrors, ToolListResponses, TuiAppendPromptErrors, TuiAppendPromptResponses, TuiClearPromptResponses, TuiControlNextResponses, TuiControlResponseResponses, TuiExecuteCommandErrors, TuiExecuteCommandResponses, TuiOpenHelpResponses, TuiOpenModelsResponses, TuiOpenSessionsResponses, TuiOpenThemesResponses, TuiPublishErrors, TuiPublishResponses, TuiShowToastResponses, TuiSubmitPromptResponses, VcsGetResponses } from './types.gen'; @@ -23,21 +23,21 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/global/health', ...options }); +export const globalHealth = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/global/health', ...options }); /** * Get global events * * Subscribe to global events from the OpenCode system using server-sent events. */ -export const globalEvent = (options?: Options) => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); +export const globalEvent = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); /** * Dispose instance * * Clean up and dispose all OpenCode instances, releasing all resources. */ -export const globalDispose = (options?: Options) => (options?.client ?? client).post({ url: '/global/dispose', ...options }); +export const globalDispose = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/global/dispose', ...options }); /** * List all projects @@ -46,7 +46,7 @@ export const globalDispose = (options?: Op */ export const projectList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/project', @@ -62,7 +62,7 @@ export const projectList = (parameters?: { */ export const projectCurrent = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/project/current', @@ -84,7 +84,7 @@ export const projectUpdate = (parameters: url?: string; color?: string; }; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'projectID' }, { in: 'query', key: 'directory' }, @@ -110,7 +110,7 @@ export const projectUpdate = (parameters: */ export const ptyList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/pty', @@ -133,7 +133,7 @@ export const ptyCreate = (parameters?: { env?: { [key: string]: string; }; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'body', key: 'command' }, @@ -162,7 +162,7 @@ export const ptyCreate = (parameters?: { export const ptyRemove = (parameters: { ptyID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'ptyID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).delete({ url: '/pty/{ptyID}', @@ -179,7 +179,7 @@ export const ptyRemove = (parameters: { export const ptyGet = (parameters: { ptyID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'ptyID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/pty/{ptyID}', @@ -201,7 +201,7 @@ export const ptyUpdate = (parameters: { rows: number; cols: number; }; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'ptyID' }, { in: 'query', key: 'directory' }, @@ -228,7 +228,7 @@ export const ptyUpdate = (parameters: { export const ptyConnect = (parameters: { ptyID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'ptyID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/pty/{ptyID}/connect', @@ -244,7 +244,7 @@ export const ptyConnect = (parameters: { */ export const configGet = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/config', @@ -261,7 +261,7 @@ export const configGet = (parameters?: { export const configUpdate = (parameters?: { directory?: string; config?: Config; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { key: 'config', map: 'body' }] }]); return (options?.client ?? client).patch({ url: '/config', @@ -282,7 +282,7 @@ export const configUpdate = (parameters?: */ export const toolIds = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/experimental/tool/ids', @@ -300,7 +300,7 @@ export const toolList = (parameters: { directory?: string; provider: string; model: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'query', key: 'provider' }, @@ -320,7 +320,7 @@ export const toolList = (parameters: { */ export const instanceDispose = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/instance/dispose', @@ -336,7 +336,7 @@ export const instanceDispose = (parameters */ export const pathGet = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/path', @@ -352,7 +352,7 @@ export const pathGet = (parameters?: { */ export const vcsGet = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/vcs', @@ -368,7 +368,7 @@ export const vcsGet = (parameters?: { */ export const sessionList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/session', @@ -387,7 +387,7 @@ export const sessionCreate = (parameters?: parentID?: string; title?: string; permission?: PermissionRuleset; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'body', key: 'parentID' }, @@ -413,7 +413,7 @@ export const sessionCreate = (parameters?: */ export const sessionStatus = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/session/status', @@ -430,7 +430,7 @@ export const sessionStatus = (parameters?: export const sessionDelete = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).delete({ url: '/session/{sessionID}', @@ -447,7 +447,7 @@ export const sessionDelete = (parameters: export const sessionGet = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/session/{sessionID}', @@ -468,7 +468,7 @@ export const sessionUpdate = (parameters: time?: { archived?: number; }; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -495,7 +495,7 @@ export const sessionUpdate = (parameters: export const sessionChildren = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/session/{sessionID}/children', @@ -512,7 +512,7 @@ export const sessionChildren = (parameters export const sessionTodo = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/session/{sessionID}/todo', @@ -532,7 +532,7 @@ export const sessionInit = (parameters: { modelID: string; providerID: string; messageID: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -561,7 +561,7 @@ export const sessionFork = (parameters: { sessionID: string; directory?: string; messageID?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -587,7 +587,7 @@ export const sessionFork = (parameters: { export const sessionAbort = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/session/{sessionID}/abort', @@ -604,7 +604,7 @@ export const sessionAbort = (parameters: { export const sessionUnshare = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).delete({ url: '/session/{sessionID}/share', @@ -621,7 +621,7 @@ export const sessionUnshare = (parameters: export const sessionShare = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/session/{sessionID}/share', @@ -639,7 +639,7 @@ export const sessionDiff = (parameters: { sessionID: string; directory?: string; messageID?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -663,7 +663,7 @@ export const sessionSummarize = (parameter providerID: string; modelID: string; auto?: boolean; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -692,7 +692,7 @@ export const sessionMessages = (parameters sessionID: string; directory?: string; limit?: number; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -726,7 +726,7 @@ export const sessionPrompt = (parameters: system?: string; variant?: string; parts: Array; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -760,7 +760,7 @@ export const sessionMessage = (parameters: sessionID: string; messageID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'path', key: 'messageID' }, @@ -781,7 +781,7 @@ export const partDelete = (parameters: { messageID: string; partID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'path', key: 'messageID' }, @@ -804,7 +804,7 @@ export const partUpdate = (parameters: { partID: string; directory?: string; part?: Part; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'path', key: 'messageID' }, @@ -845,7 +845,7 @@ export const sessionPromptAsync = (paramet system?: string; variant?: string; parts: Array; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -884,7 +884,7 @@ export const sessionCommand = (parameters: arguments: string; command: string; variant?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -921,7 +921,7 @@ export const sessionShell = (parameters: { modelID: string; }; command: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -951,7 +951,7 @@ export const sessionRevert = (parameters: directory?: string; messageID: string; partID?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -978,7 +978,7 @@ export const sessionRevert = (parameters: export const sessionUnrevert = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/session/{sessionID}/unrevert', @@ -999,7 +999,7 @@ export const permissionRespond = (paramete permissionID: string; directory?: string; response: 'once' | 'always' | 'reject'; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'path', key: 'permissionID' }, @@ -1027,7 +1027,7 @@ export const permissionReply = (parameters requestID: string; directory?: string; reply: 'once' | 'always' | 'reject'; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'requestID' }, { in: 'query', key: 'directory' }, @@ -1052,7 +1052,7 @@ export const permissionReply = (parameters */ export const permissionList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/permission', @@ -1068,7 +1068,7 @@ export const permissionList = (parameters? */ export const commandList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/command', @@ -1084,7 +1084,7 @@ export const commandList = (parameters?: { */ export const configProviders = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/config/providers', @@ -1100,7 +1100,7 @@ export const configProviders = (parameters */ export const providerList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/provider', @@ -1116,7 +1116,7 @@ export const providerList = (parameters?: */ export const providerAuth = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/provider/auth', @@ -1134,7 +1134,7 @@ export const providerOauthAuthorize = (par providerID: string; directory?: string; method: number; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'providerID' }, { in: 'query', key: 'directory' }, @@ -1162,7 +1162,7 @@ export const providerOauthCallback = (para directory?: string; method: number; code?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'providerID' }, { in: 'query', key: 'directory' }, @@ -1189,7 +1189,7 @@ export const providerOauthCallback = (para export const findText = (parameters: { directory?: string; pattern: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'query', key: 'pattern' }] }]); return (options?.client ?? client).get({ url: '/find', @@ -1209,7 +1209,7 @@ export const findFiles = (parameters: { dirs?: 'true' | 'false'; type?: 'file' | 'directory'; limit?: number; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'query', key: 'query' }, @@ -1232,7 +1232,7 @@ export const findFiles = (parameters: { export const findSymbols = (parameters: { directory?: string; query: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'query', key: 'query' }] }]); return (options?.client ?? client).get({ url: '/find/symbol', @@ -1249,7 +1249,7 @@ export const findSymbols = (parameters: { export const fileList = (parameters: { directory?: string; path: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'query', key: 'path' }] }]); return (options?.client ?? client).get({ url: '/file', @@ -1266,7 +1266,7 @@ export const fileList = (parameters: { export const fileRead = (parameters: { directory?: string; path: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'query', key: 'path' }] }]); return (options?.client ?? client).get({ url: '/file/content', @@ -1282,7 +1282,7 @@ export const fileRead = (parameters: { */ export const fileStatus = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/file/status', @@ -1304,7 +1304,7 @@ export const appLog = (parameters: { extra?: { [key: string]: unknown; }; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'body', key: 'service' }, @@ -1331,7 +1331,7 @@ export const appLog = (parameters: { */ export const appAgents = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/agent', @@ -1347,7 +1347,7 @@ export const appAgents = (parameters?: { */ export const mcpStatus = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/mcp', @@ -1365,7 +1365,7 @@ export const mcpAdd = (parameters: { directory?: string; name: string; config: McpLocalConfig | McpRemoteConfig; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'body', key: 'name' }, @@ -1391,7 +1391,7 @@ export const mcpAdd = (parameters: { export const mcpAuthRemove = (parameters: { name: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'name' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).delete({ url: '/mcp/{name}/auth', @@ -1408,7 +1408,7 @@ export const mcpAuthRemove = (parameters: export const mcpAuthStart = (parameters: { name: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'name' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/mcp/{name}/auth', @@ -1426,7 +1426,7 @@ export const mcpAuthCallback = (parameters name: string; directory?: string; code: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'name' }, { in: 'query', key: 'directory' }, @@ -1452,7 +1452,7 @@ export const mcpAuthCallback = (parameters export const mcpAuthAuthenticate = (parameters: { name: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'name' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/mcp/{name}/auth/authenticate', @@ -1467,7 +1467,7 @@ export const mcpAuthAuthenticate = (parame export const mcpConnect = (parameters: { name: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'name' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/mcp/{name}/connect', @@ -1482,7 +1482,7 @@ export const mcpConnect = (parameters: { export const mcpDisconnect = (parameters: { name: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'name' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/mcp/{name}/disconnect', @@ -1498,7 +1498,7 @@ export const mcpDisconnect = (parameters: */ export const lspStatus = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/lsp', @@ -1514,7 +1514,7 @@ export const lspStatus = (parameters?: { */ export const formatterStatus = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/formatter', @@ -1531,7 +1531,7 @@ export const formatterStatus = (parameters export const tuiAppendPrompt = (parameters: { directory?: string; text: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'body', key: 'text' }] }]); return (options?.client ?? client).post({ url: '/tui/append-prompt', @@ -1552,7 +1552,7 @@ export const tuiAppendPrompt = (parameters */ export const tuiOpenHelp = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/open-help', @@ -1568,7 +1568,7 @@ export const tuiOpenHelp = (parameters?: { */ export const tuiOpenSessions = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/open-sessions', @@ -1584,7 +1584,7 @@ export const tuiOpenSessions = (parameters */ export const tuiOpenThemes = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/open-themes', @@ -1600,7 +1600,7 @@ export const tuiOpenThemes = (parameters?: */ export const tuiOpenModels = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/open-models', @@ -1616,7 +1616,7 @@ export const tuiOpenModels = (parameters?: */ export const tuiSubmitPrompt = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/submit-prompt', @@ -1632,7 +1632,7 @@ export const tuiSubmitPrompt = (parameters */ export const tuiClearPrompt = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/clear-prompt', @@ -1649,7 +1649,7 @@ export const tuiClearPrompt = (parameters? export const tuiExecuteCommand = (parameters: { directory?: string; command: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'body', key: 'command' }] }]); return (options?.client ?? client).post({ url: '/tui/execute-command', @@ -1674,7 +1674,7 @@ export const tuiShowToast = (parameters: { message: string; variant: 'info' | 'success' | 'warning' | 'error'; duration?: number; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'body', key: 'title' }, @@ -1702,7 +1702,7 @@ export const tuiShowToast = (parameters: { export const tuiPublish = (parameters?: { directory?: string; body?: EventTuiPromptAppend | EventTuiCommandExecute | EventTuiToastShow; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { key: 'body', map: 'body' }] }]); return (options?.client ?? client).post({ url: '/tui/publish', @@ -1723,7 +1723,7 @@ export const tuiPublish = (parameters?: { */ export const tuiControlNext = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/tui/control/next', @@ -1740,7 +1740,7 @@ export const tuiControlNext = (parameters? export const tuiControlResponse = (parameters?: { directory?: string; body?: unknown; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { key: 'body', map: 'body' }] }]); return (options?.client ?? client).post({ url: '/tui/control/response', @@ -1763,7 +1763,7 @@ export const authSet = (parameters: { providerID: string; directory?: string; auth?: Auth; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'providerID' }, { in: 'query', key: 'directory' }, @@ -1788,7 +1788,7 @@ export const authSet = (parameters: { */ export const eventSubscribe = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): Promise> => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).sse.get({ url: '/event', diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/index.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/index.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/params.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/params.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts index d7d469d0b3..8a7359680d 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { buildClientParams, type Client, type Options as Options2, type TDataShape } from './client'; +import { buildClientParams, type Client, type Options as Options2, type RequestResult, type ServerSentEventsResult, type TDataShape } from './client'; import { client } from './client.gen'; import type { AgentPartInput, AppAgentsResponses, AppLogErrors, AppLogResponses, Auth, AuthSetErrors, AuthSetResponses, CommandListResponses, Config, ConfigGetResponses, ConfigProvidersResponses, ConfigUpdateErrors, ConfigUpdateResponses, EventSubscribeResponse, EventSubscribeResponses, EventTuiCommandExecute, EventTuiPromptAppend, EventTuiToastShow, FileListResponses, FilePartInput, FileReadResponses, FileStatusResponses, FindFilesResponses, FindSymbolsResponses, FindTextResponses, FormatterStatusResponses, GlobalDisposeResponses, GlobalEventResponse, GlobalEventResponses, GlobalHealthResponses, InstanceDisposeResponses, LspStatusResponses, McpAddErrors, McpAddResponses, McpAuthAuthenticateErrors, McpAuthAuthenticateResponses, McpAuthCallbackErrors, McpAuthCallbackResponses, McpAuthRemoveErrors, McpAuthRemoveResponses, McpAuthStartErrors, McpAuthStartResponses, McpConnectResponses, McpDisconnectResponses, McpLocalConfig, McpRemoteConfig, McpStatusResponses, Part, PartDeleteErrors, PartDeleteResponses, PartUpdateErrors, PartUpdateResponses, PathGetResponses, PermissionListResponses, PermissionReplyErrors, PermissionReplyResponses, PermissionRespondErrors, PermissionRespondResponses, PermissionRuleset, ProjectCurrentResponses, ProjectListResponses, ProjectUpdateErrors, ProjectUpdateResponses, ProviderAuthResponses, ProviderListResponses, ProviderOauthAuthorizeErrors, ProviderOauthAuthorizeResponses, ProviderOauthCallbackErrors, ProviderOauthCallbackResponses, PtyConnectErrors, PtyConnectResponses, PtyCreateErrors, PtyCreateResponses, PtyGetErrors, PtyGetResponses, PtyListResponses, PtyRemoveErrors, PtyRemoveResponses, PtyUpdateErrors, PtyUpdateResponses, SessionAbortErrors, SessionAbortResponses, SessionChildrenErrors, SessionChildrenResponses, SessionCommandErrors, SessionCommandResponses, SessionCreateErrors, SessionCreateResponses, SessionDeleteErrors, SessionDeleteResponses, SessionDiffErrors, SessionDiffResponses, SessionForkResponses, SessionGetErrors, SessionGetResponses, SessionInitErrors, SessionInitResponses, SessionListResponses, SessionMessageErrors, SessionMessageResponses, SessionMessagesErrors, SessionMessagesResponses, SessionPromptAsyncErrors, SessionPromptAsyncResponses, SessionPromptErrors, SessionPromptResponses, SessionRevertErrors, SessionRevertResponses, SessionShareErrors, SessionShareResponses, SessionShellErrors, SessionShellResponses, SessionStatusErrors, SessionStatusResponses, SessionSummarizeErrors, SessionSummarizeResponses, SessionTodoErrors, SessionTodoResponses, SessionUnrevertErrors, SessionUnrevertResponses, SessionUnshareErrors, SessionUnshareResponses, SessionUpdateErrors, SessionUpdateResponses, SubtaskPartInput, TextPartInput, ToolIdsErrors, ToolIdsResponses, ToolListErrors, ToolListResponses, TuiAppendPromptErrors, TuiAppendPromptResponses, TuiClearPromptResponses, TuiControlNextResponses, TuiControlResponseResponses, TuiExecuteCommandErrors, TuiExecuteCommandResponses, TuiOpenHelpResponses, TuiOpenModelsResponses, TuiOpenSessionsResponses, TuiOpenThemesResponses, TuiPublishErrors, TuiPublishResponses, TuiShowToastResponses, TuiSubmitPromptResponses, VcsGetResponses } from './types.gen'; @@ -23,21 +23,21 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/global/health', ...options }); +export const globalHealth = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/global/health', ...options }); /** * Get global events * * Subscribe to global events from the OpenCode system using server-sent events. */ -export const globalEvent = (options?: Options) => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); +export const globalEvent = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); /** * Dispose instance * * Clean up and dispose all OpenCode instances, releasing all resources. */ -export const globalDispose = (options?: Options) => (options?.client ?? client).post({ url: '/global/dispose', ...options }); +export const globalDispose = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/global/dispose', ...options }); /** * List all projects @@ -46,7 +46,7 @@ export const globalDispose = (options?: Op */ export const projectList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/project', @@ -62,7 +62,7 @@ export const projectList = (parameters?: { */ export const projectCurrent = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/project/current', @@ -84,7 +84,7 @@ export const projectUpdate = (parameters: url?: string; color?: string; }; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'projectID' }, { in: 'query', key: 'directory' }, @@ -110,7 +110,7 @@ export const projectUpdate = (parameters: */ export const ptyList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/pty', @@ -133,7 +133,7 @@ export const ptyCreate = (parameters?: { env?: { [key: string]: string; }; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'body', key: 'command' }, @@ -162,7 +162,7 @@ export const ptyCreate = (parameters?: { export const ptyRemove = (parameters: { ptyID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'ptyID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).delete({ url: '/pty/{ptyID}', @@ -179,7 +179,7 @@ export const ptyRemove = (parameters: { export const ptyGet = (parameters: { ptyID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'ptyID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/pty/{ptyID}', @@ -201,7 +201,7 @@ export const ptyUpdate = (parameters: { rows: number; cols: number; }; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'ptyID' }, { in: 'query', key: 'directory' }, @@ -228,7 +228,7 @@ export const ptyUpdate = (parameters: { export const ptyConnect = (parameters: { ptyID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'ptyID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/pty/{ptyID}/connect', @@ -244,7 +244,7 @@ export const ptyConnect = (parameters: { */ export const configGet = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/config', @@ -261,7 +261,7 @@ export const configGet = (parameters?: { export const configUpdate = (parameters?: { directory?: string; config?: Config; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { key: 'config', map: 'body' }] }]); return (options?.client ?? client).patch({ url: '/config', @@ -282,7 +282,7 @@ export const configUpdate = (parameters?: */ export const toolIds = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/experimental/tool/ids', @@ -300,7 +300,7 @@ export const toolList = (parameters: { directory?: string; provider: string; model: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'query', key: 'provider' }, @@ -320,7 +320,7 @@ export const toolList = (parameters: { */ export const instanceDispose = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/instance/dispose', @@ -336,7 +336,7 @@ export const instanceDispose = (parameters */ export const pathGet = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/path', @@ -352,7 +352,7 @@ export const pathGet = (parameters?: { */ export const vcsGet = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/vcs', @@ -368,7 +368,7 @@ export const vcsGet = (parameters?: { */ export const sessionList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/session', @@ -387,7 +387,7 @@ export const sessionCreate = (parameters?: parentID?: string; title?: string; permission?: PermissionRuleset; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'body', key: 'parentID' }, @@ -413,7 +413,7 @@ export const sessionCreate = (parameters?: */ export const sessionStatus = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/session/status', @@ -430,7 +430,7 @@ export const sessionStatus = (parameters?: export const sessionDelete = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).delete({ url: '/session/{sessionID}', @@ -447,7 +447,7 @@ export const sessionDelete = (parameters: export const sessionGet = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/session/{sessionID}', @@ -468,7 +468,7 @@ export const sessionUpdate = (parameters: time?: { archived?: number; }; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -495,7 +495,7 @@ export const sessionUpdate = (parameters: export const sessionChildren = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/session/{sessionID}/children', @@ -512,7 +512,7 @@ export const sessionChildren = (parameters export const sessionTodo = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/session/{sessionID}/todo', @@ -532,7 +532,7 @@ export const sessionInit = (parameters: { modelID: string; providerID: string; messageID: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -561,7 +561,7 @@ export const sessionFork = (parameters: { sessionID: string; directory?: string; messageID?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -587,7 +587,7 @@ export const sessionFork = (parameters: { export const sessionAbort = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/session/{sessionID}/abort', @@ -604,7 +604,7 @@ export const sessionAbort = (parameters: { export const sessionUnshare = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).delete({ url: '/session/{sessionID}/share', @@ -621,7 +621,7 @@ export const sessionUnshare = (parameters: export const sessionShare = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/session/{sessionID}/share', @@ -639,7 +639,7 @@ export const sessionDiff = (parameters: { sessionID: string; directory?: string; messageID?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -663,7 +663,7 @@ export const sessionSummarize = (parameter providerID: string; modelID: string; auto?: boolean; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -692,7 +692,7 @@ export const sessionMessages = (parameters sessionID: string; directory?: string; limit?: number; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -726,7 +726,7 @@ export const sessionPrompt = (parameters: system?: string; variant?: string; parts: Array; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -760,7 +760,7 @@ export const sessionMessage = (parameters: sessionID: string; messageID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'path', key: 'messageID' }, @@ -781,7 +781,7 @@ export const partDelete = (parameters: { messageID: string; partID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'path', key: 'messageID' }, @@ -804,7 +804,7 @@ export const partUpdate = (parameters: { partID: string; directory?: string; part?: Part; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'path', key: 'messageID' }, @@ -845,7 +845,7 @@ export const sessionPromptAsync = (paramet system?: string; variant?: string; parts: Array; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -884,7 +884,7 @@ export const sessionCommand = (parameters: arguments: string; command: string; variant?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -921,7 +921,7 @@ export const sessionShell = (parameters: { modelID: string; }; command: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -951,7 +951,7 @@ export const sessionRevert = (parameters: directory?: string; messageID: string; partID?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }, @@ -978,7 +978,7 @@ export const sessionRevert = (parameters: export const sessionUnrevert = (parameters: { sessionID: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'sessionID' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/session/{sessionID}/unrevert', @@ -999,7 +999,7 @@ export const permissionRespond = (paramete permissionID: string; directory?: string; response: 'once' | 'always' | 'reject'; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'sessionID' }, { in: 'path', key: 'permissionID' }, @@ -1027,7 +1027,7 @@ export const permissionReply = (parameters requestID: string; directory?: string; reply: 'once' | 'always' | 'reject'; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'requestID' }, { in: 'query', key: 'directory' }, @@ -1052,7 +1052,7 @@ export const permissionReply = (parameters */ export const permissionList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/permission', @@ -1068,7 +1068,7 @@ export const permissionList = (parameters? */ export const commandList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/command', @@ -1084,7 +1084,7 @@ export const commandList = (parameters?: { */ export const configProviders = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/config/providers', @@ -1100,7 +1100,7 @@ export const configProviders = (parameters */ export const providerList = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/provider', @@ -1116,7 +1116,7 @@ export const providerList = (parameters?: */ export const providerAuth = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/provider/auth', @@ -1134,7 +1134,7 @@ export const providerOauthAuthorize = (par providerID: string; directory?: string; method: number; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'providerID' }, { in: 'query', key: 'directory' }, @@ -1162,7 +1162,7 @@ export const providerOauthCallback = (para directory?: string; method: number; code?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'providerID' }, { in: 'query', key: 'directory' }, @@ -1189,7 +1189,7 @@ export const providerOauthCallback = (para export const findText = (parameters: { directory?: string; pattern: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'query', key: 'pattern' }] }]); return (options?.client ?? client).get({ url: '/find', @@ -1209,7 +1209,7 @@ export const findFiles = (parameters: { dirs?: 'true' | 'false'; type?: 'file' | 'directory'; limit?: number; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'query', key: 'query' }, @@ -1232,7 +1232,7 @@ export const findFiles = (parameters: { export const findSymbols = (parameters: { directory?: string; query: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'query', key: 'query' }] }]); return (options?.client ?? client).get({ url: '/find/symbol', @@ -1249,7 +1249,7 @@ export const findSymbols = (parameters: { export const fileList = (parameters: { directory?: string; path: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'query', key: 'path' }] }]); return (options?.client ?? client).get({ url: '/file', @@ -1266,7 +1266,7 @@ export const fileList = (parameters: { export const fileRead = (parameters: { directory?: string; path: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'query', key: 'path' }] }]); return (options?.client ?? client).get({ url: '/file/content', @@ -1282,7 +1282,7 @@ export const fileRead = (parameters: { */ export const fileStatus = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/file/status', @@ -1304,7 +1304,7 @@ export const appLog = (parameters: { extra?: { [key: string]: unknown; }; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'body', key: 'service' }, @@ -1331,7 +1331,7 @@ export const appLog = (parameters: { */ export const appAgents = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/agent', @@ -1347,7 +1347,7 @@ export const appAgents = (parameters?: { */ export const mcpStatus = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/mcp', @@ -1365,7 +1365,7 @@ export const mcpAdd = (parameters: { directory?: string; name: string; config: McpLocalConfig | McpRemoteConfig; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'body', key: 'name' }, @@ -1391,7 +1391,7 @@ export const mcpAdd = (parameters: { export const mcpAuthRemove = (parameters: { name: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'name' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).delete({ url: '/mcp/{name}/auth', @@ -1408,7 +1408,7 @@ export const mcpAuthRemove = (parameters: export const mcpAuthStart = (parameters: { name: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'name' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/mcp/{name}/auth', @@ -1426,7 +1426,7 @@ export const mcpAuthCallback = (parameters name: string; directory?: string; code: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'name' }, { in: 'query', key: 'directory' }, @@ -1452,7 +1452,7 @@ export const mcpAuthCallback = (parameters export const mcpAuthAuthenticate = (parameters: { name: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'name' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/mcp/{name}/auth/authenticate', @@ -1467,7 +1467,7 @@ export const mcpAuthAuthenticate = (parame export const mcpConnect = (parameters: { name: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'name' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/mcp/{name}/connect', @@ -1482,7 +1482,7 @@ export const mcpConnect = (parameters: { export const mcpDisconnect = (parameters: { name: string; directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'name' }, { in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/mcp/{name}/disconnect', @@ -1498,7 +1498,7 @@ export const mcpDisconnect = (parameters: */ export const lspStatus = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/lsp', @@ -1514,7 +1514,7 @@ export const lspStatus = (parameters?: { */ export const formatterStatus = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/formatter', @@ -1531,7 +1531,7 @@ export const formatterStatus = (parameters export const tuiAppendPrompt = (parameters: { directory?: string; text: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'body', key: 'text' }] }]); return (options?.client ?? client).post({ url: '/tui/append-prompt', @@ -1552,7 +1552,7 @@ export const tuiAppendPrompt = (parameters */ export const tuiOpenHelp = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/open-help', @@ -1568,7 +1568,7 @@ export const tuiOpenHelp = (parameters?: { */ export const tuiOpenSessions = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/open-sessions', @@ -1584,7 +1584,7 @@ export const tuiOpenSessions = (parameters */ export const tuiOpenThemes = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/open-themes', @@ -1600,7 +1600,7 @@ export const tuiOpenThemes = (parameters?: */ export const tuiOpenModels = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/open-models', @@ -1616,7 +1616,7 @@ export const tuiOpenModels = (parameters?: */ export const tuiSubmitPrompt = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/submit-prompt', @@ -1632,7 +1632,7 @@ export const tuiSubmitPrompt = (parameters */ export const tuiClearPrompt = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).post({ url: '/tui/clear-prompt', @@ -1649,7 +1649,7 @@ export const tuiClearPrompt = (parameters? export const tuiExecuteCommand = (parameters: { directory?: string; command: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { in: 'body', key: 'command' }] }]); return (options?.client ?? client).post({ url: '/tui/execute-command', @@ -1674,7 +1674,7 @@ export const tuiShowToast = (parameters: { message: string; variant: 'info' | 'success' | 'warning' | 'error'; duration?: number; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'query', key: 'directory' }, { in: 'body', key: 'title' }, @@ -1702,7 +1702,7 @@ export const tuiShowToast = (parameters: { export const tuiPublish = (parameters?: { directory?: string; body?: EventTuiPromptAppend | EventTuiCommandExecute | EventTuiToastShow; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { key: 'body', map: 'body' }] }]); return (options?.client ?? client).post({ url: '/tui/publish', @@ -1723,7 +1723,7 @@ export const tuiPublish = (parameters?: { */ export const tuiControlNext = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).get({ url: '/tui/control/next', @@ -1740,7 +1740,7 @@ export const tuiControlNext = (parameters? export const tuiControlResponse = (parameters?: { directory?: string; body?: unknown; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }, { key: 'body', map: 'body' }] }]); return (options?.client ?? client).post({ url: '/tui/control/response', @@ -1763,7 +1763,7 @@ export const authSet = (parameters: { providerID: string; directory?: string; auth?: Auth; -}, options?: Options) => { +}, options?: Options): RequestResult => { const params = buildClientParams([parameters], [{ args: [ { in: 'path', key: 'providerID' }, { in: 'query', key: 'directory' }, @@ -1788,7 +1788,7 @@ export const authSet = (parameters: { */ export const eventSubscribe = (parameters?: { directory?: string; -}, options?: Options) => { +}, options?: Options): Promise> => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); return (options?.client ?? client).sse.get({ url: '/event', diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/index.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/index.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/params.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/params.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts index b2387e7139..2a08ae0ab4 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, ServerSentEventsResult, TDataShape } from './client'; import { client } from './client.gen'; import type { AppAgentsData, AppAgentsResponses, AppLogData, AppLogErrors, AppLogResponses, AuthSetData, AuthSetErrors, AuthSetResponses, CommandListData, CommandListResponses, ConfigGetData, ConfigGetResponses, ConfigProvidersData, ConfigProvidersResponses, ConfigUpdateData, ConfigUpdateErrors, ConfigUpdateResponses, EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses, FileListData, FileListResponses, FileReadData, FileReadResponses, FileStatusData, FileStatusResponses, FindFilesData, FindFilesResponses, FindSymbolsData, FindSymbolsResponses, FindTextData, FindTextResponses, FormatterStatusData, FormatterStatusResponses, GlobalDisposeData, GlobalDisposeResponses, GlobalEventData, GlobalEventResponse, GlobalEventResponses, GlobalHealthData, GlobalHealthResponses, InstanceDisposeData, InstanceDisposeResponses, LspStatusData, LspStatusResponses, McpAddData, McpAddErrors, McpAddResponses, McpAuthAuthenticateData, McpAuthAuthenticateErrors, McpAuthAuthenticateResponses, McpAuthCallbackData, McpAuthCallbackErrors, McpAuthCallbackResponses, McpAuthRemoveData, McpAuthRemoveErrors, McpAuthRemoveResponses, McpAuthStartData, McpAuthStartErrors, McpAuthStartResponses, McpConnectData, McpConnectResponses, McpDisconnectData, McpDisconnectResponses, McpStatusData, McpStatusResponses, PartDeleteData, PartDeleteErrors, PartDeleteResponses, PartUpdateData, PartUpdateErrors, PartUpdateResponses, PathGetData, PathGetResponses, PermissionListData, PermissionListResponses, PermissionReplyData, PermissionReplyErrors, PermissionReplyResponses, PermissionRespondData, PermissionRespondErrors, PermissionRespondResponses, ProjectCurrentData, ProjectCurrentResponses, ProjectListData, ProjectListResponses, ProjectUpdateData, ProjectUpdateErrors, ProjectUpdateResponses, ProviderAuthData, ProviderAuthResponses, ProviderListData, ProviderListResponses, ProviderOauthAuthorizeData, ProviderOauthAuthorizeErrors, ProviderOauthAuthorizeResponses, ProviderOauthCallbackData, ProviderOauthCallbackErrors, ProviderOauthCallbackResponses, PtyConnectData, PtyConnectErrors, PtyConnectResponses, PtyCreateData, PtyCreateErrors, PtyCreateResponses, PtyGetData, PtyGetErrors, PtyGetResponses, PtyListData, PtyListResponses, PtyRemoveData, PtyRemoveErrors, PtyRemoveResponses, PtyUpdateData, PtyUpdateErrors, PtyUpdateResponses, SessionAbortData, SessionAbortErrors, SessionAbortResponses, SessionChildrenData, SessionChildrenErrors, SessionChildrenResponses, SessionCommandData, SessionCommandErrors, SessionCommandResponses, SessionCreateData, SessionCreateErrors, SessionCreateResponses, SessionDeleteData, SessionDeleteErrors, SessionDeleteResponses, SessionDiffData, SessionDiffErrors, SessionDiffResponses, SessionForkData, SessionForkResponses, SessionGetData, SessionGetErrors, SessionGetResponses, SessionInitData, SessionInitErrors, SessionInitResponses, SessionListData, SessionListResponses, SessionMessageData, SessionMessageErrors, SessionMessageResponses, SessionMessagesData, SessionMessagesErrors, SessionMessagesResponses, SessionPromptAsyncData, SessionPromptAsyncErrors, SessionPromptAsyncResponses, SessionPromptData, SessionPromptErrors, SessionPromptResponses, SessionRevertData, SessionRevertErrors, SessionRevertResponses, SessionShareData, SessionShareErrors, SessionShareResponses, SessionShellData, SessionShellErrors, SessionShellResponses, SessionStatusData, SessionStatusErrors, SessionStatusResponses, SessionSummarizeData, SessionSummarizeErrors, SessionSummarizeResponses, SessionTodoData, SessionTodoErrors, SessionTodoResponses, SessionUnrevertData, SessionUnrevertErrors, SessionUnrevertResponses, SessionUnshareData, SessionUnshareErrors, SessionUnshareResponses, SessionUpdateData, SessionUpdateErrors, SessionUpdateResponses, ToolIdsData, ToolIdsErrors, ToolIdsResponses, ToolListData, ToolListErrors, ToolListResponses, TuiAppendPromptData, TuiAppendPromptErrors, TuiAppendPromptResponses, TuiClearPromptData, TuiClearPromptResponses, TuiControlNextData, TuiControlNextResponses, TuiControlResponseData, TuiControlResponseResponses, TuiExecuteCommandData, TuiExecuteCommandErrors, TuiExecuteCommandResponses, TuiOpenHelpData, TuiOpenHelpResponses, TuiOpenModelsData, TuiOpenModelsResponses, TuiOpenSessionsData, TuiOpenSessionsResponses, TuiOpenThemesData, TuiOpenThemesResponses, TuiPublishData, TuiPublishErrors, TuiPublishResponses, TuiShowToastData, TuiShowToastResponses, TuiSubmitPromptData, TuiSubmitPromptResponses, VcsGetData, VcsGetResponses } from './types.gen'; @@ -23,42 +23,42 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/global/health', ...options }); +export const globalHealth = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/global/health', ...options }); /** * Get global events * * Subscribe to global events from the OpenCode system using server-sent events. */ -export const globalEvent = (options?: Options) => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); +export const globalEvent = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); /** * Dispose instance * * Clean up and dispose all OpenCode instances, releasing all resources. */ -export const globalDispose = (options?: Options) => (options?.client ?? client).post({ url: '/global/dispose', ...options }); +export const globalDispose = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/global/dispose', ...options }); /** * List all projects * * Get a list of projects that have been opened with OpenCode. */ -export const projectList = (options?: Options) => (options?.client ?? client).get({ url: '/project', ...options }); +export const projectList = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/project', ...options }); /** * Get current project * * Retrieve the currently active project that OpenCode is working with. */ -export const projectCurrent = (options?: Options) => (options?.client ?? client).get({ url: '/project/current', ...options }); +export const projectCurrent = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/project/current', ...options }); /** * Update project * * Update project properties such as name, icon and color. */ -export const projectUpdate = (options: Options) => (options.client ?? client).patch({ +export const projectUpdate = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/project/{projectID}', ...options, headers: { @@ -72,14 +72,14 @@ export const projectUpdate = (options: Opt * * Get a list of all active pseudo-terminal (PTY) sessions managed by OpenCode. */ -export const ptyList = (options?: Options) => (options?.client ?? client).get({ url: '/pty', ...options }); +export const ptyList = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/pty', ...options }); /** * Create PTY session * * Create a new pseudo-terminal (PTY) session for running shell commands and processes. */ -export const ptyCreate = (options?: Options) => (options?.client ?? client).post({ +export const ptyCreate = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/pty', ...options, headers: { @@ -93,21 +93,21 @@ export const ptyCreate = (options?: Option * * Remove and terminate a specific pseudo-terminal (PTY) session. */ -export const ptyRemove = (options: Options) => (options.client ?? client).delete({ url: '/pty/{ptyID}', ...options }); +export const ptyRemove = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/pty/{ptyID}', ...options }); /** * Get PTY session * * Retrieve detailed information about a specific pseudo-terminal (PTY) session. */ -export const ptyGet = (options: Options) => (options.client ?? client).get({ url: '/pty/{ptyID}', ...options }); +export const ptyGet = (options: Options): RequestResult => (options.client ?? client).get({ url: '/pty/{ptyID}', ...options }); /** * Update PTY session * * Update properties of an existing pseudo-terminal (PTY) session. */ -export const ptyUpdate = (options: Options) => (options.client ?? client).put({ +export const ptyUpdate = (options: Options): RequestResult => (options.client ?? client).put({ url: '/pty/{ptyID}', ...options, headers: { @@ -121,21 +121,21 @@ export const ptyUpdate = (options: Options * * Establish a WebSocket connection to interact with a pseudo-terminal (PTY) session in real-time. */ -export const ptyConnect = (options: Options) => (options.client ?? client).get({ url: '/pty/{ptyID}/connect', ...options }); +export const ptyConnect = (options: Options): RequestResult => (options.client ?? client).get({ url: '/pty/{ptyID}/connect', ...options }); /** * Get configuration * * Retrieve the current OpenCode configuration settings and preferences. */ -export const configGet = (options?: Options) => (options?.client ?? client).get({ url: '/config', ...options }); +export const configGet = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/config', ...options }); /** * Update configuration * * Update OpenCode configuration settings and preferences. */ -export const configUpdate = (options?: Options) => (options?.client ?? client).patch({ +export const configUpdate = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/config', ...options, headers: { @@ -149,49 +149,49 @@ export const configUpdate = (options?: Opt * * Get a list of all available tool IDs, including both built-in tools and dynamically registered tools. */ -export const toolIds = (options?: Options) => (options?.client ?? client).get({ url: '/experimental/tool/ids', ...options }); +export const toolIds = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/experimental/tool/ids', ...options }); /** * List tools * * Get a list of available tools with their JSON schema parameters for a specific provider and model combination. */ -export const toolList = (options: Options) => (options.client ?? client).get({ url: '/experimental/tool', ...options }); +export const toolList = (options: Options): RequestResult => (options.client ?? client).get({ url: '/experimental/tool', ...options }); /** * Dispose instance * * Clean up and dispose the current OpenCode instance, releasing all resources. */ -export const instanceDispose = (options?: Options) => (options?.client ?? client).post({ url: '/instance/dispose', ...options }); +export const instanceDispose = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/instance/dispose', ...options }); /** * Get paths * * Retrieve the current working directory and related path information for the OpenCode instance. */ -export const pathGet = (options?: Options) => (options?.client ?? client).get({ url: '/path', ...options }); +export const pathGet = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/path', ...options }); /** * Get VCS info * * Retrieve version control system (VCS) information for the current project, such as git branch. */ -export const vcsGet = (options?: Options) => (options?.client ?? client).get({ url: '/vcs', ...options }); +export const vcsGet = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/vcs', ...options }); /** * List sessions * * Get a list of all OpenCode sessions, sorted by most recently updated. */ -export const sessionList = (options?: Options) => (options?.client ?? client).get({ url: '/session', ...options }); +export const sessionList = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/session', ...options }); /** * Create session * * Create a new OpenCode session for interacting with AI assistants and managing conversations. */ -export const sessionCreate = (options?: Options) => (options?.client ?? client).post({ +export const sessionCreate = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/session', ...options, headers: { @@ -205,28 +205,28 @@ export const sessionCreate = (options?: Op * * Retrieve the current status of all sessions, including active, idle, and completed states. */ -export const sessionStatus = (options?: Options) => (options?.client ?? client).get({ url: '/session/status', ...options }); +export const sessionStatus = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/session/status', ...options }); /** * Delete session * * Delete a session and permanently remove all associated data, including messages and history. */ -export const sessionDelete = (options: Options) => (options.client ?? client).delete({ url: '/session/{sessionID}', ...options }); +export const sessionDelete = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/session/{sessionID}', ...options }); /** * Get session * * Retrieve detailed information about a specific OpenCode session. */ -export const sessionGet = (options: Options) => (options.client ?? client).get({ url: '/session/{sessionID}', ...options }); +export const sessionGet = (options: Options): RequestResult => (options.client ?? client).get({ url: '/session/{sessionID}', ...options }); /** * Update session * * Update properties of an existing session, such as title or other metadata. */ -export const sessionUpdate = (options: Options) => (options.client ?? client).patch({ +export const sessionUpdate = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/session/{sessionID}', ...options, headers: { @@ -240,21 +240,21 @@ export const sessionUpdate = (options: Opt * * Retrieve all child sessions that were forked from the specified parent session. */ -export const sessionChildren = (options: Options) => (options.client ?? client).get({ url: '/session/{sessionID}/children', ...options }); +export const sessionChildren = (options: Options): RequestResult => (options.client ?? client).get({ url: '/session/{sessionID}/children', ...options }); /** * Get session todos * * Retrieve the todo list associated with a specific session, showing tasks and action items. */ -export const sessionTodo = (options: Options) => (options.client ?? client).get({ url: '/session/{sessionID}/todo', ...options }); +export const sessionTodo = (options: Options): RequestResult => (options.client ?? client).get({ url: '/session/{sessionID}/todo', ...options }); /** * Initialize session * * Analyze the current application and create an AGENTS.md file with project-specific agent configurations. */ -export const sessionInit = (options: Options) => (options.client ?? client).post({ +export const sessionInit = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/init', ...options, headers: { @@ -268,7 +268,7 @@ export const sessionInit = (options: Optio * * Create a new session by forking an existing session at a specific message point. */ -export const sessionFork = (options: Options) => (options.client ?? client).post({ +export const sessionFork = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/fork', ...options, headers: { @@ -282,35 +282,35 @@ export const sessionFork = (options: Optio * * Abort an active session and stop any ongoing AI processing or command execution. */ -export const sessionAbort = (options: Options) => (options.client ?? client).post({ url: '/session/{sessionID}/abort', ...options }); +export const sessionAbort = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/abort', ...options }); /** * Unshare session * * Remove the shareable link for a session, making it private again. */ -export const sessionUnshare = (options: Options) => (options.client ?? client).delete({ url: '/session/{sessionID}/share', ...options }); +export const sessionUnshare = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/session/{sessionID}/share', ...options }); /** * Share session * * Create a shareable link for a session, allowing others to view the conversation. */ -export const sessionShare = (options: Options) => (options.client ?? client).post({ url: '/session/{sessionID}/share', ...options }); +export const sessionShare = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/share', ...options }); /** * Get session diff * * Get all file changes (diffs) made during this session. */ -export const sessionDiff = (options: Options) => (options.client ?? client).get({ url: '/session/{sessionID}/diff', ...options }); +export const sessionDiff = (options: Options): RequestResult => (options.client ?? client).get({ url: '/session/{sessionID}/diff', ...options }); /** * Summarize session * * Generate a concise summary of the session using AI compaction to preserve key information. */ -export const sessionSummarize = (options: Options) => (options.client ?? client).post({ +export const sessionSummarize = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/summarize', ...options, headers: { @@ -324,14 +324,14 @@ export const sessionSummarize = (options: * * Retrieve all messages in a session, including user prompts and AI responses. */ -export const sessionMessages = (options: Options) => (options.client ?? client).get({ url: '/session/{sessionID}/message', ...options }); +export const sessionMessages = (options: Options): RequestResult => (options.client ?? client).get({ url: '/session/{sessionID}/message', ...options }); /** * Send message * * Create and send a new message to a session, streaming the AI response. */ -export const sessionPrompt = (options: Options) => (options.client ?? client).post({ +export const sessionPrompt = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/message', ...options, headers: { @@ -345,17 +345,17 @@ export const sessionPrompt = (options: Opt * * Retrieve a specific message from a session by its message ID. */ -export const sessionMessage = (options: Options) => (options.client ?? client).get({ url: '/session/{sessionID}/message/{messageID}', ...options }); +export const sessionMessage = (options: Options): RequestResult => (options.client ?? client).get({ url: '/session/{sessionID}/message/{messageID}', ...options }); /** * Delete a part from a message */ -export const partDelete = (options: Options) => (options.client ?? client).delete({ url: '/session/{sessionID}/message/{messageID}/part/{partID}', ...options }); +export const partDelete = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/session/{sessionID}/message/{messageID}/part/{partID}', ...options }); /** * Update a part in a message */ -export const partUpdate = (options: Options) => (options.client ?? client).patch({ +export const partUpdate = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/session/{sessionID}/message/{messageID}/part/{partID}', ...options, headers: { @@ -369,7 +369,7 @@ export const partUpdate = (options: Option * * Create and send a new message to a session asynchronously, starting the session if needed and returning immediately. */ -export const sessionPromptAsync = (options: Options) => (options.client ?? client).post({ +export const sessionPromptAsync = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/prompt_async', ...options, headers: { @@ -383,7 +383,7 @@ export const sessionPromptAsync = (options * * Send a new command to a session for execution by the AI assistant. */ -export const sessionCommand = (options: Options) => (options.client ?? client).post({ +export const sessionCommand = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/command', ...options, headers: { @@ -397,7 +397,7 @@ export const sessionCommand = (options: Op * * Execute a shell command within the session context and return the AI's response. */ -export const sessionShell = (options: Options) => (options.client ?? client).post({ +export const sessionShell = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/shell', ...options, headers: { @@ -411,7 +411,7 @@ export const sessionShell = (options: Opti * * Revert a specific message in a session, undoing its effects and restoring the previous state. */ -export const sessionRevert = (options: Options) => (options.client ?? client).post({ +export const sessionRevert = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/revert', ...options, headers: { @@ -425,7 +425,7 @@ export const sessionRevert = (options: Opt * * Restore all previously reverted messages in a session. */ -export const sessionUnrevert = (options: Options) => (options.client ?? client).post({ url: '/session/{sessionID}/unrevert', ...options }); +export const sessionUnrevert = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/unrevert', ...options }); /** * Respond to permission @@ -434,7 +434,7 @@ export const sessionUnrevert = (options: O * * @deprecated */ -export const permissionRespond = (options: Options) => (options.client ?? client).post({ +export const permissionRespond = (options: Options): RequestResult => (options.client ?? client).post({ url: '/session/{sessionID}/permissions/{permissionID}', ...options, headers: { @@ -448,7 +448,7 @@ export const permissionRespond = (options: * * Approve or deny a permission request from the AI assistant. */ -export const permissionReply = (options: Options) => (options.client ?? client).post({ +export const permissionReply = (options: Options): RequestResult => (options.client ?? client).post({ url: '/permission/{requestID}/reply', ...options, headers: { @@ -462,42 +462,42 @@ export const permissionReply = (options: O * * Get all pending permission requests across all sessions. */ -export const permissionList = (options?: Options) => (options?.client ?? client).get({ url: '/permission', ...options }); +export const permissionList = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/permission', ...options }); /** * List commands * * Get a list of all available commands in the OpenCode system. */ -export const commandList = (options?: Options) => (options?.client ?? client).get({ url: '/command', ...options }); +export const commandList = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/command', ...options }); /** * List config providers * * Get a list of all configured AI providers and their default models. */ -export const configProviders = (options?: Options) => (options?.client ?? client).get({ url: '/config/providers', ...options }); +export const configProviders = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/config/providers', ...options }); /** * List providers * * Get a list of all available AI providers, including both available and connected ones. */ -export const providerList = (options?: Options) => (options?.client ?? client).get({ url: '/provider', ...options }); +export const providerList = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/provider', ...options }); /** * Get provider auth methods * * Retrieve available authentication methods for all AI providers. */ -export const providerAuth = (options?: Options) => (options?.client ?? client).get({ url: '/provider/auth', ...options }); +export const providerAuth = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/provider/auth', ...options }); /** * OAuth authorize * * Initiate OAuth authorization for a specific AI provider to get an authorization URL. */ -export const providerOauthAuthorize = (options: Options) => (options.client ?? client).post({ +export const providerOauthAuthorize = (options: Options): RequestResult => (options.client ?? client).post({ url: '/provider/{providerID}/oauth/authorize', ...options, headers: { @@ -511,7 +511,7 @@ export const providerOauthAuthorize = (opt * * Handle the OAuth callback from a provider after user authorization. */ -export const providerOauthCallback = (options: Options) => (options.client ?? client).post({ +export const providerOauthCallback = (options: Options): RequestResult => (options.client ?? client).post({ url: '/provider/{providerID}/oauth/callback', ...options, headers: { @@ -525,49 +525,49 @@ export const providerOauthCallback = (opti * * Search for text patterns across files in the project using ripgrep. */ -export const findText = (options: Options) => (options.client ?? client).get({ url: '/find', ...options }); +export const findText = (options: Options): RequestResult => (options.client ?? client).get({ url: '/find', ...options }); /** * Find files * * Search for files or directories by name or pattern in the project directory. */ -export const findFiles = (options: Options) => (options.client ?? client).get({ url: '/find/file', ...options }); +export const findFiles = (options: Options): RequestResult => (options.client ?? client).get({ url: '/find/file', ...options }); /** * Find symbols * * Search for workspace symbols like functions, classes, and variables using LSP. */ -export const findSymbols = (options: Options) => (options.client ?? client).get({ url: '/find/symbol', ...options }); +export const findSymbols = (options: Options): RequestResult => (options.client ?? client).get({ url: '/find/symbol', ...options }); /** * List files * * List files and directories in a specified path. */ -export const fileList = (options: Options) => (options.client ?? client).get({ url: '/file', ...options }); +export const fileList = (options: Options): RequestResult => (options.client ?? client).get({ url: '/file', ...options }); /** * Read file * * Read the content of a specified file. */ -export const fileRead = (options: Options) => (options.client ?? client).get({ url: '/file/content', ...options }); +export const fileRead = (options: Options): RequestResult => (options.client ?? client).get({ url: '/file/content', ...options }); /** * Get file status * * Get the git status of all files in the project. */ -export const fileStatus = (options?: Options) => (options?.client ?? client).get({ url: '/file/status', ...options }); +export const fileStatus = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/file/status', ...options }); /** * Write log * * Write a log entry to the server logs with specified level and metadata. */ -export const appLog = (options?: Options) => (options?.client ?? client).post({ +export const appLog = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/log', ...options, headers: { @@ -581,21 +581,21 @@ export const appLog = (options?: Options(options?: Options) => (options?.client ?? client).get({ url: '/agent', ...options }); +export const appAgents = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/agent', ...options }); /** * Get MCP status * * Get the status of all Model Context Protocol (MCP) servers. */ -export const mcpStatus = (options?: Options) => (options?.client ?? client).get({ url: '/mcp', ...options }); +export const mcpStatus = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/mcp', ...options }); /** * Add MCP server * * Dynamically add a new Model Context Protocol (MCP) server to the system. */ -export const mcpAdd = (options?: Options) => (options?.client ?? client).post({ +export const mcpAdd = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/mcp', ...options, headers: { @@ -609,21 +609,21 @@ export const mcpAdd = (options?: Options(options: Options) => (options.client ?? client).delete({ url: '/mcp/{name}/auth', ...options }); +export const mcpAuthRemove = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/mcp/{name}/auth', ...options }); /** * Start MCP OAuth * * Start OAuth authentication flow for a Model Context Protocol (MCP) server. */ -export const mcpAuthStart = (options: Options) => (options.client ?? client).post({ url: '/mcp/{name}/auth', ...options }); +export const mcpAuthStart = (options: Options): RequestResult => (options.client ?? client).post({ url: '/mcp/{name}/auth', ...options }); /** * Complete MCP OAuth * * Complete OAuth authentication for a Model Context Protocol (MCP) server using the authorization code. */ -export const mcpAuthCallback = (options: Options) => (options.client ?? client).post({ +export const mcpAuthCallback = (options: Options): RequestResult => (options.client ?? client).post({ url: '/mcp/{name}/auth/callback', ...options, headers: { @@ -637,38 +637,38 @@ export const mcpAuthCallback = (options: O * * Start OAuth flow and wait for callback (opens browser) */ -export const mcpAuthAuthenticate = (options: Options) => (options.client ?? client).post({ url: '/mcp/{name}/auth/authenticate', ...options }); +export const mcpAuthAuthenticate = (options: Options): RequestResult => (options.client ?? client).post({ url: '/mcp/{name}/auth/authenticate', ...options }); /** * Connect an MCP server */ -export const mcpConnect = (options: Options) => (options.client ?? client).post({ url: '/mcp/{name}/connect', ...options }); +export const mcpConnect = (options: Options): RequestResult => (options.client ?? client).post({ url: '/mcp/{name}/connect', ...options }); /** * Disconnect an MCP server */ -export const mcpDisconnect = (options: Options) => (options.client ?? client).post({ url: '/mcp/{name}/disconnect', ...options }); +export const mcpDisconnect = (options: Options): RequestResult => (options.client ?? client).post({ url: '/mcp/{name}/disconnect', ...options }); /** * Get LSP status * * Get LSP server status */ -export const lspStatus = (options?: Options) => (options?.client ?? client).get({ url: '/lsp', ...options }); +export const lspStatus = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/lsp', ...options }); /** * Get formatter status * * Get formatter status */ -export const formatterStatus = (options?: Options) => (options?.client ?? client).get({ url: '/formatter', ...options }); +export const formatterStatus = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/formatter', ...options }); /** * Append TUI prompt * * Append prompt to the TUI */ -export const tuiAppendPrompt = (options?: Options) => (options?.client ?? client).post({ +export const tuiAppendPrompt = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/append-prompt', ...options, headers: { @@ -682,49 +682,49 @@ export const tuiAppendPrompt = (options?: * * Open the help dialog in the TUI to display user assistance information. */ -export const tuiOpenHelp = (options?: Options) => (options?.client ?? client).post({ url: '/tui/open-help', ...options }); +export const tuiOpenHelp = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/open-help', ...options }); /** * Open sessions dialog * * Open the session dialog */ -export const tuiOpenSessions = (options?: Options) => (options?.client ?? client).post({ url: '/tui/open-sessions', ...options }); +export const tuiOpenSessions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/open-sessions', ...options }); /** * Open themes dialog * * Open the theme dialog */ -export const tuiOpenThemes = (options?: Options) => (options?.client ?? client).post({ url: '/tui/open-themes', ...options }); +export const tuiOpenThemes = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/open-themes', ...options }); /** * Open models dialog * * Open the model dialog */ -export const tuiOpenModels = (options?: Options) => (options?.client ?? client).post({ url: '/tui/open-models', ...options }); +export const tuiOpenModels = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/open-models', ...options }); /** * Submit TUI prompt * * Submit the prompt */ -export const tuiSubmitPrompt = (options?: Options) => (options?.client ?? client).post({ url: '/tui/submit-prompt', ...options }); +export const tuiSubmitPrompt = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/submit-prompt', ...options }); /** * Clear TUI prompt * * Clear the prompt */ -export const tuiClearPrompt = (options?: Options) => (options?.client ?? client).post({ url: '/tui/clear-prompt', ...options }); +export const tuiClearPrompt = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/clear-prompt', ...options }); /** * Execute TUI command * * Execute a TUI command (e.g. agent_cycle) */ -export const tuiExecuteCommand = (options?: Options) => (options?.client ?? client).post({ +export const tuiExecuteCommand = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/execute-command', ...options, headers: { @@ -738,7 +738,7 @@ export const tuiExecuteCommand = (options? * * Show a toast notification in the TUI */ -export const tuiShowToast = (options?: Options) => (options?.client ?? client).post({ +export const tuiShowToast = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/show-toast', ...options, headers: { @@ -752,7 +752,7 @@ export const tuiShowToast = (options?: Opt * * Publish a TUI event */ -export const tuiPublish = (options?: Options) => (options?.client ?? client).post({ +export const tuiPublish = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/publish', ...options, headers: { @@ -766,14 +766,14 @@ export const tuiPublish = (options?: Optio * * Retrieve the next TUI (Terminal User Interface) request from the queue for processing. */ -export const tuiControlNext = (options?: Options) => (options?.client ?? client).get({ url: '/tui/control/next', ...options }); +export const tuiControlNext = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/tui/control/next', ...options }); /** * Submit TUI response * * Submit a response to the TUI request queue to complete a pending request. */ -export const tuiControlResponse = (options?: Options) => (options?.client ?? client).post({ +export const tuiControlResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/tui/control/response', ...options, headers: { @@ -787,7 +787,7 @@ export const tuiControlResponse = (options * * Set authentication credentials */ -export const authSet = (options: Options) => (options.client ?? client).put({ +export const authSet = (options: Options): RequestResult => (options.client ?? client).put({ url: '/auth/{providerID}', ...options, headers: { @@ -801,4 +801,4 @@ export const authSet = (options: Options(options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); +export const eventSubscribe = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/index.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/index.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/params.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/params.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/sdk.gen.ts index 1b25cb8c30..37e8f46ff4 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { FooBarPostData, FooBarPostResponses, FooBarPutData, FooBarPutResponses, FooPostData, FooPostResponses, FooPutData, FooPutResponses, GetFooBarData, GetFooBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -19,21 +19,21 @@ export type Options(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo/bar', ...options }); } } export class FooService { - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo', ...options }); } @@ -41,7 +41,7 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { + public static getFoo(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/foo', ...options }); } @@ -49,11 +49,11 @@ export class FooBazService { } export class BarService2 { - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo/bar', ...options }); } } @@ -63,7 +63,7 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { + public static getFooBar(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/foo/bar', ...options }); } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/index.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/index.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/params.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/params.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/sdk.gen.ts index 4815f79d16..ae4480802d 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen'; @@ -18,31 +18,31 @@ export type Options; }; -export const serviceWithEmptyTag = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const serviceWithEmptyTag = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -51,63 +51,63 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterModel: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArrayCSV: { array: { explode: false } }, parameterArraySSV: { array: { explode: false } }, @@ -118,33 +118,33 @@ export const collectionFormat = (options: ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArray: { array: { explode: false } }, parameterDictionary: { object: { explode: false, style: 'form' } } } }, responseType: 'json', url: '/api/v{api-version}/types', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { explode: false, style: 'form' } }, parameterReference: { object: { explode: false, style: 'form' } } } }, responseType: 'json', url: '/api/v{api-version}/complex', ...options }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options @@ -155,7 +155,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionBody = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/body', ...options, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/index.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/index.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/params.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/params.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/sdk.gen.ts index 0f0e66cba9..0fd3ade30b 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen'; @@ -18,31 +18,31 @@ export type Options; }; -export const serviceWithEmptyTag = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const serviceWithEmptyTag = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -51,39 +51,39 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterModel: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArrayCSV: { array: { explode: false } }, parameterArraySSV: { array: { explode: false } }, @@ -94,30 +94,30 @@ export const collectionFormat = (options: ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArray: { array: { explode: false } }, parameterDictionary: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/types', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { explode: false, style: 'form' } }, parameterReference: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Body should not be unknown * * Body should not be unknown */ -export const postApiVbyApiVersionBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/@tanstack/react-query.gen.ts index 592095237d..beb90989d4 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/@tanstack/react-query.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/@tanstack/react-query.gen.ts @@ -63,37 +63,6 @@ export const useServiceWithEmptyTagSetQueryData = () => { return (options: Options | undefined, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(serviceWithEmptyTagOptions(options).queryKey, updater); }; -export type MutationKey> = [ - Pick & { - _id: string; - tags?: ReadonlyArray; - } -]; - -const createMutationKey = >(id: string, options?: TOptions, tags?: ReadonlyArray): [ - MutationKey[0] -] => { - const params: MutationKey[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl }; - if (tags) { - params.tags = tags; - } - if (options?.body) { - params.body = options.body; - } - if (options?.headers) { - params.headers = options.headers; - } - if (options?.path) { - params.path = options.path; - } - if (options?.query) { - params.query = options.query; - } - return [params]; -}; - -export const patchApiVbyApiVersionNoTagMutationKey = (options?: Partial>) => createMutationKey('patchApiVbyApiVersionNoTag', options); - export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -103,16 +72,13 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...patchApiVbyApiVersionNoTagMutation(), ...mutationOptions }); -export const fooWowMutationKey = (options?: Partial>) => createMutationKey('fooWow', options); - export const fooWowMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -122,16 +88,13 @@ export const fooWowMutation = (options?: Partial>): UseMutat throwOnError: true }); return data; - }, - mutationKey: fooWowMutationKey(options) + } }; return mutationOptions; }; export const useFooWowMutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...fooWowMutation(), ...mutationOptions }); -export const deleteCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('deleteCallWithoutParametersAndResponse', options); - export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -141,8 +104,7 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial throwOnError: true }); return data; - }, - mutationKey: deleteCallWithoutParametersAndResponseMutationKey(options) + } }; return mutationOptions; }; @@ -173,8 +135,6 @@ export const useGetCallWithoutParametersAndResponseSetQueryData = () => { return (options: Options | undefined, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(getCallWithoutParametersAndResponseOptions(options).queryKey, updater); }; -export const patchCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('patchCallWithoutParametersAndResponse', options); - export const patchCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -184,16 +144,13 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial< throwOnError: true }); return data; - }, - mutationKey: patchCallWithoutParametersAndResponseMutationKey(options) + } }; return mutationOptions; }; export const usePatchCallWithoutParametersAndResponseMutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...patchCallWithoutParametersAndResponseMutation(), ...mutationOptions }); -export const postCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('postCallWithoutParametersAndResponse', options); - export const postCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -203,16 +160,13 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...postCallWithoutParametersAndResponseMutation(), ...mutationOptions }); -export const putCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('putCallWithoutParametersAndResponse', options); - export const putCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -222,16 +176,13 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...putCallWithoutParametersAndResponseMutation(), ...mutationOptions }); -export const callWithDescriptionsMutationKey = (options?: Partial>) => createMutationKey('callWithDescriptions', options); - export const callWithDescriptionsMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -241,16 +192,13 @@ export const callWithDescriptionsMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithDescriptionsMutation(), ...mutationOptions }); -export const callWithParametersMutationKey = (options?: Partial>) => createMutationKey('callWithParameters', options); - export const callWithParametersMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -260,16 +208,13 @@ export const callWithParametersMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithParametersMutation(), ...mutationOptions }); -export const callWithWeirdParameterNamesMutationKey = (options?: Partial>) => createMutationKey('callWithWeirdParameterNames', options); - export const callWithWeirdParameterNamesMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -279,8 +224,7 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial { return (options: Options, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(callWithDefaultParametersOptions(options).queryKey, updater); }; -export const callWithDefaultOptionalParametersMutationKey = (options?: Partial>) => createMutationKey('callWithDefaultOptionalParameters', options); - export const callWithDefaultOptionalParametersMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -322,16 +264,13 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithDefaultOptionalParametersMutation(), ...mutationOptions }); -export const callToTestOrderOfParamsMutationKey = (options?: Partial>) => createMutationKey('callToTestOrderOfParams', options); - export const callToTestOrderOfParamsMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -341,16 +280,13 @@ export const callToTestOrderOfParamsMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callToTestOrderOfParamsMutation(), ...mutationOptions }); -export const duplicateNameMutationKey = (options?: Partial>) => createMutationKey('duplicateName', options); - export const duplicateNameMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -360,8 +296,7 @@ export const duplicateNameMutation = (options?: Partial { return (options: Options | undefined, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(duplicateName2Options(options).queryKey, updater); }; -export const duplicateName3MutationKey = (options?: Partial>) => createMutationKey('duplicateName3', options); - export const duplicateName3Mutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -403,16 +336,13 @@ export const duplicateName3Mutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...duplicateName3Mutation(), ...mutationOptions }); -export const duplicateName4MutationKey = (options?: Partial>) => createMutationKey('duplicateName4', options); - export const duplicateName4Mutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -422,8 +352,7 @@ export const duplicateName4Mutation = (options?: Partial { return (options: Options | undefined, updater: CallWithResponseResponse | undefined | ((old: CallWithResponseResponse | undefined) => CallWithResponseResponse | undefined)) => queryClient.setQueryData(callWithResponseOptions(options).queryKey, updater); }; -export const callWithDuplicateResponsesMutationKey = (options?: Partial>) => createMutationKey('callWithDuplicateResponses', options); - export const callWithDuplicateResponsesMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -561,16 +488,13 @@ export const callWithDuplicateResponsesMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithDuplicateResponsesMutation(), ...mutationOptions }); -export const callWithResponsesMutationKey = (options?: Partial>) => createMutationKey('callWithResponses', options); - export const callWithResponsesMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -580,8 +504,7 @@ export const callWithResponsesMutation = (options?: Partial { return (options: Options, updater: ComplexTypesResponse | undefined | ((old: ComplexTypesResponse | undefined) => ComplexTypesResponse | undefined)) => queryClient.setQueryData(complexTypesOptions(options).queryKey, updater); }; -export const callWithResultFromHeaderMutationKey = (options?: Partial>) => createMutationKey('callWithResultFromHeader', options); - export const callWithResultFromHeaderMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -671,16 +592,13 @@ export const callWithResultFromHeaderMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithResultFromHeaderMutation(), ...mutationOptions }); -export const testErrorCodeMutationKey = (options?: Partial>) => createMutationKey('testErrorCode', options); - export const testErrorCodeMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -690,16 +608,13 @@ export const testErrorCodeMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...testErrorCodeMutation(), ...mutationOptions }); -export const nonAsciiæøåÆøÅöôêÊ字符串MutationKey = (options?: Partial>) => createMutationKey('nonAsciiæøåÆøÅöôêÊ字符串', options); - export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -709,16 +624,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< throwOnError: true }); return data; - }, - mutationKey: nonAsciiæøåÆøÅöôêÊ字符串MutationKey(options) + } }; return mutationOptions; }; export const useNonAsciiæøåÆøÅöôêÊ字符串Mutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...nonAsciiæøåÆøÅöôêÊ字符串Mutation(), ...mutationOptions }); -export const postApiVbyApiVersionBodyMutationKey = (options?: Partial>) => createMutationKey('postApiVbyApiVersionBody', options); - /** * Body should not be unknown * @@ -733,8 +645,7 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/index.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/index.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/params.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/params.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/sdk.gen.ts index 0f0e66cba9..0fd3ade30b 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen'; @@ -18,31 +18,31 @@ export type Options; }; -export const serviceWithEmptyTag = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const serviceWithEmptyTag = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions/', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -51,39 +51,39 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterModel: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArrayCSV: { array: { explode: false } }, parameterArraySSV: { array: { explode: false } }, @@ -94,30 +94,30 @@ export const collectionFormat = (options: ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterArray: { array: { explode: false } }, parameterDictionary: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/types', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { explode: false, style: 'form' } }, parameterReference: { object: { explode: false, style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Body should not be unknown * * Body should not be unknown */ -export const postApiVbyApiVersionBody = (options: Options) => (options.client ?? client).post({ +export const postApiVbyApiVersionBody = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/index.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/index.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/params.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/params.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/sdk.gen.ts index bcdd010abd..aac5fcfa4f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { FooBarPostData, FooBarPostResponses, FooBarPutData, FooBarPutResponses, FooPostData, FooPostResponses, FooPutData, FooPutResponses, GetFooBarData, GetFooBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -18,14 +18,14 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const getFoo = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/foo', ...options }); -export const fooPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo', ...options }); +export const fooPost = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/foo', ...options }); -export const fooPut = (options?: Options) => (options?.client ?? client).put({ url: '/foo', ...options }); +export const fooPut = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/foo', ...options }); -export const getFooBar = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); +export const getFooBar = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/foo/bar', ...options }); -export const fooBarPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo/bar', ...options }); +export const fooBarPost = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/foo/bar', ...options }); -export const fooBarPut = (options?: Options) => (options?.client ?? client).put({ url: '/foo/bar', ...options }); +export const fooBarPut = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/foo/bar', ...options }); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/index.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/index.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/params.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/params.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/sdk.gen.ts index 1e3e42f693..023fccf7eb 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { Create2Data, Create2Responses, Create3Data, Create3Responses, CreateData, CreateResponses } from './types.gen'; @@ -18,8 +18,8 @@ export type Options; }; -export const create = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const create = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/foo', ...options }); -export const create2 = (options?: Options) => (options?.client ?? client).patch({ url: '/foo', ...options }); +export const create2 = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/foo', ...options }); -export const create3 = (options?: Options) => (options?.client ?? client).post({ url: '/foo', ...options }); +export const create3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/foo', ...options }); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client.gen.ts index cab3c70195..47828b746c 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig()); +export const client: Client = createClient(createConfig()); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/index.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/index.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/params.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/params.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/sdk.gen.ts index 1b25cb8c30..37e8f46ff4 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Client, Options as Options2, TDataShape } from './client'; +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; import { client } from './client.gen'; import type { FooBarPostData, FooBarPostResponses, FooBarPutData, FooBarPutResponses, FooPostData, FooPostResponses, FooPutData, FooPutResponses, GetFooBarData, GetFooBarResponses, GetFooData, GetFooResponses } from './types.gen'; @@ -19,21 +19,21 @@ export type Options(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo/bar', ...options }); } } export class FooService { - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo', ...options }); } @@ -41,7 +41,7 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { + public static getFoo(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/foo', ...options }); } @@ -49,11 +49,11 @@ export class FooBazService { } export class BarService2 { - public static post(options?: Options) { + public static post(options?: Options): RequestResult { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } - public static put(options?: Options) { + public static put(options?: Options): RequestResult { return (options?.client ?? client).put({ url: '/foo/bar', ...options }); } } @@ -63,7 +63,7 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { + public static getFooBar(options?: Options): RequestResult { return (options?.client ?? client).get({ url: '/foo/bar', ...options }); } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client.gen.ts index a5d2248990..e772e81abe 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseURL: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/client.gen.ts index d42045a3c2..4412209baf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/client.gen.ts @@ -50,7 +50,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/index.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/index.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/utils.gen.ts index 837b8690af..5816078989 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/utils.gen.ts @@ -13,8 +13,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -83,12 +83,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Record; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -122,7 +124,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/params.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/params.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/sdk.gen.ts index 20ec7d2cb0..20dc3d8799 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/no+tag', ...options, @@ -32,44 +32,44 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -87,7 +87,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/parameters', ...options, @@ -106,7 +106,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -115,7 +115,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -125,59 +125,59 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ +export const types = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'json', url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, responseType: 'json', url: '/api/v{api-version}/upload', @@ -188,22 +188,22 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ responseType: 'blob', url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, responseType: 'json', url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -213,7 +213,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ responseType: 'json', url: '/api/v{api-version}/complex/{id}', ...options, @@ -223,11 +223,11 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options @@ -236,7 +236,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client.gen.ts index 25cd14eafb..0ad02cc00f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from './client'; +import { type Client, type ClientOptions, type Config, createClient, createConfig } from './client'; import type { ClientOptions as ClientOptions2 } from './types.gen'; /** @@ -13,4 +13,4 @@ import type { ClientOptions as ClientOptions2 } from './types.gen'; */ export type CreateClientConfig = (override?: Config) => Config & T>; -export const client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); +export const client: Client = createClient(createConfig({ baseUrl: 'http://localhost:3000/base' })); diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/client.gen.ts index fc3f037f16..377b6c9e09 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/client.gen.ts @@ -48,7 +48,10 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams(opts); + await setAuthParams({ + ...opts, + security: opts.security, + }); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/index.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/index.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/utils.gen.ts index 7800fe4b9d..25a1f0db52 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/utils.gen.ts @@ -14,8 +14,8 @@ import type { Client, ClientOptions, Config, RequestOptions } from './types.gen' export const createQuerySerializer = ({ parameters = {}, ...args -}: QuerySerializerOptions = {}) => { - const querySerializer = (queryParams: T) => { +}: QuerySerializerOptions = {}): ((queryParams: T) => string) => { + const querySerializer = (queryParams: T): string => { const search: string[] = []; if (queryParams && typeof queryParams === 'object') { for (const name in queryParams) { @@ -118,12 +118,14 @@ const checkForExistence = ( return false; }; -export async function setAuthParams( - options: Pick & { +export const setAuthParams = async ({ + security, + ...options +}: Pick, 'security'> & + Pick & { headers: Headers; - }, -): Promise { - for (const auth of options.security ?? []) { + }): Promise => { + for (const auth of security) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +154,7 @@ export async function setAuthParams( break; } } -} +}; export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/params.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/params.gen.ts index 7955601a5c..8ca6555758 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/params.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/params.gen.ts @@ -102,7 +102,7 @@ const stripEmptySlots = (params: Params) => { } }; -export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig) => { +export const buildClientParams = (args: ReadonlyArray, fields: FieldsConfig): Params => { const params: Params = { body: {}, headers: {}, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts index 994b2848c6..fab1ed4b98 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => { } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle) => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { switch (style) { case 'label': return '.'; @@ -72,7 +72,7 @@ export const serializeArrayParam = ({ value, }: SerializeOptions & { value: unknown[]; -}) => { +}): string => { if (!explode) { const joinedValues = ( allowReserved ? value : value.map((v) => encodeURIComponent(v as string)) @@ -110,7 +110,7 @@ export const serializePrimitiveParam = ({ allowReserved, name, value, -}: SerializePrimitiveParam) => { +}: SerializePrimitiveParam): string => { if (value === undefined || value === null) { return ''; } @@ -134,7 +134,7 @@ export const serializeObjectParam = ({ }: SerializeOptions & { value: Record | Date; valueOnly?: boolean; -}) => { +}): string => { if (value instanceof Date) { return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts index 5000df606f..773b0650b1 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown) => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/utils.gen.ts index 9a4fec7830..af56e0711e 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/utils.gen.ts @@ -13,9 +13,9 @@ export interface PathSerializer { url: string; } -export const PATH_PARAM_RE = /\{[^{}]+\}/g; +export const PATH_PARAM_RE: RegExp = /\{[^{}]+\}/g; -export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => { +export const defaultPathSerializer = ({ path, url: _url }: PathSerializer): string => { let url = _url; const matches = _url.match(PATH_PARAM_RE); if (matches) { @@ -94,7 +94,7 @@ export const getUrl = ({ query?: Record; querySerializer: QuerySerializer; url: string; -}) => { +}): string => { const pathUrl = _url.startsWith('/') ? _url : `/${_url}`; let url = (baseUrl ?? '') + pathUrl; if (path) { @@ -114,7 +114,7 @@ export function getValidRequestBody(options: { body?: unknown; bodySerializer?: BodySerializer | null; serializedBody?: unknown; -}) { +}): unknown { const hasBody = options.body !== undefined; const isSerializedBody = hasBody && options.bodySerializer; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/sdk.gen.ts index fbc4ca77fb..5d72f21f4b 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen'; @@ -18,11 +18,11 @@ export type Options; }; -export const export_ = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +export const export_ = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const import_ = (options: Options) => (options.client ?? client).post({ +export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -31,36 +31,36 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const fooWow = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -export const callWithDescriptions = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +export const callWithDescriptions = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); /** * @deprecated */ -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); +export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); -export const callWithParameters = (options: Options) => (options.client ?? client).post({ +export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -69,7 +69,7 @@ export const callWithParameters = (options } }); -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -78,7 +78,7 @@ export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).get({ +export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -87,7 +87,7 @@ export const getCallWithOptionalParam = (o } }); -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters', ...options, headers: { @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionRequestBody = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const postApiVbyApiVersionFormData = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -115,39 +115,39 @@ export const postApiVbyApiVersionFormData = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultParameters = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -export const callWithDefaultOptionalParameters = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options?: Options): RequestResult => (options?.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options?: Options): RequestResult => (options?.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -export const uploadFile = (options: Options) => (options.client ?? client).post({ +export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -157,17 +157,17 @@ export const uploadFile = (options: Option } }); -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); +export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); -export const complexTypes = (options: Options) => (options.client ?? client).get({ +export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -export const multipartResponse = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); +export const multipartResponse = (options?: Options): RequestResult => (options?.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); -export const multipartRequest = (options?: Options) => (options?.client ?? client).post({ +export const multipartRequest = (options?: Options): RequestResult => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -177,7 +177,7 @@ export const multipartRequest = (options?: } }); -export const complexParams = (options: Options) => (options.client ?? client).put({ +export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -186,16 +186,16 @@ export const complexParams = (options: Opt } }); -export const callWithResultFromHeader = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +export const callWithResultFromHeader = (options?: Options): RequestResult => (options?.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); /** * Login User */ -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/@tanstack/react-query.gen.ts index 58e2cb35bc..a20d9df7d0 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/@tanstack/react-query.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/@tanstack/react-query.gen.ts @@ -63,37 +63,6 @@ export const useExportSetQueryData = () => { return (options: Options | undefined, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(exportOptions(options).queryKey, updater); }; -export type MutationKey> = [ - Pick & { - _id: string; - tags?: ReadonlyArray; - } -]; - -const createMutationKey = >(id: string, options?: TOptions, tags?: ReadonlyArray): [ - MutationKey[0] -] => { - const params: MutationKey[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl }; - if (tags) { - params.tags = tags; - } - if (options?.body) { - params.body = options.body; - } - if (options?.headers) { - params.headers = options.headers; - } - if (options?.path) { - params.path = options.path; - } - if (options?.query) { - params.query = options.query; - } - return [params]; -}; - -export const patchApiVbyApiVersionNoTagMutationKey = (options?: Partial>) => createMutationKey('patchApiVbyApiVersionNoTag', options); - export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -103,16 +72,13 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...patchApiVbyApiVersionNoTagMutation(), ...mutationOptions }); -export const importMutationKey = (options?: Partial>) => createMutationKey('import', options); - export const importMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -122,16 +88,13 @@ export const importMutation = (options?: Partial>): UseMutat throwOnError: true }); return data; - }, - mutationKey: importMutationKey(options) + } }; return mutationOptions; }; export const useImportMutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...importMutation(), ...mutationOptions }); -export const fooWowMutationKey = (options?: Partial>) => createMutationKey('fooWow', options); - export const fooWowMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -141,8 +104,7 @@ export const fooWowMutation = (options?: Partial>): UseMutat throwOnError: true }); return data; - }, - mutationKey: fooWowMutationKey(options) + } }; return mutationOptions; }; @@ -197,8 +159,6 @@ export const useGetApiVbyApiVersionSimpleOperationSetQueryData = () => { return (options: Options, updater: GetApiVbyApiVersionSimpleOperationResponse | undefined | ((old: GetApiVbyApiVersionSimpleOperationResponse | undefined) => GetApiVbyApiVersionSimpleOperationResponse | undefined)) => queryClient.setQueryData(getApiVbyApiVersionSimpleOperationOptions(options).queryKey, updater); }; -export const deleteCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('deleteCallWithoutParametersAndResponse', options); - export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -208,8 +168,7 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial throwOnError: true }); return data; - }, - mutationKey: deleteCallWithoutParametersAndResponseMutationKey(options) + } }; return mutationOptions; }; @@ -240,8 +199,6 @@ export const useGetCallWithoutParametersAndResponseSetQueryData = () => { return (options: Options | undefined, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(getCallWithoutParametersAndResponseOptions(options).queryKey, updater); }; -export const patchCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('patchCallWithoutParametersAndResponse', options); - export const patchCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -251,16 +208,13 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial< throwOnError: true }); return data; - }, - mutationKey: patchCallWithoutParametersAndResponseMutationKey(options) + } }; return mutationOptions; }; export const usePatchCallWithoutParametersAndResponseMutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...patchCallWithoutParametersAndResponseMutation(), ...mutationOptions }); -export const postCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('postCallWithoutParametersAndResponse', options); - export const postCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -270,16 +224,13 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...postCallWithoutParametersAndResponseMutation(), ...mutationOptions }); -export const putCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('putCallWithoutParametersAndResponse', options); - export const putCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -289,16 +240,13 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...putCallWithoutParametersAndResponseMutation(), ...mutationOptions }); -export const deleteFooMutationKey = (options?: Partial>) => createMutationKey('deleteFoo', options); - export const deleteFooMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -308,16 +256,13 @@ export const deleteFooMutation = (options?: Partial>): U throwOnError: true }); return data; - }, - mutationKey: deleteFooMutationKey(options) + } }; return mutationOptions; }; export const useDeleteFooMutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...deleteFooMutation(), ...mutationOptions }); -export const callWithDescriptionsMutationKey = (options?: Partial>) => createMutationKey('callWithDescriptions', options); - export const callWithDescriptionsMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -327,16 +272,13 @@ export const callWithDescriptionsMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithDescriptionsMutation(), ...mutationOptions }); -export const deprecatedCallMutationKey = (options?: Partial>) => createMutationKey('deprecatedCall', options); - /** * @deprecated */ @@ -349,8 +291,7 @@ export const deprecatedCallMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...deprecatedCallMutation(), ...mutationOptions }); -export const callWithParametersMutationKey = (options?: Partial>) => createMutationKey('callWithParameters', options); - export const callWithParametersMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -371,16 +310,13 @@ export const callWithParametersMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithParametersMutation(), ...mutationOptions }); -export const callWithWeirdParameterNamesMutationKey = (options?: Partial>) => createMutationKey('callWithWeirdParameterNames', options); - export const callWithWeirdParameterNamesMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -390,8 +326,7 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial { return (options: Options, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(getCallWithOptionalParamOptions(options).queryKey, updater); }; -export const postCallWithOptionalParamMutationKey = (options?: Partial>) => createMutationKey('postCallWithOptionalParam', options); - export const postCallWithOptionalParamMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -486,16 +419,13 @@ export const postCallWithOptionalParamMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...postCallWithOptionalParamMutation(), ...mutationOptions }); -export const postApiVbyApiVersionRequestBodyMutationKey = (options?: Partial>) => createMutationKey('postApiVbyApiVersionRequestBody', options); - export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -505,16 +435,13 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); +======= +export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); +>>>>>>> 4a5f34551 (updated test snapshots) diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/name-builder/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/name-builder/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/name-builder/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/name-builder/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/internal-name-conflict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/internal-name-conflict/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/internal-name-conflict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/internal-name-conflict/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/internal-name-conflict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/internal-name-conflict/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/internal-name-conflict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/internal-name-conflict/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/angular-query-experimental/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/angular-query-experimental/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/angular-query-experimental/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/angular-query-experimental/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/angular-query-experimental/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/angular-query-experimental/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/angular-query-experimental/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/angular-query-experimental/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/preact-query/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/preact-query/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/preact-query/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/preact-query/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/preact-query/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/preact-query/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/preact-query/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/preact-query/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/react-query/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/react-query/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/react-query/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/react-query/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/react-query/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/react-query/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/react-query/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/react-query/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/solid-query/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/solid-query/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/solid-query/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/solid-query/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/solid-query/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/solid-query/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/solid-query/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/solid-query/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/svelte-query/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/svelte-query/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/svelte-query/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/svelte-query/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/svelte-query/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/svelte-query/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/svelte-query/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/svelte-query/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/vue-query/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/vue-query/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/vue-query/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/vue-query/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/vue-query/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/vue-query/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/vue-query/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/meta-function/vue-query/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/pagination-ref/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/pagination-ref/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/pagination-ref/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/pagination-ref/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/pagination-ref/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/pagination-ref/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/pagination-ref/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/pagination-ref/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/asClass/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/asClass/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/asClass/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/asClass/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/axios/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/axios/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/axios/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/axios/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/fetch/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/fetch/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/fetch/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/fetch/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/full-config/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/full-config/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/full-config/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/full-config/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/full-config/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/full-config/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/full-config/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/full-config/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/name-builder/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/name-builder/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/name-builder/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/name-builder/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/name-builder/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/name-builder/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/name-builder/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/plugins/name-builder/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts index 1276563434..78ba4ebdac 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts @@ -1,6 +1,10 @@ // This file is auto-generated by @hey-api/openapi-ts +<<<<<<< HEAD import type { Client, Options as Options2, RequestResult, ServerSentEventsResult, TDataShape } from './client'; +======= +import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; +>>>>>>> 4a5f34551 (updated test snapshots) import { client } from './client.gen'; import type { ListEventsData, ListEventsResponses, SubscribeToEventStreamData, SubscribeToEventStreamResponse, SubscribeToEventStreamResponses } from './types.gen'; @@ -21,7 +25,11 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.post({ url: '/events/subscribe', ...options }); +======= +export const subscribeToEventStream = (options?: Options): RequestResult => (options?.client ?? client).sse.post({ url: '/events/subscribe', ...options }); +>>>>>>> 4a5f34551 (updated test snapshots) /** * List events diff --git a/packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/type-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/type-format/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/type-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/type-format/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/type-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/type-format/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/type-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/valibot/v1/__snapshots__/3.1.x/type-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/type-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/type-format/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/type-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/type-format/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/type-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/type-format/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/type-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/type-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v3/type-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v3/type-format/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v3/type-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v3/type-format/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v3/type-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v3/type-format/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v3/type-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v3/type-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/type-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/type-format/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/type-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/type-format/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/type-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/type-format/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/type-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/type-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/type-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/type-format/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/type-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/type-format/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/type-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/type-format/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/type-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/type-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/type-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/type-format/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/type-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/type-format/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/type-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/type-format/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/type-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/type-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/type-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/type-format/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/type-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/type-format/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/type-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/type-format/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/type-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/type-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/type-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/type-format/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/type-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/type-format/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/type-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/type-format/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/type-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/type-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/type-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/type-format/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/type-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/type-format/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/type-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/type-format/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/type-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/type-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/type-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/type-format/core/pathSerializer.gen.ts index fab1ed4b98..6ad4becf93 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/type-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/type-format/core/pathSerializer.gen.ts @@ -25,7 +25,11 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } +<<<<<<< HEAD export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -38,7 +42,11 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; +<<<<<<< HEAD export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +======= +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -51,7 +59,11 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; +<<<<<<< HEAD export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +======= +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { +>>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/type-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/type-format/core/queryKeySerializer.gen.ts index 773b0650b1..fdbb10b65f 100644 --- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/type-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/type-format/core/queryKeySerializer.gen.ts @@ -14,7 +14,11 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ +<<<<<<< HEAD export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +======= +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { +>>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } From 7ddf61f32937961f9da753a8505043f459c289da Mon Sep 17 00:00:00 2001 From: Tomislav Puric Date: Thu, 14 May 2026 20:44:00 +1000 Subject: [PATCH 3/7] ignored nuxt client --- .../client-nuxt/clean-false/sdk.gen.ts | 4 +- .../@hey-api/client-nuxt/default/sdk.gen.ts | 136 +++++++++++++---- .../import-file-extension-ts/sdk.gen.ts | 137 ++++++++++++++---- .../sdk-client-optional/sdk.gen.ts | 136 +++++++++++++---- .../sdk-client-required/sdk.gen.ts | 137 ++++++++++++++---- .../tsconfig-node16-sdk/sdk.gen.ts | 137 ++++++++++++++---- .../tsconfig-nodenext-sdk/sdk.gen.ts | 137 ++++++++++++++---- .../3.1.x/sse-angular/sdk.gen.ts | 8 + .../__snapshots__/3.1.x/sse-axios/sdk.gen.ts | 8 + .../__snapshots__/3.1.x/sse-fetch/sdk.gen.ts | 8 + .../__snapshots__/3.1.x/sse-next/sdk.gen.ts | 8 + .../__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts | 10 +- .../__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts | 8 + .../opencode/export-all/sdk.gen.ts | 12 +- .../__snapshots__/opencode/flat/sdk.gen.ts | 12 +- .../__snapshots__/opencode/grouped/sdk.gen.ts | 8 + .../3.1.x/sse-react-query/sdk.gen.ts | 4 + .../src/plugins/@hey-api/sdk/v1/node.ts | 46 +++--- 18 files changed, 761 insertions(+), 195 deletions(-) diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts index 56d28ceb92..d40701d3a6 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts @@ -1,8 +1,8 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, type RequestResult, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen'; +import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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 type Options = Options2 & { /** diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts index ddda5042a3..43d296990e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts @@ -1,8 +1,8 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen'; +import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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 type Options = Options2 & { /** @@ -18,6 +18,7 @@ export type Options; }; +<<<<<<< HEAD <<<<<<< HEAD export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); @@ -26,11 +27,18 @@ export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +<<<<<<< HEAD export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const import_ = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -39,6 +47,7 @@ export const import_ = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); @@ -65,34 +74,42 @@ export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ======= export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const fooWow = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +<<<<<<< HEAD export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ <<<<<<< HEAD +<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ @@ -101,6 +118,11 @@ export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); + +export const callWithParameters = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -109,11 +131,15 @@ export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -122,11 +148,15 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).get({ ======= export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -135,11 +165,15 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -148,11 +182,15 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -161,11 +199,15 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -175,6 +217,7 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); @@ -211,39 +254,46 @@ export const types = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +======= +export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +<<<<<<< HEAD export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const uploadFile = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -253,6 +303,7 @@ export const uploadFile = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); @@ -262,11 +313,17 @@ export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); + +export const complexTypes = (options: Options) => (options.client ?? client).get({ +>>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); +<<<<<<< HEAD <<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); @@ -276,6 +333,11 @@ export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); + +export const multipartRequest = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -285,11 +347,15 @@ export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).put({ ======= export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const complexParams = (options: Options) => (options.client ?? client).put({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -298,6 +364,7 @@ export const complexParams = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); @@ -306,20 +373,31 @@ export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ======= export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +======= +export const callWithResultFromHeader = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +<<<<<<< HEAD export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ <<<<<<< HEAD +<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ======= export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts index 70d4bedebc..f60b3e77db 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts @@ -1,12 +1,17 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.ts'; +<<<<<<< HEAD import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; <<<<<<< HEAD import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.ts'; ======= import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen.ts'; >>>>>>> 4a5f34551 (updated test snapshots) +======= +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; +import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.ts'; +>>>>>>> d54cb4956 (ignored nuxt client) export type Options = Options2 & { /** @@ -22,6 +27,7 @@ export type Options; }; +<<<<<<< HEAD <<<<<<< HEAD export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); @@ -30,11 +36,18 @@ export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +<<<<<<< HEAD export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const import_ = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -43,6 +56,7 @@ export const import_ = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); @@ -69,34 +83,42 @@ export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ======= export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const fooWow = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +<<<<<<< HEAD export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ <<<<<<< HEAD +<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ @@ -105,6 +127,11 @@ export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); + +export const callWithParameters = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -113,11 +140,15 @@ export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -126,11 +157,15 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).get({ ======= export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -139,11 +174,15 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -152,11 +191,15 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -165,11 +208,15 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -179,6 +226,7 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); @@ -215,39 +263,46 @@ export const types = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +======= +export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +<<<<<<< HEAD export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const uploadFile = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -257,6 +312,7 @@ export const uploadFile = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); @@ -266,11 +322,17 @@ export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); + +export const complexTypes = (options: Options) => (options.client ?? client).get({ +>>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); +<<<<<<< HEAD <<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); @@ -280,6 +342,11 @@ export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); + +export const multipartRequest = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -289,11 +356,15 @@ export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).put({ ======= export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const complexParams = (options: Options) => (options.client ?? client).put({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -302,6 +373,7 @@ export const complexParams = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); @@ -310,20 +382,31 @@ export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ======= export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +======= +export const callWithResultFromHeader = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +<<<<<<< HEAD export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ <<<<<<< HEAD +<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ======= export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts index ddda5042a3..43d296990e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts @@ -1,8 +1,8 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen'; +import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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 type Options = Options2 & { /** @@ -18,6 +18,7 @@ export type Options; }; +<<<<<<< HEAD <<<<<<< HEAD export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); @@ -26,11 +27,18 @@ export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +<<<<<<< HEAD export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const import_ = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -39,6 +47,7 @@ export const import_ = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); @@ -65,34 +74,42 @@ export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ======= export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const fooWow = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +<<<<<<< HEAD export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ <<<<<<< HEAD +<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ @@ -101,6 +118,11 @@ export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); + +export const callWithParameters = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -109,11 +131,15 @@ export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -122,11 +148,15 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).get({ ======= export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -135,11 +165,15 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -148,11 +182,15 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -161,11 +199,15 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -175,6 +217,7 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); @@ -211,39 +254,46 @@ export const types = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +======= +export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +<<<<<<< HEAD export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const uploadFile = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -253,6 +303,7 @@ export const uploadFile = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); @@ -262,11 +313,17 @@ export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); + +export const complexTypes = (options: Options) => (options.client ?? client).get({ +>>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); +<<<<<<< HEAD <<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); @@ -276,6 +333,11 @@ export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); + +export const multipartRequest = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -285,11 +347,15 @@ export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).put({ ======= export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const complexParams = (options: Options) => (options.client ?? client).put({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -298,6 +364,7 @@ export const complexParams = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); @@ -306,20 +373,31 @@ export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ======= export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +======= +export const callWithResultFromHeader = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +<<<<<<< HEAD export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ <<<<<<< HEAD +<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ======= export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts index e75afb20ce..6a6dd165b0 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts @@ -1,11 +1,16 @@ // This file is auto-generated by @hey-api/openapi-ts +<<<<<<< HEAD import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; <<<<<<< HEAD import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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'; ======= import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen'; >>>>>>> 4a5f34551 (updated test snapshots) +======= +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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'; +>>>>>>> d54cb4956 (ignored nuxt client) export type Options = Options2 & { /** @@ -21,6 +26,7 @@ export type Options; }; +<<<<<<< HEAD <<<<<<< HEAD export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); @@ -29,11 +35,18 @@ export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.post({ ======= export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); +<<<<<<< HEAD export const import_ = (options: Options): RequestResult => options.client.post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const import_ = (options: Options) => options.client.post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -42,6 +55,7 @@ export const import_ = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); @@ -68,34 +82,42 @@ export const deleteFoo = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); ======= export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const fooWow = (options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +<<<<<<< HEAD export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ <<<<<<< HEAD +<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => options.client.post({ @@ -104,6 +126,11 @@ export const deprecatedCall = (options: Options): RequestResult => options.client.post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); + +export const callWithParameters = (options: Options) => options.client.post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -112,11 +139,15 @@ export const callWithParameters = (options: Options): RequestResult => options.client.post({ ======= export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithWeirdParameterNames = (options: Options) => options.client.post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -125,11 +156,15 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.get({ ======= export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const getCallWithOptionalParam = (options: Options) => options.client.get({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -138,11 +173,15 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ ======= export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postCallWithOptionalParam = (options: Options) => options.client.post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -151,11 +190,15 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ ======= export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -164,11 +207,15 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ ======= export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionFormData = (options: Options) => options.client.post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -178,6 +225,7 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); @@ -214,39 +262,46 @@ export const types = (options: Options): RequestResult => options.client.post({ ======= export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +======= +export const callWithDefaultParameters = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options) => options.client.post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options) => options.client.put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options) => options.client.get({ url: '/api/v{api-version}/types', ...options }); +<<<<<<< HEAD export const uploadFile = (options: Options): RequestResult => options.client.post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const uploadFile = (options: Options) => options.client.post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -256,6 +311,7 @@ export const uploadFile = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); @@ -265,11 +321,17 @@ export const fileResponse = (options: Options): RequestResult => options.client.get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const fileResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); + +export const complexTypes = (options: Options) => options.client.get({ +>>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); +<<<<<<< HEAD <<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); @@ -279,6 +341,11 @@ export const multipartResponse = (options: Options): RequestResult => options.client.post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); + +export const multipartRequest = (options: Options) => options.client.post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -288,11 +355,15 @@ export const multipartRequest = (options: Options): RequestResult => options.client.put({ ======= export const complexParams = (options: Options): RequestResult => options.client.put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const complexParams = (options: Options) => options.client.put({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -301,6 +372,7 @@ export const complexParams = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); @@ -309,20 +381,31 @@ export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ======= export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); +======= +export const callWithResultFromHeader = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); +<<<<<<< HEAD export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ <<<<<<< HEAD +<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ======= export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const putWithFormUrlEncoded = (options: Options) => options.client.put({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts index e0559a1299..9b2337c15f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts @@ -1,12 +1,17 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; +<<<<<<< HEAD import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; <<<<<<< HEAD import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.js'; ======= import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen.js'; >>>>>>> 4a5f34551 (updated test snapshots) +======= +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.js'; +>>>>>>> d54cb4956 (ignored nuxt client) export type Options = Options2 & { /** @@ -22,6 +27,7 @@ export type Options; }; +<<<<<<< HEAD <<<<<<< HEAD export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); @@ -30,11 +36,18 @@ export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +<<<<<<< HEAD export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const import_ = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -43,6 +56,7 @@ export const import_ = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); @@ -69,34 +83,42 @@ export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ======= export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const fooWow = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +<<<<<<< HEAD export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ <<<<<<< HEAD +<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ @@ -105,6 +127,11 @@ export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); + +export const callWithParameters = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -113,11 +140,15 @@ export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -126,11 +157,15 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).get({ ======= export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -139,11 +174,15 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -152,11 +191,15 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -165,11 +208,15 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -179,6 +226,7 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); @@ -215,39 +263,46 @@ export const types = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +======= +export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +<<<<<<< HEAD export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const uploadFile = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -257,6 +312,7 @@ export const uploadFile = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); @@ -266,11 +322,17 @@ export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); + +export const complexTypes = (options: Options) => (options.client ?? client).get({ +>>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); +<<<<<<< HEAD <<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); @@ -280,6 +342,11 @@ export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); + +export const multipartRequest = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -289,11 +356,15 @@ export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).put({ ======= export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const complexParams = (options: Options) => (options.client ?? client).put({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -302,6 +373,7 @@ export const complexParams = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); @@ -310,20 +382,31 @@ export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ======= export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +======= +export const callWithResultFromHeader = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +<<<<<<< HEAD export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ <<<<<<< HEAD +<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ======= export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts index e0559a1299..9b2337c15f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts @@ -1,12 +1,17 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; +<<<<<<< HEAD import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; <<<<<<< HEAD import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.js'; ======= import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen.js'; >>>>>>> 4a5f34551 (updated test snapshots) +======= +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; +import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.js'; +>>>>>>> d54cb4956 (ignored nuxt client) export type Options = Options2 & { /** @@ -22,6 +27,7 @@ export type Options; }; +<<<<<<< HEAD <<<<<<< HEAD export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); @@ -30,11 +36,18 @@ export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +<<<<<<< HEAD export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const import_ = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -43,6 +56,7 @@ export const import_ = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); @@ -69,34 +83,42 @@ export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ======= export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +======= +export const fooWow = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); -export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); +export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); -export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); +export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); -export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); +export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); -export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); +export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); -export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); +export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); -export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); +export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); -export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); +export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); -export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); +<<<<<<< HEAD export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ <<<<<<< HEAD +<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ @@ -105,6 +127,11 @@ export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); + +export const callWithParameters = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -113,11 +140,15 @@ export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -126,11 +157,15 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).get({ ======= export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -139,11 +174,15 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -152,11 +191,15 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -165,11 +208,15 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -179,6 +226,7 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); @@ -215,39 +263,46 @@ export const types = (options: Options): RequestResult => (options.client ?? client).post({ ======= export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +======= +export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); +export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); -export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); +export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); -export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); -export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); +export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); -export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); +export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); -export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); +export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); -export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); +export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); -export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); +export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); -export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); -export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); +export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); -export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); +export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); -export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); +export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); -export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); +<<<<<<< HEAD export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const uploadFile = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -257,6 +312,7 @@ export const uploadFile = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); @@ -266,11 +322,17 @@ export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); + +export const complexTypes = (options: Options) => (options.client ?? client).get({ +>>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); +<<<<<<< HEAD <<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); @@ -280,6 +342,11 @@ export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).post({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); + +export const multipartRequest = (options: Options) => (options.client ?? client).post({ +>>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -289,11 +356,15 @@ export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).put({ ======= export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const complexParams = (options: Options) => (options.client ?? client).put({ +>>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -302,6 +373,7 @@ export const complexParams = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); @@ -310,20 +382,31 @@ export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ======= export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +======= +export const callWithResultFromHeader = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) -export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); +<<<<<<< HEAD export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ <<<<<<< HEAD +<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ======= export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ +>>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts index f1f48c23bc..ffbcc9c7c3 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts @@ -1,10 +1,14 @@ // This file is auto-generated by @hey-api/openapi-ts +<<<<<<< HEAD <<<<<<< HEAD import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; ======= import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; >>>>>>> 4a5f34551 (updated test snapshots) +======= +import type { Client, Options as Options2, TDataShape } from './client'; +>>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -28,7 +32,11 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); ======= export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts index dee4cce1d3..60fb5d9aa9 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts @@ -1,10 +1,14 @@ // This file is auto-generated by @hey-api/openapi-ts +<<<<<<< HEAD <<<<<<< HEAD import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; ======= import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; >>>>>>> 4a5f34551 (updated test snapshots) +======= +import type { Client, Options as Options2, TDataShape } from './client'; +>>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -28,10 +32,14 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ ======= export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ +>>>>>>> d54cb4956 (ignored nuxt client) responseType: 'text', url: '/event', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts index f1f48c23bc..ffbcc9c7c3 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts @@ -1,10 +1,14 @@ // This file is auto-generated by @hey-api/openapi-ts +<<<<<<< HEAD <<<<<<< HEAD import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; ======= import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; >>>>>>> 4a5f34551 (updated test snapshots) +======= +import type { Client, Options as Options2, TDataShape } from './client'; +>>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -28,7 +32,11 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); ======= export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts index f1f48c23bc..ffbcc9c7c3 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts @@ -1,10 +1,14 @@ // This file is auto-generated by @hey-api/openapi-ts +<<<<<<< HEAD <<<<<<< HEAD import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; ======= import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; >>>>>>> 4a5f34551 (updated test snapshots) +======= +import type { Client, Options as Options2, TDataShape } from './client'; +>>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -28,7 +32,11 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); ======= export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts index b845173cc5..2530acbddc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts @@ -1,12 +1,16 @@ // This file is auto-generated by @hey-api/openapi-ts +<<<<<<< HEAD <<<<<<< HEAD import type { Client, Composable, Options as Options2, RequestResult, ServerSentEventsResult, TDataShape } from './client'; ======= import type { Client, Composable, Options as Options2, RequestResult, TDataShape } from './client'; >>>>>>> 4a5f34551 (updated test snapshots) +======= +import type { Client, Composable, Options as Options2, TDataShape } from './client'; +>>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; -import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; +import type { EventSubscribeData, EventSubscribeResponse } from './types.gen'; export type Options = Options2 & { /** @@ -28,7 +32,11 @@ export type Options(options: Options): Promise>> => (options.client ?? client).sse.get({ url: '/event', ...options }); ======= export const eventSubscribe = (options: Options): RequestResult => (options.client ?? client).sse.get({ url: '/event', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const eventSubscribe = (options: Options) => (options.client ?? client).sse.get({ url: '/event', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts index f1f48c23bc..ffbcc9c7c3 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts @@ -1,10 +1,14 @@ // This file is auto-generated by @hey-api/openapi-ts +<<<<<<< HEAD <<<<<<< HEAD import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; ======= import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; >>>>>>> 4a5f34551 (updated test snapshots) +======= +import type { Client, Options as Options2, TDataShape } from './client'; +>>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -28,7 +32,11 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); ======= export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts index e33bc6f53f..02c994044c 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts @@ -35,10 +35,14 @@ export const globalHealth = (options?: Opt * Subscribe to global events from the OpenCode system using server-sent events. */ <<<<<<< HEAD +<<<<<<< HEAD export const globalEvent = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); ======= export const globalEvent = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const globalEvent = (options?: Options) => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * Dispose instance @@ -1794,15 +1798,19 @@ export const authSet = (parameters: { * * Get events */ -export const eventSubscribe = (parameters?: { +export const eventSubscribe = (parameters?: { directory?: string; <<<<<<< HEAD +<<<<<<< HEAD }, options?: Options): Promise> => { ======= }, options?: Options): RequestResult => { >>>>>>> 4a5f34551 (updated test snapshots) +======= +}, options?: Options) => { +>>>>>>> d54cb4956 (ignored nuxt client) const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); - return (options?.client ?? client).sse.get({ + return (options?.client ?? client).sse.get({ url: '/event', ...options, ...params diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts index e33bc6f53f..02c994044c 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts @@ -35,10 +35,14 @@ export const globalHealth = (options?: Opt * Subscribe to global events from the OpenCode system using server-sent events. */ <<<<<<< HEAD +<<<<<<< HEAD export const globalEvent = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); ======= export const globalEvent = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const globalEvent = (options?: Options) => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * Dispose instance @@ -1794,15 +1798,19 @@ export const authSet = (parameters: { * * Get events */ -export const eventSubscribe = (parameters?: { +export const eventSubscribe = (parameters?: { directory?: string; <<<<<<< HEAD +<<<<<<< HEAD }, options?: Options): Promise> => { ======= }, options?: Options): RequestResult => { >>>>>>> 4a5f34551 (updated test snapshots) +======= +}, options?: Options) => { +>>>>>>> d54cb4956 (ignored nuxt client) const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); - return (options?.client ?? client).sse.get({ + return (options?.client ?? client).sse.get({ url: '/event', ...options, ...params diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts index 511aa1fa17..d4d5503544 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts @@ -35,10 +35,14 @@ export const globalHealth = (options?: Opt * Subscribe to global events from the OpenCode system using server-sent events. */ <<<<<<< HEAD +<<<<<<< HEAD export const globalEvent = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); ======= export const globalEvent = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const globalEvent = (options?: Options) => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * Dispose instance @@ -810,7 +814,11 @@ export const authSet = (options: Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); ======= export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts index 78ba4ebdac..55592771c6 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts @@ -26,10 +26,14 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.post({ url: '/events/subscribe', ...options }); ======= export const subscribeToEventStream = (options?: Options): RequestResult => (options?.client ?? client).sse.post({ url: '/events/subscribe', ...options }); >>>>>>> 4a5f34551 (updated test snapshots) +======= +export const subscribeToEventStream = (options?: Options) => (options?.client ?? client).sse.post({ url: '/events/subscribe', ...options }); +>>>>>>> d54cb4956 (ignored nuxt client) /** * List events diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts index fdeb04633b..4ed6525bd1 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts @@ -312,28 +312,30 @@ function implementFn>(args ), ) .params(...opParameters.parameters) - .returns( - $.type(plugin.external('client.RequestResult')) - .generic( - plugin.querySymbol({ - category: 'type', - resource: 'operation', - resourceId: operation.id, - role: 'responses', - }) ?? 'unknown', - ) - .generic( - plugin.querySymbol({ - category: 'type', - resource: 'operation', - resourceId: operation.id, - role: 'errors', - }) ?? 'unknown', - ) - .generic('ThrowOnError') - .$if(plugin.config.responseStyle === 'data', (t) => - t.generic($.type.literal(plugin.config.responseStyle)), - ), + .$if(!isNuxtClient, (m) => + m.returns( + $.type(plugin.external('client.RequestResult')) + .generic( + plugin.querySymbol({ + category: 'type', + resource: 'operation', + resourceId: operation.id, + role: 'responses', + }) ?? 'unknown', + ) + .generic( + plugin.querySymbol({ + category: 'type', + resource: 'operation', + resourceId: operation.id, + role: 'errors', + }) ?? 'unknown', + ) + .generic('ThrowOnError') + .$if(plugin.config.responseStyle === 'data', (t) => + t.generic($.type.literal(plugin.config.responseStyle)), + ), + ), ) .do(...statements) as T; } From ceff9c84a6abe17584f5f8bc5d619d271fbc579a Mon Sep 17 00:00:00 2001 From: Tomislav Puric Date: Thu, 14 May 2026 21:28:13 +1000 Subject: [PATCH 4/7] ignored server sent events --- .../3.1.x/sse-angular/sdk.gen.ts | 16 ------------- .../__snapshots__/3.1.x/sse-axios/sdk.gen.ts | 16 ------------- .../__snapshots__/3.1.x/sse-fetch/sdk.gen.ts | 16 ------------- .../__snapshots__/3.1.x/sse-next/sdk.gen.ts | 16 ------------- .../__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts | 16 ------------- .../opencode/export-all/sdk.gen.ts | 24 ++----------------- .../__snapshots__/opencode/flat/sdk.gen.ts | 24 ++----------------- .../__snapshots__/opencode/grouped/sdk.gen.ts | 20 ---------------- .../3.1.x/sse-react-query/sdk.gen.ts | 12 ---------- .../src/plugins/@hey-api/sdk/v1/node.ts | 7 +++++- 10 files changed, 10 insertions(+), 157 deletions(-) diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts index ffbcc9c7c3..6257b4a972 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/sdk.gen.ts @@ -1,14 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD -<<<<<<< HEAD import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; -======= -import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; ->>>>>>> 4a5f34551 (updated test snapshots) -======= -import type { Client, Options as Options2, TDataShape } from './client'; ->>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -31,12 +23,4 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); -======= -export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts index 60fb5d9aa9..662a5f3949 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/sdk.gen.ts @@ -1,14 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD -<<<<<<< HEAD import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; -======= -import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; ->>>>>>> 4a5f34551 (updated test snapshots) -======= -import type { Client, Options as Options2, TDataShape } from './client'; ->>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -31,15 +23,7 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ -======= -export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ ->>>>>>> d54cb4956 (ignored nuxt client) responseType: 'text', url: '/event', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts index ffbcc9c7c3..6257b4a972 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/sdk.gen.ts @@ -1,14 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD -<<<<<<< HEAD import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; -======= -import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; ->>>>>>> 4a5f34551 (updated test snapshots) -======= -import type { Client, Options as Options2, TDataShape } from './client'; ->>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -31,12 +23,4 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); -======= -export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts index ffbcc9c7c3..6257b4a972 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/sdk.gen.ts @@ -1,14 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD -<<<<<<< HEAD import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; -======= -import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; ->>>>>>> 4a5f34551 (updated test snapshots) -======= -import type { Client, Options as Options2, TDataShape } from './client'; ->>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -31,12 +23,4 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); -======= -export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts index ffbcc9c7c3..6257b4a972 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/sdk.gen.ts @@ -1,14 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD -<<<<<<< HEAD import type { Client, Options as Options2, ServerSentEventsResult, TDataShape } from './client'; -======= -import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; ->>>>>>> 4a5f34551 (updated test snapshots) -======= -import type { Client, Options as Options2, TDataShape } from './client'; ->>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses } from './types.gen'; @@ -31,12 +23,4 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); -======= -export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts index 02c994044c..8a7359680d 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/sdk.gen.ts @@ -1,10 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD import { buildClientParams, type Client, type Options as Options2, type RequestResult, type ServerSentEventsResult, type TDataShape } from './client'; -======= -import { buildClientParams, type Client, type Options as Options2, type RequestResult, type TDataShape } from './client'; ->>>>>>> 4a5f34551 (updated test snapshots) import { client } from './client.gen'; import type { AgentPartInput, AppAgentsResponses, AppLogErrors, AppLogResponses, Auth, AuthSetErrors, AuthSetResponses, CommandListResponses, Config, ConfigGetResponses, ConfigProvidersResponses, ConfigUpdateErrors, ConfigUpdateResponses, EventSubscribeResponse, EventSubscribeResponses, EventTuiCommandExecute, EventTuiPromptAppend, EventTuiToastShow, FileListResponses, FilePartInput, FileReadResponses, FileStatusResponses, FindFilesResponses, FindSymbolsResponses, FindTextResponses, FormatterStatusResponses, GlobalDisposeResponses, GlobalEventResponse, GlobalEventResponses, GlobalHealthResponses, InstanceDisposeResponses, LspStatusResponses, McpAddErrors, McpAddResponses, McpAuthAuthenticateErrors, McpAuthAuthenticateResponses, McpAuthCallbackErrors, McpAuthCallbackResponses, McpAuthRemoveErrors, McpAuthRemoveResponses, McpAuthStartErrors, McpAuthStartResponses, McpConnectResponses, McpDisconnectResponses, McpLocalConfig, McpRemoteConfig, McpStatusResponses, Part, PartDeleteErrors, PartDeleteResponses, PartUpdateErrors, PartUpdateResponses, PathGetResponses, PermissionListResponses, PermissionReplyErrors, PermissionReplyResponses, PermissionRespondErrors, PermissionRespondResponses, PermissionRuleset, ProjectCurrentResponses, ProjectListResponses, ProjectUpdateErrors, ProjectUpdateResponses, ProviderAuthResponses, ProviderListResponses, ProviderOauthAuthorizeErrors, ProviderOauthAuthorizeResponses, ProviderOauthCallbackErrors, ProviderOauthCallbackResponses, PtyConnectErrors, PtyConnectResponses, PtyCreateErrors, PtyCreateResponses, PtyGetErrors, PtyGetResponses, PtyListResponses, PtyRemoveErrors, PtyRemoveResponses, PtyUpdateErrors, PtyUpdateResponses, SessionAbortErrors, SessionAbortResponses, SessionChildrenErrors, SessionChildrenResponses, SessionCommandErrors, SessionCommandResponses, SessionCreateErrors, SessionCreateResponses, SessionDeleteErrors, SessionDeleteResponses, SessionDiffErrors, SessionDiffResponses, SessionForkResponses, SessionGetErrors, SessionGetResponses, SessionInitErrors, SessionInitResponses, SessionListResponses, SessionMessageErrors, SessionMessageResponses, SessionMessagesErrors, SessionMessagesResponses, SessionPromptAsyncErrors, SessionPromptAsyncResponses, SessionPromptErrors, SessionPromptResponses, SessionRevertErrors, SessionRevertResponses, SessionShareErrors, SessionShareResponses, SessionShellErrors, SessionShellResponses, SessionStatusErrors, SessionStatusResponses, SessionSummarizeErrors, SessionSummarizeResponses, SessionTodoErrors, SessionTodoResponses, SessionUnrevertErrors, SessionUnrevertResponses, SessionUnshareErrors, SessionUnshareResponses, SessionUpdateErrors, SessionUpdateResponses, SubtaskPartInput, TextPartInput, ToolIdsErrors, ToolIdsResponses, ToolListErrors, ToolListResponses, TuiAppendPromptErrors, TuiAppendPromptResponses, TuiClearPromptResponses, TuiControlNextResponses, TuiControlResponseResponses, TuiExecuteCommandErrors, TuiExecuteCommandResponses, TuiOpenHelpResponses, TuiOpenModelsResponses, TuiOpenSessionsResponses, TuiOpenThemesResponses, TuiPublishErrors, TuiPublishResponses, TuiShowToastResponses, TuiSubmitPromptResponses, VcsGetResponses } from './types.gen'; @@ -34,15 +30,7 @@ export const globalHealth = (options?: Opt * * Subscribe to global events from the OpenCode system using server-sent events. */ -<<<<<<< HEAD -<<<<<<< HEAD export const globalEvent = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); -======= -export const globalEvent = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const globalEvent = (options?: Options) => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * Dispose instance @@ -1798,19 +1786,11 @@ export const authSet = (parameters: { * * Get events */ -export const eventSubscribe = (parameters?: { +export const eventSubscribe = (parameters?: { directory?: string; -<<<<<<< HEAD -<<<<<<< HEAD }, options?: Options): Promise> => { -======= -}, options?: Options): RequestResult => { ->>>>>>> 4a5f34551 (updated test snapshots) -======= -}, options?: Options) => { ->>>>>>> d54cb4956 (ignored nuxt client) const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); - return (options?.client ?? client).sse.get({ + return (options?.client ?? client).sse.get({ url: '/event', ...options, ...params diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts index 02c994044c..8a7359680d 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts @@ -1,10 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD import { buildClientParams, type Client, type Options as Options2, type RequestResult, type ServerSentEventsResult, type TDataShape } from './client'; -======= -import { buildClientParams, type Client, type Options as Options2, type RequestResult, type TDataShape } from './client'; ->>>>>>> 4a5f34551 (updated test snapshots) import { client } from './client.gen'; import type { AgentPartInput, AppAgentsResponses, AppLogErrors, AppLogResponses, Auth, AuthSetErrors, AuthSetResponses, CommandListResponses, Config, ConfigGetResponses, ConfigProvidersResponses, ConfigUpdateErrors, ConfigUpdateResponses, EventSubscribeResponse, EventSubscribeResponses, EventTuiCommandExecute, EventTuiPromptAppend, EventTuiToastShow, FileListResponses, FilePartInput, FileReadResponses, FileStatusResponses, FindFilesResponses, FindSymbolsResponses, FindTextResponses, FormatterStatusResponses, GlobalDisposeResponses, GlobalEventResponse, GlobalEventResponses, GlobalHealthResponses, InstanceDisposeResponses, LspStatusResponses, McpAddErrors, McpAddResponses, McpAuthAuthenticateErrors, McpAuthAuthenticateResponses, McpAuthCallbackErrors, McpAuthCallbackResponses, McpAuthRemoveErrors, McpAuthRemoveResponses, McpAuthStartErrors, McpAuthStartResponses, McpConnectResponses, McpDisconnectResponses, McpLocalConfig, McpRemoteConfig, McpStatusResponses, Part, PartDeleteErrors, PartDeleteResponses, PartUpdateErrors, PartUpdateResponses, PathGetResponses, PermissionListResponses, PermissionReplyErrors, PermissionReplyResponses, PermissionRespondErrors, PermissionRespondResponses, PermissionRuleset, ProjectCurrentResponses, ProjectListResponses, ProjectUpdateErrors, ProjectUpdateResponses, ProviderAuthResponses, ProviderListResponses, ProviderOauthAuthorizeErrors, ProviderOauthAuthorizeResponses, ProviderOauthCallbackErrors, ProviderOauthCallbackResponses, PtyConnectErrors, PtyConnectResponses, PtyCreateErrors, PtyCreateResponses, PtyGetErrors, PtyGetResponses, PtyListResponses, PtyRemoveErrors, PtyRemoveResponses, PtyUpdateErrors, PtyUpdateResponses, SessionAbortErrors, SessionAbortResponses, SessionChildrenErrors, SessionChildrenResponses, SessionCommandErrors, SessionCommandResponses, SessionCreateErrors, SessionCreateResponses, SessionDeleteErrors, SessionDeleteResponses, SessionDiffErrors, SessionDiffResponses, SessionForkResponses, SessionGetErrors, SessionGetResponses, SessionInitErrors, SessionInitResponses, SessionListResponses, SessionMessageErrors, SessionMessageResponses, SessionMessagesErrors, SessionMessagesResponses, SessionPromptAsyncErrors, SessionPromptAsyncResponses, SessionPromptErrors, SessionPromptResponses, SessionRevertErrors, SessionRevertResponses, SessionShareErrors, SessionShareResponses, SessionShellErrors, SessionShellResponses, SessionStatusErrors, SessionStatusResponses, SessionSummarizeErrors, SessionSummarizeResponses, SessionTodoErrors, SessionTodoResponses, SessionUnrevertErrors, SessionUnrevertResponses, SessionUnshareErrors, SessionUnshareResponses, SessionUpdateErrors, SessionUpdateResponses, SubtaskPartInput, TextPartInput, ToolIdsErrors, ToolIdsResponses, ToolListErrors, ToolListResponses, TuiAppendPromptErrors, TuiAppendPromptResponses, TuiClearPromptResponses, TuiControlNextResponses, TuiControlResponseResponses, TuiExecuteCommandErrors, TuiExecuteCommandResponses, TuiOpenHelpResponses, TuiOpenModelsResponses, TuiOpenSessionsResponses, TuiOpenThemesResponses, TuiPublishErrors, TuiPublishResponses, TuiShowToastResponses, TuiSubmitPromptResponses, VcsGetResponses } from './types.gen'; @@ -34,15 +30,7 @@ export const globalHealth = (options?: Opt * * Subscribe to global events from the OpenCode system using server-sent events. */ -<<<<<<< HEAD -<<<<<<< HEAD export const globalEvent = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); -======= -export const globalEvent = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const globalEvent = (options?: Options) => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * Dispose instance @@ -1798,19 +1786,11 @@ export const authSet = (parameters: { * * Get events */ -export const eventSubscribe = (parameters?: { +export const eventSubscribe = (parameters?: { directory?: string; -<<<<<<< HEAD -<<<<<<< HEAD }, options?: Options): Promise> => { -======= -}, options?: Options): RequestResult => { ->>>>>>> 4a5f34551 (updated test snapshots) -======= -}, options?: Options) => { ->>>>>>> d54cb4956 (ignored nuxt client) const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'directory' }] }]); - return (options?.client ?? client).sse.get({ + return (options?.client ?? client).sse.get({ url: '/event', ...options, ...params diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts index d4d5503544..2a08ae0ab4 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/sdk.gen.ts @@ -1,10 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD import type { Client, Options as Options2, RequestResult, ServerSentEventsResult, TDataShape } from './client'; -======= -import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; ->>>>>>> 4a5f34551 (updated test snapshots) import { client } from './client.gen'; import type { AppAgentsData, AppAgentsResponses, AppLogData, AppLogErrors, AppLogResponses, AuthSetData, AuthSetErrors, AuthSetResponses, CommandListData, CommandListResponses, ConfigGetData, ConfigGetResponses, ConfigProvidersData, ConfigProvidersResponses, ConfigUpdateData, ConfigUpdateErrors, ConfigUpdateResponses, EventSubscribeData, EventSubscribeResponse, EventSubscribeResponses, FileListData, FileListResponses, FileReadData, FileReadResponses, FileStatusData, FileStatusResponses, FindFilesData, FindFilesResponses, FindSymbolsData, FindSymbolsResponses, FindTextData, FindTextResponses, FormatterStatusData, FormatterStatusResponses, GlobalDisposeData, GlobalDisposeResponses, GlobalEventData, GlobalEventResponse, GlobalEventResponses, GlobalHealthData, GlobalHealthResponses, InstanceDisposeData, InstanceDisposeResponses, LspStatusData, LspStatusResponses, McpAddData, McpAddErrors, McpAddResponses, McpAuthAuthenticateData, McpAuthAuthenticateErrors, McpAuthAuthenticateResponses, McpAuthCallbackData, McpAuthCallbackErrors, McpAuthCallbackResponses, McpAuthRemoveData, McpAuthRemoveErrors, McpAuthRemoveResponses, McpAuthStartData, McpAuthStartErrors, McpAuthStartResponses, McpConnectData, McpConnectResponses, McpDisconnectData, McpDisconnectResponses, McpStatusData, McpStatusResponses, PartDeleteData, PartDeleteErrors, PartDeleteResponses, PartUpdateData, PartUpdateErrors, PartUpdateResponses, PathGetData, PathGetResponses, PermissionListData, PermissionListResponses, PermissionReplyData, PermissionReplyErrors, PermissionReplyResponses, PermissionRespondData, PermissionRespondErrors, PermissionRespondResponses, ProjectCurrentData, ProjectCurrentResponses, ProjectListData, ProjectListResponses, ProjectUpdateData, ProjectUpdateErrors, ProjectUpdateResponses, ProviderAuthData, ProviderAuthResponses, ProviderListData, ProviderListResponses, ProviderOauthAuthorizeData, ProviderOauthAuthorizeErrors, ProviderOauthAuthorizeResponses, ProviderOauthCallbackData, ProviderOauthCallbackErrors, ProviderOauthCallbackResponses, PtyConnectData, PtyConnectErrors, PtyConnectResponses, PtyCreateData, PtyCreateErrors, PtyCreateResponses, PtyGetData, PtyGetErrors, PtyGetResponses, PtyListData, PtyListResponses, PtyRemoveData, PtyRemoveErrors, PtyRemoveResponses, PtyUpdateData, PtyUpdateErrors, PtyUpdateResponses, SessionAbortData, SessionAbortErrors, SessionAbortResponses, SessionChildrenData, SessionChildrenErrors, SessionChildrenResponses, SessionCommandData, SessionCommandErrors, SessionCommandResponses, SessionCreateData, SessionCreateErrors, SessionCreateResponses, SessionDeleteData, SessionDeleteErrors, SessionDeleteResponses, SessionDiffData, SessionDiffErrors, SessionDiffResponses, SessionForkData, SessionForkResponses, SessionGetData, SessionGetErrors, SessionGetResponses, SessionInitData, SessionInitErrors, SessionInitResponses, SessionListData, SessionListResponses, SessionMessageData, SessionMessageErrors, SessionMessageResponses, SessionMessagesData, SessionMessagesErrors, SessionMessagesResponses, SessionPromptAsyncData, SessionPromptAsyncErrors, SessionPromptAsyncResponses, SessionPromptData, SessionPromptErrors, SessionPromptResponses, SessionRevertData, SessionRevertErrors, SessionRevertResponses, SessionShareData, SessionShareErrors, SessionShareResponses, SessionShellData, SessionShellErrors, SessionShellResponses, SessionStatusData, SessionStatusErrors, SessionStatusResponses, SessionSummarizeData, SessionSummarizeErrors, SessionSummarizeResponses, SessionTodoData, SessionTodoErrors, SessionTodoResponses, SessionUnrevertData, SessionUnrevertErrors, SessionUnrevertResponses, SessionUnshareData, SessionUnshareErrors, SessionUnshareResponses, SessionUpdateData, SessionUpdateErrors, SessionUpdateResponses, ToolIdsData, ToolIdsErrors, ToolIdsResponses, ToolListData, ToolListErrors, ToolListResponses, TuiAppendPromptData, TuiAppendPromptErrors, TuiAppendPromptResponses, TuiClearPromptData, TuiClearPromptResponses, TuiControlNextData, TuiControlNextResponses, TuiControlResponseData, TuiControlResponseResponses, TuiExecuteCommandData, TuiExecuteCommandErrors, TuiExecuteCommandResponses, TuiOpenHelpData, TuiOpenHelpResponses, TuiOpenModelsData, TuiOpenModelsResponses, TuiOpenSessionsData, TuiOpenSessionsResponses, TuiOpenThemesData, TuiOpenThemesResponses, TuiPublishData, TuiPublishErrors, TuiPublishResponses, TuiShowToastData, TuiShowToastResponses, TuiSubmitPromptData, TuiSubmitPromptResponses, VcsGetData, VcsGetResponses } from './types.gen'; @@ -34,15 +30,7 @@ export const globalHealth = (options?: Opt * * Subscribe to global events from the OpenCode system using server-sent events. */ -<<<<<<< HEAD -<<<<<<< HEAD export const globalEvent = (options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); -======= -export const globalEvent = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const globalEvent = (options?: Options) => (options?.client ?? client).sse.get({ url: '/global/event', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * Dispose instance @@ -813,12 +801,4 @@ export const authSet = (options: Options(options?: Options): Promise> => (options?.client ?? client).sse.get({ url: '/event', ...options }); -======= -export const eventSubscribe = (options?: Options): RequestResult => (options?.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const eventSubscribe = (options?: Options) => (options?.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts index 55592771c6..1276563434 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.1.x/sse-react-query/sdk.gen.ts @@ -1,10 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD import type { Client, Options as Options2, RequestResult, ServerSentEventsResult, TDataShape } from './client'; -======= -import type { Client, Options as Options2, RequestResult, TDataShape } from './client'; ->>>>>>> 4a5f34551 (updated test snapshots) import { client } from './client.gen'; import type { ListEventsData, ListEventsResponses, SubscribeToEventStreamData, SubscribeToEventStreamResponse, SubscribeToEventStreamResponses } from './types.gen'; @@ -25,15 +21,7 @@ export type Options(options?: Options): Promise> => (options?.client ?? client).sse.post({ url: '/events/subscribe', ...options }); -======= -export const subscribeToEventStream = (options?: Options): RequestResult => (options?.client ?? client).sse.post({ url: '/events/subscribe', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const subscribeToEventStream = (options?: Options) => (options?.client ?? client).sse.post({ url: '/events/subscribe', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * List events diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts index 4ed6525bd1..ccd7847642 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts @@ -282,6 +282,11 @@ function implementFn>(args operation, plugin, }); + + const hasServerSentEvents = Object.values(operation.responses ?? {}).some( + (response) => response?.mediaType === 'text/event-stream', + ); + return node .$if( isNuxtClient, @@ -312,7 +317,7 @@ function implementFn>(args ), ) .params(...opParameters.parameters) - .$if(!isNuxtClient, (m) => + .$if(!isNuxtClient && !hasServerSentEvents, (m) => m.returns( $.type(plugin.external('client.RequestResult')) .generic( From f5c727d194bab847e783f26491c7a966c14cd6f3 Mon Sep 17 00:00:00 2001 From: Tomislav Puric Date: Fri, 15 May 2026 00:50:27 +1000 Subject: [PATCH 5/7] handle server sent events --- .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../openapi-ts-ky/src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../src/client/client/index.ts | 1 + .../@hey-api/client-angular/bundle/index.ts | 1 + .../@hey-api/client-axios/bundle/index.ts | 1 + .../@hey-api/client-fetch/bundle/index.ts | 1 + .../@hey-api/client-ky/bundle/index.ts | 1 + .../@hey-api/client-next/bundle/index.ts | 1 + .../@hey-api/client-nuxt/bundle/index.ts | 1 + .../@hey-api/client-ofetch/bundle/index.ts | 1 + .../plugins/@hey-api/sdk/shared/operation.ts | 47 ++++++++++++++++--- .../src/plugins/@hey-api/sdk/v1/node.ts | 33 ++----------- .../src/plugins/@hey-api/sdk/v1/plugin.ts | 8 ++++ 25 files changed, 74 insertions(+), 36 deletions(-) diff --git a/examples/openapi-ts-angular-common/src/client/client/index.ts b/examples/openapi-ts-angular-common/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-angular-common/src/client/client/index.ts +++ b/examples/openapi-ts-angular-common/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-angular/src/client/client/index.ts b/examples/openapi-ts-angular/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-angular/src/client/client/index.ts +++ b/examples/openapi-ts-angular/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-axios/src/client/client/index.ts b/examples/openapi-ts-axios/src/client/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/examples/openapi-ts-axios/src/client/client/index.ts +++ b/examples/openapi-ts-axios/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-fastify/src/client/client/index.ts b/examples/openapi-ts-fastify/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-fastify/src/client/client/index.ts +++ b/examples/openapi-ts-fastify/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-fetch/src/client/client/index.ts b/examples/openapi-ts-fetch/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-fetch/src/client/client/index.ts +++ b/examples/openapi-ts-fetch/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-ky/src/client/client/index.ts b/examples/openapi-ts-ky/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-ky/src/client/client/index.ts +++ b/examples/openapi-ts-ky/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-nestjs/src/client/client/index.ts b/examples/openapi-ts-nestjs/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-nestjs/src/client/client/index.ts +++ b/examples/openapi-ts-nestjs/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-next/src/client/client/index.ts b/examples/openapi-ts-next/src/client/client/index.ts index 7bd7b98807..124e71d709 100644 --- a/examples/openapi-ts-next/src/client/client/index.ts +++ b/examples/openapi-ts-next/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-ofetch/src/client/client/index.ts b/examples/openapi-ts-ofetch/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-ofetch/src/client/client/index.ts +++ b/examples/openapi-ts-ofetch/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-openai/src/client/client/index.ts b/examples/openapi-ts-openai/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-openai/src/client/client/index.ts +++ b/examples/openapi-ts-openai/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-pinia-colada/src/client/client/index.ts b/examples/openapi-ts-pinia-colada/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-pinia-colada/src/client/client/index.ts +++ b/examples/openapi-ts-pinia-colada/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/index.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/index.ts +++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-tanstack-react-query/src/client/client/index.ts b/examples/openapi-ts-tanstack-react-query/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-tanstack-react-query/src/client/client/index.ts +++ b/examples/openapi-ts-tanstack-react-query/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/client/index.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-tanstack-svelte-query/src/client/client/index.ts +++ b/examples/openapi-ts-tanstack-svelte-query/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/client/index.ts b/examples/openapi-ts-tanstack-vue-query/src/client/client/index.ts index b295edeca0..c6ffa4114e 100644 --- a/examples/openapi-ts-tanstack-vue-query/src/client/client/index.ts +++ b/examples/openapi-ts-tanstack-vue-query/src/client/client/index.ts @@ -9,6 +9,7 @@ export { } from '../core/bodySerializer.gen'; export { buildClientParams } from '../core/params.gen'; export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen'; +export type { ServerSentEventsResult } from '../core/serverSentEvents.gen'; export { createClient } from './client.gen'; export type { Client, diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/index.ts b/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/index.ts index 8faab7f63a..efc76dfb89 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/index.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/index.ts @@ -7,6 +7,7 @@ export { } from '../../client-core/bundle/bodySerializer'; export { buildClientParams } from '../../client-core/bundle/params'; export { serializeQueryKeyValue } from '../../client-core/bundle/queryKeySerializer'; +export type { ServerSentEventsResult } from '../../client-core/bundle/serverSentEvents'; export { createClient } from './client'; export type { Client, diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-axios/bundle/index.ts b/packages/openapi-ts/src/plugins/@hey-api/client-axios/bundle/index.ts index fe6fa94296..318eb49ad0 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/client-axios/bundle/index.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/client-axios/bundle/index.ts @@ -7,6 +7,7 @@ export { } from '../../client-core/bundle/bodySerializer'; export { buildClientParams } from '../../client-core/bundle/params'; export { serializeQueryKeyValue } from '../../client-core/bundle/queryKeySerializer'; +export type { ServerSentEventsResult } from '../../client-core/bundle/serverSentEvents'; export { createClient } from './client'; export type { Client, diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/index.ts b/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/index.ts index 8faab7f63a..efc76dfb89 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/index.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/index.ts @@ -7,6 +7,7 @@ export { } from '../../client-core/bundle/bodySerializer'; export { buildClientParams } from '../../client-core/bundle/params'; export { serializeQueryKeyValue } from '../../client-core/bundle/queryKeySerializer'; +export type { ServerSentEventsResult } from '../../client-core/bundle/serverSentEvents'; export { createClient } from './client'; export type { Client, diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-ky/bundle/index.ts b/packages/openapi-ts/src/plugins/@hey-api/client-ky/bundle/index.ts index 8faab7f63a..efc76dfb89 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/client-ky/bundle/index.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/client-ky/bundle/index.ts @@ -7,6 +7,7 @@ export { } from '../../client-core/bundle/bodySerializer'; export { buildClientParams } from '../../client-core/bundle/params'; export { serializeQueryKeyValue } from '../../client-core/bundle/queryKeySerializer'; +export type { ServerSentEventsResult } from '../../client-core/bundle/serverSentEvents'; export { createClient } from './client'; export type { Client, diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-next/bundle/index.ts b/packages/openapi-ts/src/plugins/@hey-api/client-next/bundle/index.ts index fe6fa94296..318eb49ad0 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/client-next/bundle/index.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/client-next/bundle/index.ts @@ -7,6 +7,7 @@ export { } from '../../client-core/bundle/bodySerializer'; export { buildClientParams } from '../../client-core/bundle/params'; export { serializeQueryKeyValue } from '../../client-core/bundle/queryKeySerializer'; +export type { ServerSentEventsResult } from '../../client-core/bundle/serverSentEvents'; export { createClient } from './client'; export type { Client, diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/bundle/index.ts b/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/bundle/index.ts index a78db48129..19bec7e5eb 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/bundle/index.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/bundle/index.ts @@ -7,6 +7,7 @@ export { } from '../../client-core/bundle/bodySerializer'; export { buildClientParams } from '../../client-core/bundle/params'; export { serializeQueryKeyValue } from '../../client-core/bundle/queryKeySerializer'; +export type { ServerSentEventsResult } from '../../client-core/bundle/serverSentEvents'; export { createClient } from './client'; export type { Client, diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/bundle/index.ts b/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/bundle/index.ts index 8faab7f63a..efc76dfb89 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/bundle/index.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/bundle/index.ts @@ -7,6 +7,7 @@ export { } from '../../client-core/bundle/bodySerializer'; export { buildClientParams } from '../../client-core/bundle/params'; export { serializeQueryKeyValue } from '../../client-core/bundle/queryKeySerializer'; +export type { ServerSentEventsResult } from '../../client-core/bundle/serverSentEvents'; export { createClient } from './client'; export type { Client, diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts index a2f3ce27aa..a9c77b29d2 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts @@ -344,7 +344,7 @@ export function operationStatements({ reqOptions.prop('responseTransformer', responseHandlers.transformer); } - let hasServerSentEvents = false; + const isSse = hasOperationSse({ operation }); let responseTypeValue: ReturnType | undefined; for (const statusCode in operation.responses) { @@ -362,10 +362,6 @@ export function operationStatements({ } } } - - if (response.mediaType === 'text/event-stream') { - hasServerSentEvents = true; - } } if (responseHandlers.validator) { @@ -455,7 +451,7 @@ export function operationStatements({ clientExpression = optionsClient; } - let functionName = hasServerSentEvents ? clientExpression.attr('sse') : clientExpression; + let functionName = isSse ? clientExpression.attr('sse') : clientExpression; functionName = functionName.attr(operation.method); statements.push( @@ -484,3 +480,42 @@ export function operationStatements({ return statements; } + +/** + * Builds the return type annotation for an SDK operation function. + */ +export function operationReturnType({ + operation, + plugin, +}: { + operation: IR.OperationObject; + plugin: HeyApiSdkPlugin['Instance']; +}): ReturnType | undefined { + const client = getClientPlugin(getTypedConfig(plugin)); + if (client.name === '@hey-api/client-nuxt') return undefined; + + const queryType = (role: 'responses' | 'errors') => + plugin.querySymbol({ + category: 'type', + resource: 'operation', + resourceId: operation.id, + role, + }) ?? 'unknown'; + + if (hasOperationSse({ operation })) { + return $.type('Promise').generic( + $.type(plugin.external('client.ServerSentEventsResult')) + .generic(queryType('responses')) + .generic(queryType('errors')) + .generic('ThrowOnError'), + ); + } + + return $.type(plugin.external('client.RequestResult')) + .generic(queryType('responses')) + .generic(queryType('errors')) + .generic('ThrowOnError') + .$if(plugin.config.responseStyle === 'data', (t) => + t.generic($.type.literal(plugin.config.responseStyle)), + ); +} diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts index ccd7847642..6a99543b03 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/node.ts @@ -17,7 +17,7 @@ import { import { $, ctx } from '../../../../ts-dsl'; import { createClientClass, createRegistryClass } from '../shared/class'; import { nuxtTypeComposable, nuxtTypeDefault } from '../shared/constants'; -import { operationParameters, operationStatements } from '../shared/operation'; +import { operationParameters, operationReturnType, operationStatements } from '../shared/operation'; import type { HeyApiSdkPlugin } from '../types'; export interface OperationItem { @@ -282,10 +282,7 @@ function implementFn>(args operation, plugin, }); - - const hasServerSentEvents = Object.values(operation.responses ?? {}).some( - (response) => response?.mediaType === 'text/event-stream', - ); + const returnType = operationReturnType({ operation, plugin }); return node .$if( @@ -317,31 +314,7 @@ function implementFn>(args ), ) .params(...opParameters.parameters) - .$if(!isNuxtClient && !hasServerSentEvents, (m) => - m.returns( - $.type(plugin.external('client.RequestResult')) - .generic( - plugin.querySymbol({ - category: 'type', - resource: 'operation', - resourceId: operation.id, - role: 'responses', - }) ?? 'unknown', - ) - .generic( - plugin.querySymbol({ - category: 'type', - resource: 'operation', - resourceId: operation.id, - role: 'errors', - }) ?? 'unknown', - ) - .generic('ThrowOnError') - .$if(plugin.config.responseStyle === 'data', (t) => - t.generic($.type.literal(plugin.config.responseStyle)), - ), - ), - ) + .$if(returnType, (m, t) => m.returns(t)) .do(...statements) as T; } diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/plugin.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/plugin.ts index 6224d11819..e141dac43f 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/plugin.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/v1/plugin.ts @@ -45,6 +45,14 @@ export const handlerV1: HeyApiSdkPlugin['Handler'] = ({ plugin }) => { tool: client.name, }, }); + plugin.symbol('ServerSentEventsResult', { + external: clientModule, + kind: 'type', + meta: { + resource: 'client.ServerSentEventsResult', + tool: client.name, + }, + }); if (isNuxtClient) { plugin.symbol('Composable', { external: clientModule, From 2beed7ceb02e101e12def06a5e8f68a5f09385cc Mon Sep 17 00:00:00 2001 From: Tomislav Puric Date: Fri, 15 May 2026 01:22:54 +1000 Subject: [PATCH 6/7] handle nuxt --- .../src/client/client/utils.gen.ts | 10 - .../src/client/client/utils.gen.ts | 10 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 10 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 5 - .../src/client/client/utils.gen.ts | 5 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 6 +- .../core/queryKeySerializer.gen.ts | 4 - .../2.0.x/form-data/client/client.gen.ts | 5 +- .../2.0.x/form-data/client/utils.gen.ts | 14 +- .../form-data/core/pathSerializer.gen.ts | 12 - .../form-data/core/queryKeySerializer.gen.ts | 4 - .../common/default-class/client/client.gen.ts | 5 +- .../common/default-class/client/utils.gen.ts | 15 +- .../default-class/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../common/default/client/client.gen.ts | 5 +- .../common/default/client/utils.gen.ts | 15 +- .../common/default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-nested-classes/client/client.gen.ts | 5 +- .../sdk-nested-classes/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../@hey-api/sdk/default/client/client.gen.ts | 5 +- .../@hey-api/sdk/default/client/utils.gen.ts | 14 +- .../sdk/default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../sdk/instance/client/client.gen.ts | 5 +- .../@hey-api/sdk/instance/client/utils.gen.ts | 14 +- .../sdk/instance/core/pathSerializer.gen.ts | 12 - .../instance/core/queryKeySerializer.gen.ts | 4 - .../sdk/throwOnError/client/client.gen.ts | 5 +- .../sdk/throwOnError/client/utils.gen.ts | 14 +- .../throwOnError/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../colada/asClass/client/client.gen.ts | 5 +- .../@pinia/colada/asClass/client/utils.gen.ts | 14 +- .../colada/asClass/core/pathSerializer.gen.ts | 12 - .../asClass/core/queryKeySerializer.gen.ts | 4 - .../@pinia/colada/fetch/client/client.gen.ts | 5 +- .../@pinia/colada/fetch/client/utils.gen.ts | 14 +- .../colada/fetch/core/pathSerializer.gen.ts | 12 - .../fetch/core/queryKeySerializer.gen.ts | 4 - .../2.0.x/schema-unknown/client/client.gen.ts | 5 +- .../2.0.x/schema-unknown/client/utils.gen.ts | 14 +- .../schema-unknown/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../security-api-key/client/client.gen.ts | 5 +- .../security-api-key/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../2.0.x/security-basic/client/client.gen.ts | 5 +- .../2.0.x/security-basic/client/utils.gen.ts | 14 +- .../security-basic/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../2.0.x/security-false/client/client.gen.ts | 5 +- .../2.0.x/security-false/client/utils.gen.ts | 14 +- .../security-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../security-oauth2/client/client.gen.ts | 5 +- .../2.0.x/security-oauth2/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../servers-base-path/client/client.gen.ts | 5 +- .../servers-base-path/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../2.0.x/servers-host/client/client.gen.ts | 5 +- .../2.0.x/servers-host/client/utils.gen.ts | 14 +- .../servers-host/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../2.0.x/servers/client/client.gen.ts | 5 +- .../2.0.x/servers/client/utils.gen.ts | 14 +- .../2.0.x/servers/core/pathSerializer.gen.ts | 12 - .../servers/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../transforms-read-write/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../body-binary-format/client/client.gen.ts | 5 +- .../body-binary-format/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.0.x/content-types/client/client.gen.ts | 5 +- .../3.0.x/content-types/client/utils.gen.ts | 14 +- .../content-types/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../common/default-class/client/client.gen.ts | 5 +- .../common/default-class/client/utils.gen.ts | 15 +- .../default-class/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../common/default/client/client.gen.ts | 5 +- .../common/default/client/utils.gen.ts | 15 +- .../common/default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-nested-classes/client/client.gen.ts | 5 +- .../sdk-nested-classes/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../@hey-api/sdk/default/client/client.gen.ts | 5 +- .../@hey-api/sdk/default/client/utils.gen.ts | 14 +- .../sdk/default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../sdk/instance/client/client.gen.ts | 5 +- .../@hey-api/sdk/instance/client/utils.gen.ts | 14 +- .../sdk/instance/core/pathSerializer.gen.ts | 12 - .../instance/core/queryKeySerializer.gen.ts | 4 - .../sdk/throwOnError/client/client.gen.ts | 5 +- .../sdk/throwOnError/client/utils.gen.ts | 14 +- .../throwOnError/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../colada/asClass/client/client.gen.ts | 5 +- .../@pinia/colada/asClass/client/utils.gen.ts | 14 +- .../colada/asClass/core/pathSerializer.gen.ts | 12 - .../asClass/core/queryKeySerializer.gen.ts | 4 - .../@pinia/colada/fetch/client/client.gen.ts | 5 +- .../@pinia/colada/fetch/client/utils.gen.ts | 14 +- .../colada/fetch/core/pathSerializer.gen.ts | 12 - .../fetch/core/queryKeySerializer.gen.ts | 4 - .../security-api-key/client/client.gen.ts | 5 +- .../security-api-key/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.0.x/security-false/client/client.gen.ts | 5 +- .../3.0.x/security-false/client/utils.gen.ts | 14 +- .../security-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../security-http-bearer/client/client.gen.ts | 5 +- .../security-http-bearer/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../security-oauth2/client/client.gen.ts | 5 +- .../3.0.x/security-oauth2/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.0.x/servers/client/client.gen.ts | 5 +- .../3.0.x/servers/client/utils.gen.ts | 14 +- .../3.0.x/servers/core/pathSerializer.gen.ts | 12 - .../servers/core/queryKeySerializer.gen.ts | 4 - .../transformers-all-of/client/client.gen.ts | 5 +- .../transformers-all-of/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../transformers-array/client/client.gen.ts | 5 +- .../transformers-array/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../transforms-read-write/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/utils.gen.ts | 15 +- .../base-url-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/utils.gen.ts | 15 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/utils.gen.ts | 15 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/utils.gen.ts | 15 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../clean-false/client/client.gen.ts | 5 +- .../clean-false/client/utils.gen.ts | 15 +- .../clean-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../default/client/client.gen.ts | 5 +- .../default/client/utils.gen.ts | 15 +- .../default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 15 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/utils.gen.ts | 15 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/utils.gen.ts | 15 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/utils.gen.ts | 15 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/utils.gen.ts | 15 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/utils.gen.ts | 14 +- .../base-url-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../clean-false/client/client.gen.ts | 5 +- .../clean-false/client/utils.gen.ts | 14 +- .../clean-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client-axios/default/client/client.gen.ts | 5 +- .../client-axios/default/client/utils.gen.ts | 14 +- .../default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/utils.gen.ts | 14 +- .../base-url-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../clean-false/client/client.gen.ts | 5 +- .../clean-false/client/utils.gen.ts | 14 +- .../clean-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client-fetch/default/client/client.gen.ts | 5 +- .../client-fetch/default/client/utils.gen.ts | 14 +- .../default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/utils.gen.ts | 14 +- .../base-url-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../clean-false/client/client.gen.ts | 5 +- .../client-ky/clean-false/client/utils.gen.ts | 14 +- .../clean-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client-ky/default/client/client.gen.ts | 5 +- .../client-ky/default/client/utils.gen.ts | 14 +- .../default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/utils.gen.ts | 14 +- .../base-url-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../clean-false/client/client.gen.ts | 5 +- .../clean-false/client/utils.gen.ts | 14 +- .../clean-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client-next/default/client/client.gen.ts | 5 +- .../client-next/default/client/utils.gen.ts | 14 +- .../default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-false/client/client.gen.ts | 13 +- .../base-url-false/client/utils.gen.ts | 14 +- .../base-url-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-number/client/client.gen.ts | 13 +- .../base-url-number/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-strict/client/client.gen.ts | 13 +- .../base-url-strict/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-string/client/client.gen.ts | 13 +- .../base-url-string/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../clean-false/client/client.gen.ts | 13 +- .../clean-false/client/utils.gen.ts | 14 +- .../clean-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client-nuxt/clean-false/sdk.gen.ts | 2 +- .../client-nuxt/default/client/client.gen.ts | 13 +- .../client-nuxt/default/client/utils.gen.ts | 14 +- .../default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../@hey-api/client-nuxt/default/sdk.gen.ts | 202 ----------------- .../client/client.gen.ts | 13 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../import-file-extension-ts/sdk.gen.ts | 211 ------------------ .../sdk-client-optional/client/client.gen.ts | 13 +- .../sdk-client-optional/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-optional/sdk.gen.ts | 204 +---------------- .../sdk-client-required/client/client.gen.ts | 13 +- .../sdk-client-required/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-required/sdk.gen.ts | 211 ------------------ .../tsconfig-node16-sdk/client/client.gen.ts | 13 +- .../tsconfig-node16-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../tsconfig-node16-sdk/sdk.gen.ts | 211 ------------------ .../client/client.gen.ts | 13 +- .../tsconfig-nodenext-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../tsconfig-nodenext-sdk/sdk.gen.ts | 211 ------------------ .../base-url-false/client/client.gen.ts | 5 +- .../base-url-false/client/utils.gen.ts | 14 +- .../base-url-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-number/client/client.gen.ts | 5 +- .../base-url-number/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-strict/client/client.gen.ts | 5 +- .../base-url-strict/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../base-url-string/client/client.gen.ts | 5 +- .../base-url-string/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../clean-false/client/client.gen.ts | 5 +- .../clean-false/client/utils.gen.ts | 14 +- .../clean-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../default/client/client.gen.ts | 5 +- .../client-ofetch/default/client/utils.gen.ts | 14 +- .../default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-optional/client/client.gen.ts | 5 +- .../sdk-client-optional/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-client-required/client/client.gen.ts | 5 +- .../sdk-client-required/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../tsconfig-node16-sdk/client/client.gen.ts | 5 +- .../tsconfig-node16-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../tsconfig-nodenext-sdk/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.1.x/content-types/client/client.gen.ts | 5 +- .../3.1.x/content-types/client/utils.gen.ts | 14 +- .../content-types/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.1.x/headers/client/client.gen.ts | 5 +- .../3.1.x/headers/client/utils.gen.ts | 14 +- .../3.1.x/headers/core/pathSerializer.gen.ts | 12 - .../headers/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../common/default-class/client/client.gen.ts | 5 +- .../common/default-class/client/utils.gen.ts | 15 +- .../default-class/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../common/default/client/client.gen.ts | 5 +- .../common/default/client/utils.gen.ts | 15 +- .../common/default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../sdk-nested-classes/client/client.gen.ts | 5 +- .../sdk-nested-classes/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../@hey-api/sdk/default/client/client.gen.ts | 5 +- .../@hey-api/sdk/default/client/utils.gen.ts | 14 +- .../sdk/default/core/pathSerializer.gen.ts | 12 - .../default/core/queryKeySerializer.gen.ts | 4 - .../sdk/instance/client/client.gen.ts | 5 +- .../@hey-api/sdk/instance/client/utils.gen.ts | 14 +- .../sdk/instance/core/pathSerializer.gen.ts | 12 - .../instance/core/queryKeySerializer.gen.ts | 4 - .../sdk/throwOnError/client/client.gen.ts | 5 +- .../sdk/throwOnError/client/utils.gen.ts | 14 +- .../throwOnError/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../colada/asClass/client/client.gen.ts | 5 +- .../@pinia/colada/asClass/client/utils.gen.ts | 14 +- .../colada/asClass/core/pathSerializer.gen.ts | 12 - .../asClass/core/queryKeySerializer.gen.ts | 4 - .../@pinia/colada/fetch/client/client.gen.ts | 5 +- .../@pinia/colada/fetch/client/utils.gen.ts | 14 +- .../colada/fetch/core/pathSerializer.gen.ts | 12 - .../fetch/core/queryKeySerializer.gen.ts | 4 - .../security-api-key/client/client.gen.ts | 5 +- .../security-api-key/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.1.x/security-false/client/client.gen.ts | 5 +- .../3.1.x/security-false/client/utils.gen.ts | 14 +- .../security-false/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../security-http-bearer/client/client.gen.ts | 5 +- .../security-http-bearer/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../security-oauth2/client/client.gen.ts | 5 +- .../3.1.x/security-oauth2/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.1.x/servers/client/client.gen.ts | 5 +- .../3.1.x/servers/client/utils.gen.ts | 14 +- .../3.1.x/servers/core/pathSerializer.gen.ts | 12 - .../servers/core/queryKeySerializer.gen.ts | 4 - .../3.1.x/sse-angular/client/client.gen.ts | 5 +- .../3.1.x/sse-angular/client/utils.gen.ts | 15 +- .../sse-angular/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.1.x/sse-axios/client/client.gen.ts | 5 +- .../3.1.x/sse-axios/client/utils.gen.ts | 14 +- .../sse-axios/core/pathSerializer.gen.ts | 12 - .../sse-axios/core/queryKeySerializer.gen.ts | 4 - .../3.1.x/sse-fetch/client/client.gen.ts | 5 +- .../3.1.x/sse-fetch/client/utils.gen.ts | 14 +- .../sse-fetch/core/pathSerializer.gen.ts | 12 - .../sse-fetch/core/queryKeySerializer.gen.ts | 4 - .../3.1.x/sse-next/client/client.gen.ts | 5 +- .../3.1.x/sse-next/client/utils.gen.ts | 14 +- .../3.1.x/sse-next/core/pathSerializer.gen.ts | 12 - .../sse-next/core/queryKeySerializer.gen.ts | 4 - .../3.1.x/sse-nuxt/client/client.gen.ts | 13 +- .../3.1.x/sse-nuxt/client/utils.gen.ts | 14 +- .../3.1.x/sse-nuxt/core/pathSerializer.gen.ts | 12 - .../sse-nuxt/core/queryKeySerializer.gen.ts | 4 - .../__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts | 16 -- .../3.1.x/sse-ofetch/client/client.gen.ts | 5 +- .../3.1.x/sse-ofetch/client/utils.gen.ts | 14 +- .../sse-ofetch/core/pathSerializer.gen.ts | 12 - .../sse-ofetch/core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../transformers-all-of/client/client.gen.ts | 5 +- .../transformers-all-of/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../transformers-array/client/client.gen.ts | 5 +- .../transformers-array/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../transforms-read-write/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../class/client/client.gen.ts | 5 +- .../class/client/utils.gen.ts | 14 +- .../class/core/pathSerializer.gen.ts | 12 - .../class/core/queryKeySerializer.gen.ts | 4 - .../flat/client/client.gen.ts | 5 +- .../flat/client/utils.gen.ts | 14 +- .../flat/core/pathSerializer.gen.ts | 12 - .../flat/core/queryKeySerializer.gen.ts | 4 - .../instance/client/client.gen.ts | 5 +- .../instance/client/utils.gen.ts | 14 +- .../instance/core/pathSerializer.gen.ts | 12 - .../instance/core/queryKeySerializer.gen.ts | 4 - .../opencode/export-all/client/client.gen.ts | 5 +- .../opencode/export-all/client/utils.gen.ts | 14 +- .../export-all/core/pathSerializer.gen.ts | 12 - .../export-all/core/queryKeySerializer.gen.ts | 4 - .../opencode/flat/client/client.gen.ts | 5 +- .../opencode/flat/client/utils.gen.ts | 14 +- .../opencode/flat/core/pathSerializer.gen.ts | 12 - .../flat/core/queryKeySerializer.gen.ts | 2 +- .../opencode/grouped/client/client.gen.ts | 5 +- .../opencode/grouped/client/utils.gen.ts | 14 +- .../grouped/core/pathSerializer.gen.ts | 12 - .../grouped/core/queryKeySerializer.gen.ts | 4 - .../plugins/asClass/client/client.gen.ts | 5 +- .../2.0.x/plugins/asClass/client/utils.gen.ts | 14 +- .../asClass/core/pathSerializer.gen.ts | 12 - .../asClass/core/queryKeySerializer.gen.ts | 4 - .../2.0.x/plugins/axios/client/client.gen.ts | 5 +- .../2.0.x/plugins/axios/client/utils.gen.ts | 14 +- .../plugins/axios/core/pathSerializer.gen.ts | 12 - .../axios/core/queryKeySerializer.gen.ts | 4 - .../2.0.x/plugins/fetch/client/client.gen.ts | 5 +- .../2.0.x/plugins/fetch/client/utils.gen.ts | 14 +- .../plugins/fetch/core/pathSerializer.gen.ts | 12 - .../fetch/core/queryKeySerializer.gen.ts | 4 - .../full-config/@tanstack/react-query.gen.ts | 129 +++++++++-- .../plugins/full-config/client/client.gen.ts | 5 +- .../plugins/full-config/client/utils.gen.ts | 14 +- .../full-config/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../plugins/name-builder/client/client.gen.ts | 5 +- .../plugins/name-builder/client/utils.gen.ts | 14 +- .../name-builder/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../plugins/asClass/client/client.gen.ts | 5 +- .../3.0.x/plugins/asClass/client/utils.gen.ts | 14 +- .../asClass/core/pathSerializer.gen.ts | 12 - .../asClass/core/queryKeySerializer.gen.ts | 4 - .../3.0.x/plugins/axios/client/client.gen.ts | 5 +- .../3.0.x/plugins/axios/client/utils.gen.ts | 14 +- .../plugins/axios/core/pathSerializer.gen.ts | 12 - .../axios/core/queryKeySerializer.gen.ts | 4 - .../3.0.x/plugins/fetch/client/client.gen.ts | 5 +- .../3.0.x/plugins/fetch/client/utils.gen.ts | 14 +- .../plugins/fetch/core/pathSerializer.gen.ts | 12 - .../fetch/core/queryKeySerializer.gen.ts | 4 - .../full-config/@tanstack/react-query.gen.ts | 174 ++++++++++++--- .../plugins/full-config/client/client.gen.ts | 5 +- .../plugins/full-config/client/utils.gen.ts | 14 +- .../full-config/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../plugins/name-builder/client/client.gen.ts | 5 +- .../plugins/name-builder/client/utils.gen.ts | 14 +- .../name-builder/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../preact-query/client/client.gen.ts | 5 +- .../preact-query/client/utils.gen.ts | 14 +- .../preact-query/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../react-query/client/client.gen.ts | 5 +- .../react-query/client/utils.gen.ts | 14 +- .../react-query/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../solid-query/client/client.gen.ts | 5 +- .../solid-query/client/utils.gen.ts | 14 +- .../solid-query/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../svelte-query/client/client.gen.ts | 5 +- .../svelte-query/client/utils.gen.ts | 14 +- .../svelte-query/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../vue-query/client/client.gen.ts | 5 +- .../vue-query/client/utils.gen.ts | 14 +- .../vue-query/core/pathSerializer.gen.ts | 12 - .../vue-query/core/queryKeySerializer.gen.ts | 4 - .../3.1.x/pagination-ref/client/client.gen.ts | 5 +- .../3.1.x/pagination-ref/client/utils.gen.ts | 14 +- .../pagination-ref/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../plugins/asClass/client/client.gen.ts | 5 +- .../3.1.x/plugins/asClass/client/utils.gen.ts | 14 +- .../asClass/core/pathSerializer.gen.ts | 12 - .../asClass/core/queryKeySerializer.gen.ts | 4 - .../3.1.x/plugins/axios/client/client.gen.ts | 5 +- .../3.1.x/plugins/axios/client/utils.gen.ts | 14 +- .../plugins/axios/core/pathSerializer.gen.ts | 12 - .../axios/core/queryKeySerializer.gen.ts | 4 - .../3.1.x/plugins/fetch/client/client.gen.ts | 5 +- .../3.1.x/plugins/fetch/client/utils.gen.ts | 14 +- .../plugins/fetch/core/pathSerializer.gen.ts | 12 - .../fetch/core/queryKeySerializer.gen.ts | 4 - .../full-config/@tanstack/react-query.gen.ts | 174 ++++++++++++--- .../plugins/full-config/client/client.gen.ts | 5 +- .../plugins/full-config/client/utils.gen.ts | 14 +- .../full-config/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../plugins/name-builder/client/client.gen.ts | 5 +- .../plugins/name-builder/client/utils.gen.ts | 14 +- .../name-builder/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../@tanstack/react-query.gen.ts | 2 +- .../client/client.gen.ts | 5 +- .../client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 6 +- .../core/queryKeySerializer.gen.ts | 2 +- .../sse-react-query/client/client.gen.ts | 5 +- .../3.1.x/sse-react-query/client/utils.gen.ts | 14 +- .../core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.1.x/type-format/client/client.gen.ts | 5 +- .../3.1.x/type-format/client/utils.gen.ts | 14 +- .../type-format/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.1.x/type-format/sdk.gen.ts | 2 +- .../3.1.x/webhooks/valibot.gen.ts | 16 +- .../mini/type-format/client/client.gen.ts | 5 +- .../mini/type-format/client/utils.gen.ts | 14 +- .../type-format/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../2.0.x/v3/type-format/client/client.gen.ts | 5 +- .../2.0.x/v3/type-format/client/utils.gen.ts | 14 +- .../v3/type-format/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../2.0.x/v4/type-format/client/client.gen.ts | 5 +- .../2.0.x/v4/type-format/client/utils.gen.ts | 14 +- .../v4/type-format/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../mini/type-format/client/client.gen.ts | 5 +- .../mini/type-format/client/utils.gen.ts | 14 +- .../type-format/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.0.x/v3/type-format/client/client.gen.ts | 5 +- .../3.0.x/v3/type-format/client/utils.gen.ts | 14 +- .../v3/type-format/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.0.x/v4/type-format/client/client.gen.ts | 5 +- .../3.0.x/v4/type-format/client/utils.gen.ts | 14 +- .../v4/type-format/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../mini/transformer/client/client.gen.ts | 5 +- .../mini/transformer/client/utils.gen.ts | 14 +- .../transformer/core/pathSerializer.gen.ts | 6 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/mini/transformer/sdk.gen.ts | 2 +- .../mini/type-format/client/client.gen.ts | 5 +- .../mini/type-format/client/utils.gen.ts | 14 +- .../type-format/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.1.x/v3/transformer/client/client.gen.ts | 5 +- .../3.1.x/v3/transformer/client/utils.gen.ts | 14 +- .../v3/transformer/core/pathSerializer.gen.ts | 6 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/v3/transformer/sdk.gen.ts | 2 +- .../3.1.x/v3/type-format/client/client.gen.ts | 5 +- .../3.1.x/v3/type-format/client/utils.gen.ts | 14 +- .../v3/type-format/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../3.1.x/v4/transformer/client/client.gen.ts | 5 +- .../3.1.x/v4/transformer/client/utils.gen.ts | 14 +- .../v4/transformer/core/pathSerializer.gen.ts | 6 +- .../core/queryKeySerializer.gen.ts | 2 +- .../3.1.x/v4/transformer/sdk.gen.ts | 2 +- .../3.1.x/v4/type-format/client/client.gen.ts | 5 +- .../3.1.x/v4/type-format/client/utils.gen.ts | 14 +- .../v4/type-format/core/pathSerializer.gen.ts | 12 - .../core/queryKeySerializer.gen.ts | 4 - .../plugins/@hey-api/sdk/shared/operation.ts | 25 ++- .../src/plugins/@hey-api/sdk/v1/node.ts | 2 +- 866 files changed, 2007 insertions(+), 7235 deletions(-) diff --git a/examples/openapi-ts-angular-common/src/client/client/utils.gen.ts b/examples/openapi-ts-angular-common/src/client/client/utils.gen.ts index 2b4b8bfc2d..fe1dd99896 100644 --- a/examples/openapi-ts-angular-common/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-angular-common/src/client/client/utils.gen.ts @@ -179,22 +179,12 @@ export const getParseAs = ( return; }; -<<<<<<< HEAD export async function setAuthParams( options: Pick & { headers: HttpHeaders; }, ): Promise { for (const auth of options.security ?? []) { -======= -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) const token = await getAuthToken(auth, options.auth); if (!token) { diff --git a/examples/openapi-ts-angular/src/client/client/utils.gen.ts b/examples/openapi-ts-angular/src/client/client/utils.gen.ts index 2b4b8bfc2d..fe1dd99896 100644 --- a/examples/openapi-ts-angular/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-angular/src/client/client/utils.gen.ts @@ -179,22 +179,12 @@ export const getParseAs = ( return; }; -<<<<<<< HEAD export async function setAuthParams( options: Pick & { headers: HttpHeaders; }, ): Promise { for (const auth of options.security ?? []) { -======= -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) const token = await getAuthToken(auth, options.auth); if (!token) { diff --git a/examples/openapi-ts-axios/src/client/client/utils.gen.ts b/examples/openapi-ts-axios/src/client/client/utils.gen.ts index ff959dfa79..6b0faec428 100644 --- a/examples/openapi-ts-axios/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-axios/src/client/client/utils.gen.ts @@ -86,14 +86,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Record; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-fastify/src/client/client/utils.gen.ts b/examples/openapi-ts-fastify/src/client/client/utils.gen.ts index 0499cf988a..d4a728438a 100644 --- a/examples/openapi-ts-fastify/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-fastify/src/client/client/utils.gen.ts @@ -121,14 +121,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-fetch/src/client/client/utils.gen.ts b/examples/openapi-ts-fetch/src/client/client/utils.gen.ts index 0499cf988a..d4a728438a 100644 --- a/examples/openapi-ts-fetch/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-fetch/src/client/client/utils.gen.ts @@ -121,14 +121,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-ky/src/client/client/utils.gen.ts b/examples/openapi-ts-ky/src/client/client/utils.gen.ts index 154171c46f..42c41fbb76 100644 --- a/examples/openapi-ts-ky/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-ky/src/client/client/utils.gen.ts @@ -119,14 +119,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-nestjs/src/client/client/utils.gen.ts b/examples/openapi-ts-nestjs/src/client/client/utils.gen.ts index 0499cf988a..d4a728438a 100644 --- a/examples/openapi-ts-nestjs/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-nestjs/src/client/client/utils.gen.ts @@ -121,14 +121,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-next/src/client/client/utils.gen.ts b/examples/openapi-ts-next/src/client/client/utils.gen.ts index 9d8699889c..17e6a692f4 100644 --- a/examples/openapi-ts-next/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-next/src/client/client/utils.gen.ts @@ -198,14 +198,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-ofetch/src/client/client/utils.gen.ts b/examples/openapi-ts-ofetch/src/client/client/utils.gen.ts index 4a14d746f5..5c46c75617 100644 --- a/examples/openapi-ts-ofetch/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-ofetch/src/client/client/utils.gen.ts @@ -152,14 +152,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-openai/src/client/client/utils.gen.ts b/examples/openapi-ts-openai/src/client/client/utils.gen.ts index 0499cf988a..d4a728438a 100644 --- a/examples/openapi-ts-openai/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-openai/src/client/client/utils.gen.ts @@ -121,14 +121,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-pinia-colada/src/client/client/utils.gen.ts b/examples/openapi-ts-pinia-colada/src/client/client/utils.gen.ts index 0499cf988a..d4a728438a 100644 --- a/examples/openapi-ts-pinia-colada/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-pinia-colada/src/client/client/utils.gen.ts @@ -121,14 +121,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/utils.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/utils.gen.ts index 2b4b8bfc2d..fe1dd99896 100644 --- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/utils.gen.ts @@ -179,22 +179,12 @@ export const getParseAs = ( return; }; -<<<<<<< HEAD export async function setAuthParams( options: Pick & { headers: HttpHeaders; }, ): Promise { for (const auth of options.security ?? []) { -======= -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) const token = await getAuthToken(auth, options.auth); if (!token) { diff --git a/examples/openapi-ts-tanstack-react-query/src/client/client/utils.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/client/utils.gen.ts index 0499cf988a..d4a728438a 100644 --- a/examples/openapi-ts-tanstack-react-query/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-tanstack-react-query/src/client/client/utils.gen.ts @@ -121,14 +121,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/client/utils.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/client/utils.gen.ts index 0499cf988a..d4a728438a 100644 --- a/examples/openapi-ts-tanstack-svelte-query/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-tanstack-svelte-query/src/client/client/utils.gen.ts @@ -121,14 +121,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/client/utils.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/client/utils.gen.ts index 0499cf988a..d4a728438a 100644 --- a/examples/openapi-ts-tanstack-vue-query/src/client/client/utils.gen.ts +++ b/examples/openapi-ts-tanstack-vue-query/src/client/client/utils.gen.ts @@ -121,14 +121,9 @@ const checkForExistence = ( export async function setAuthParams( options: Pick & { headers: Headers; -<<<<<<< HEAD }, ): Promise { for (const auth of options.security ?? []) { -======= - }): Promise => { - for (const auth of security) { ->>>>>>> f77da83ab (FEATURE-3879: added support for typescript isolatedDeclarations) if (checkForExistence(options, auth.name)) { continue; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/pathSerializer.gen.ts index fab1ed4b98..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/pathSerializer.gen.ts @@ -25,7 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { +export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'label': return '.'; @@ -38,7 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ' } }; -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { +export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { switch (style) { case 'form': return ','; @@ -51,7 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | } }; -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { +export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-binary-format/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts index 8ffffba628..2239bbe6f7 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/utils.gen.ts index 8a2106dfe3..f9a835804d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts index 4b2e2fa828..d78f57f48a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/utils.gen.ts index bea872c108..bf1652174e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts index 4b2e2fa828..d78f57f48a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/utils.gen.ts index bea872c108..bf1652174e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/client.gen.ts index 50e4640cff..6c8585d0e2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/utils.gen.ts index 4faca05a23..67819a8c25 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/client.gen.ts index 671cdffe1e..25df9d7254 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/utils.gen.ts index 7d7aed1e0a..99a0c096fd 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/client.gen.ts index 671cdffe1e..25df9d7254 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/utils.gen.ts index 7d7aed1e0a..99a0c096fd 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/client.gen.ts index dee85512ed..b845993079 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/utils.gen.ts index 3da3c79c2d..17a3cf70ae 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/client.gen.ts index f8b5032ab4..f3c1fa9b8d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/utils.gen.ts index e40240758b..af43c0d036 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/client.gen.ts index f8b5032ab4..f3c1fa9b8d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/utils.gen.ts index e40240758b..af43c0d036 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/client.gen.ts index 6c1a6c4a08..6d0f8e60bc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/utils.gen.ts index 37d079334d..42c41fbb76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/client.gen.ts index 6c1a6c4a08..6d0f8e60bc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/utils.gen.ts index 37d079334d..42c41fbb76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-number/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/client.gen.ts index 6c1a6c4a08..6d0f8e60bc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/utils.gen.ts index 37d079334d..42c41fbb76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/client.gen.ts index 6c1a6c4a08..6d0f8e60bc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/utils.gen.ts index 37d079334d..42c41fbb76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/base-url-string/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/client.gen.ts index 6c1a6c4a08..6d0f8e60bc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/utils.gen.ts index 37d079334d..42c41fbb76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/clean-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/client.gen.ts index 6c1a6c4a08..6d0f8e60bc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/utils.gen.ts index 37d079334d..42c41fbb76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/client.gen.ts index f00d12648a..7fb562ca8d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/utils.gen.ts index 08504ab260..a0d0fc34f3 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/client.gen.ts index 6c1a6c4a08..6d0f8e60bc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/utils.gen.ts index 37d079334d..42c41fbb76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/client.gen.ts index 6c1a6c4a08..6d0f8e60bc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/utils.gen.ts index 37d079334d..42c41fbb76 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/client.gen.ts index 25e51dc170..e80dbeb097 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/utils.gen.ts index 633bde5c85..655af77316 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/client.gen.ts index 25e51dc170..e80dbeb097 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/client.gen.ts @@ -52,10 +52,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/utils.gen.ts index 633bde5c85..655af77316 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -116,14 +116,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -152,7 +150,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ky/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/client.gen.ts index 1e8882f023..5e7ac14691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/utils.gen.ts index c34b11e5a1..998513234d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/client.gen.ts index 1e8882f023..5e7ac14691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/utils.gen.ts index c34b11e5a1..998513234d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/client.gen.ts index 1e8882f023..5e7ac14691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/utils.gen.ts index c34b11e5a1..998513234d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/client.gen.ts index 1e8882f023..5e7ac14691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/utils.gen.ts index c34b11e5a1..998513234d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/client.gen.ts index 1e8882f023..5e7ac14691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/utils.gen.ts index c34b11e5a1..998513234d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/clean-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/client.gen.ts index 1e8882f023..5e7ac14691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/utils.gen.ts index c34b11e5a1..998513234d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/client.gen.ts index 465230e975..6ab5c8aa47 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/utils.gen.ts index c34ec961b6..863f83dd45 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/client.gen.ts index 1e8882f023..5e7ac14691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/utils.gen.ts index c34b11e5a1..998513234d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/client.gen.ts index 1e8882f023..5e7ac14691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/utils.gen.ts index c34b11e5a1..998513234d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/client.gen.ts index fe58f5be3a..5beaa4194c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/utils.gen.ts index fcea84a47e..2388d813ce 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/client.gen.ts index fe58f5be3a..5beaa4194c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/utils.gen.ts index fcea84a47e..2388d813ce 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/client.gen.ts index 2bb44b288f..46e7a8a77a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/utils.gen.ts index c131ed0046..7b0038439f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/client.gen.ts index 2bb44b288f..46e7a8a77a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/utils.gen.ts index c131ed0046..7b0038439f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/client.gen.ts index 2bb44b288f..46e7a8a77a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/utils.gen.ts index c131ed0046..7b0038439f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/client.gen.ts index 2bb44b288f..46e7a8a77a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/utils.gen.ts index c131ed0046..7b0038439f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/client.gen.ts index 2bb44b288f..46e7a8a77a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/utils.gen.ts index c131ed0046..7b0038439f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts index d40701d3a6..e755a1776f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/clean-false/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, type RequestResult, urlSearchParamsBodySerializer } from './client'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/client.gen.ts index 2bb44b288f..46e7a8a77a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/utils.gen.ts index c131ed0046..7b0038439f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts index 43d296990e..6831ba331c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/sdk.gen.ts @@ -18,27 +18,11 @@ export type Options; }; -<<<<<<< HEAD -<<<<<<< HEAD -export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); - -export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); - -export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -======= export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -<<<<<<< HEAD -export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const import_ = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -47,36 +31,7 @@ export const import_ = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); - -export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); - -export const getApiVbyApiVersionSimpleOperation = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); - -export const deleteCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); - -export const getCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); - -export const headCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); - -export const optionsCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); - -export const patchCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); - -export const postCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); - -export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); - -export const deleteFoo = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); - -export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); -======= -export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -======= export const fooWow = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); @@ -98,31 +53,14 @@ export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); -<<<<<<< HEAD -export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ -<<<<<<< HEAD -<<<<<<< HEAD -export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -131,15 +69,7 @@ export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -148,15 +78,7 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).get({ -======= -export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -165,15 +87,7 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -182,15 +96,7 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -199,15 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -217,46 +115,7 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); - -export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); - -export const callToTestOrderOfParams = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); - -export const duplicateName = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName2 = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName3 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName4 = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); - -export const callWithNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); - -export const callWithResponseAndNoContentResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); - -export const dummyA = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); - -export const dummyB = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); - -export const callWithResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); - -export const callWithDuplicateResponses = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); - -export const callWithResponses = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); - -export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); - -export const types = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); - -export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -======= export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); @@ -288,12 +147,7 @@ export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); -<<<<<<< HEAD -export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const uploadFile = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -303,41 +157,17 @@ export const uploadFile = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ -======= -export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); export const complexTypes = (options: Options) => (options.client ?? client).get({ ->>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -<<<<<<< HEAD -<<<<<<< HEAD -export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); export const multipartRequest = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -347,15 +177,7 @@ export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).put({ -======= -export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const complexParams = (options: Options) => (options.client ?? client).put({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -364,40 +186,16 @@ export const complexParams = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); - -export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); - -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); -======= -export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -======= export const callWithResultFromHeader = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); -<<<<<<< HEAD -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ -<<<<<<< HEAD -<<<<<<< HEAD -export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ -======= -export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/client.gen.ts index 315c53a1e3..87e2bb604d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/utils.gen.ts index 0a46cde977..b61044f28d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts index f60b3e77db..7e4bc91c88 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/import-file-extension-ts/sdk.gen.ts @@ -1,17 +1,8 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.ts'; -<<<<<<< HEAD import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; -<<<<<<< HEAD import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.ts'; -======= -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen.ts'; ->>>>>>> 4a5f34551 (updated test snapshots) -======= -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.ts'; -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.ts'; ->>>>>>> d54cb4956 (ignored nuxt client) export type Options = Options2 & { /** @@ -27,27 +18,11 @@ export type Options; }; -<<<<<<< HEAD -<<<<<<< HEAD export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -======= -export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); - -<<<<<<< HEAD -export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const import_ = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -56,8 +31,6 @@ export const import_ = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); @@ -81,57 +54,13 @@ export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); -======= -export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -======= -export const fooWow = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); - -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); - -export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); - -export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); - -export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); - -export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); - -export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); - -export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); - -export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); - -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); - -<<<<<<< HEAD -export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ -<<<<<<< HEAD -<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -140,15 +69,7 @@ export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -157,15 +78,7 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).get({ -======= -export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -174,15 +87,7 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -191,15 +96,7 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -208,15 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -226,8 +115,6 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); @@ -261,48 +148,6 @@ export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -======= -export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); - -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); - -export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); - -export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); - -export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); - -export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); - -export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); - -export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); - -export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); - -export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); - -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); - -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); - -<<<<<<< HEAD -export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const uploadFile = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -312,41 +157,17 @@ export const uploadFile = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ -======= -export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options) => (options.client ?? client).get({ ->>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -<<<<<<< HEAD -<<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -356,15 +177,7 @@ export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).put({ -======= -export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const complexParams = (options: Options) => (options.client ?? client).put({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -373,40 +186,16 @@ export const complexParams = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); -======= -export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -======= -export const callWithResultFromHeader = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); - -<<<<<<< HEAD -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ -<<<<<<< HEAD -<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ -======= -export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/client.gen.ts index 2bb44b288f..46e7a8a77a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/utils.gen.ts index c131ed0046..7b0038439f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts index 43d296990e..e755a1776f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/sdk.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; +import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; import { client } from './client.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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'; @@ -18,27 +18,11 @@ export type Options; }; -<<<<<<< HEAD -<<<<<<< HEAD export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -======= -export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); - -<<<<<<< HEAD -export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const import_ = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -47,8 +31,6 @@ export const import_ = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); @@ -72,57 +54,13 @@ export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); -======= -export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -======= -export const fooWow = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); - -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); - -export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); - -export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); - -export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); - -export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); - -export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); - -export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); - -export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); - -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); - -<<<<<<< HEAD -export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ -<<<<<<< HEAD -<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -131,15 +69,7 @@ export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -148,15 +78,7 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).get({ -======= -export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -165,15 +87,7 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -182,15 +96,7 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -199,15 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -217,8 +115,6 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); @@ -252,48 +148,6 @@ export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -======= -export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); - -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); - -export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); - -export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); - -export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); - -export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); - -export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); - -export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); - -export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); - -export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); - -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); - -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); - -<<<<<<< HEAD -export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const uploadFile = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -303,41 +157,17 @@ export const uploadFile = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ -======= -export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options) => (options.client ?? client).get({ ->>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -<<<<<<< HEAD -<<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -347,15 +177,7 @@ export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).put({ -======= -export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const complexParams = (options: Options) => (options.client ?? client).put({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -364,40 +186,16 @@ export const complexParams = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); -======= -export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -======= -export const callWithResultFromHeader = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); - -<<<<<<< HEAD -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ -<<<<<<< HEAD -<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ -======= -export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/client.gen.ts index 2bb44b288f..46e7a8a77a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/utils.gen.ts index c131ed0046..7b0038439f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts index 6a6dd165b0..059f33a403 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts @@ -1,16 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client'; -<<<<<<< HEAD import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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'; -======= -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen'; ->>>>>>> 4a5f34551 (updated test snapshots) -======= -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client'; -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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'; ->>>>>>> d54cb4956 (ignored nuxt client) export type Options = Options2 & { /** @@ -26,27 +17,11 @@ export type Options; }; -<<<<<<< HEAD -<<<<<<< HEAD export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); export const import_ = (options: Options): RequestResult => options.client.post({ -======= -export const export_ = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); -======= -export const export_ = (options: Options) => options.client.get({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const patchApiVbyApiVersionNoTag = (options: Options) => options.client.patch({ url: '/api/v{api-version}/no+tag', ...options }); - -<<<<<<< HEAD -export const import_ = (options: Options): RequestResult => options.client.post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const import_ = (options: Options) => options.client.post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -55,8 +30,6 @@ export const import_ = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); export const apiVVersionODataControllerCount = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); @@ -80,57 +53,13 @@ export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); -======= -export const fooWow = (options: Options): RequestResult => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); -======= -export const fooWow = (options: Options) => options.client.put({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const apiVVersionODataControllerCount = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple/$count', ...options }); - -export const getApiVbyApiVersionSimpleOperation = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple:operation', ...options }); - -export const deleteCallWithoutParametersAndResponse = (options: Options) => options.client.delete({ url: '/api/v{api-version}/simple', ...options }); - -export const getCallWithoutParametersAndResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/simple', ...options }); - -export const headCallWithoutParametersAndResponse = (options: Options) => options.client.head({ url: '/api/v{api-version}/simple', ...options }); - -export const optionsCallWithoutParametersAndResponse = (options: Options) => options.client.options({ url: '/api/v{api-version}/simple', ...options }); - -export const patchCallWithoutParametersAndResponse = (options: Options) => options.client.patch({ url: '/api/v{api-version}/simple', ...options }); - -export const postCallWithoutParametersAndResponse = (options: Options) => options.client.post({ url: '/api/v{api-version}/simple', ...options }); - -export const putCallWithoutParametersAndResponse = (options: Options) => options.client.put({ url: '/api/v{api-version}/simple', ...options }); - -export const deleteFoo = (options: Options) => options.client.delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); - -<<<<<<< HEAD -export const callWithDescriptions = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const callWithDescriptions = (options: Options) => options.client.post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ -<<<<<<< HEAD -<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => options.client.post({ -======= -export const deprecatedCall = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options): RequestResult => options.client.post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const deprecatedCall = (options: Options) => options.client.post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options) => options.client.post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -139,15 +68,7 @@ export const callWithParameters = (options: Options): RequestResult => options.client.post({ -======= -export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const callWithWeirdParameterNames = (options: Options) => options.client.post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -156,15 +77,7 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => options.client.get({ -======= -export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const getCallWithOptionalParam = (options: Options) => options.client.get({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -173,15 +86,7 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ -======= -export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postCallWithOptionalParam = (options: Options) => options.client.post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -190,15 +95,7 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => options.client.post({ -======= -export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postApiVbyApiVersionRequestBody = (options: Options) => options.client.post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -207,15 +104,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => options.client.post({ -======= -export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postApiVbyApiVersionFormData = (options: Options) => options.client.post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -225,8 +114,6 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); export const callWithDefaultOptionalParameters = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); @@ -260,48 +147,6 @@ export const collectionFormat = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/types', ...options }); export const uploadFile = (options: Options): RequestResult => options.client.post({ -======= -export const callWithDefaultParameters = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); -======= -export const callWithDefaultParameters = (options: Options) => options.client.get({ url: '/api/v{api-version}/defaults', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const callWithDefaultOptionalParameters = (options: Options) => options.client.post({ url: '/api/v{api-version}/defaults', ...options }); - -export const callToTestOrderOfParams = (options: Options) => options.client.put({ url: '/api/v{api-version}/defaults', ...options }); - -export const duplicateName = (options: Options) => options.client.delete({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName2 = (options: Options) => options.client.get({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName3 = (options: Options) => options.client.post({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName4 = (options: Options) => options.client.put({ url: '/api/v{api-version}/duplicate', ...options }); - -export const callWithNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/no-content', ...options }); - -export const callWithResponseAndNoContentResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); - -export const dummyA = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); - -export const dummyB = (options: Options) => options.client.get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); - -export const callWithResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/response', ...options }); - -export const callWithDuplicateResponses = (options: Options) => options.client.post({ url: '/api/v{api-version}/response', ...options }); - -export const callWithResponses = (options: Options) => options.client.put({ url: '/api/v{api-version}/response', ...options }); - -export const collectionFormat = (options: Options) => options.client.get({ url: '/api/v{api-version}/collectionFormat', ...options }); - -export const types = (options: Options) => options.client.get({ url: '/api/v{api-version}/types', ...options }); - -<<<<<<< HEAD -export const uploadFile = (options: Options): RequestResult => options.client.post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const uploadFile = (options: Options) => options.client.post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -311,41 +156,17 @@ export const uploadFile = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); export const complexTypes = (options: Options): RequestResult => options.client.get({ -======= -export const fileResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options): RequestResult => options.client.get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const fileResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options) => options.client.get({ ->>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -<<<<<<< HEAD -<<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); export const multipartRequest = (options: Options): RequestResult => options.client.post({ -======= -export const multipartResponse = (options: Options): RequestResult => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options): RequestResult => options.client.post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const multipartResponse = (options: Options) => options.client.get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options) => options.client.post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -355,15 +176,7 @@ export const multipartRequest = (options: Options): RequestResult => options.client.put({ -======= -export const complexParams = (options: Options): RequestResult => options.client.put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const complexParams = (options: Options) => options.client.put({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -372,40 +185,16 @@ export const complexParams = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); export const testErrorCode = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/error', ...options }); export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); -======= -export const callWithResultFromHeader = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/header', ...options }); -======= -export const callWithResultFromHeader = (options: Options) => options.client.post({ url: '/api/v{api-version}/header', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const testErrorCode = (options: Options) => options.client.post({ url: '/api/v{api-version}/error', ...options }); - -<<<<<<< HEAD -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => options.client.post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ -<<<<<<< HEAD -<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ -======= -export const putWithFormUrlEncoded = (options: Options): RequestResult => options.client.put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const putWithFormUrlEncoded = (options: Options) => options.client.put({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/client.gen.ts index 5eadd37a84..74291d3dc9 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/utils.gen.ts index 202243f37c..51f0285a9b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts index 9b2337c15f..711f1017eb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-node16-sdk/sdk.gen.ts @@ -1,17 +1,8 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -<<<<<<< HEAD import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; -<<<<<<< HEAD import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.js'; -======= -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen.js'; ->>>>>>> 4a5f34551 (updated test snapshots) -======= -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.js'; ->>>>>>> d54cb4956 (ignored nuxt client) export type Options = Options2 & { /** @@ -27,27 +18,11 @@ export type Options; }; -<<<<<<< HEAD -<<<<<<< HEAD export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -======= -export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); - -<<<<<<< HEAD -export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const import_ = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -56,8 +31,6 @@ export const import_ = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); @@ -81,57 +54,13 @@ export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); -======= -export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -======= -export const fooWow = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); - -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); - -export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); - -export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); - -export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); - -export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); - -export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); - -export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); - -export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); - -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); - -<<<<<<< HEAD -export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ -<<<<<<< HEAD -<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -140,15 +69,7 @@ export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -157,15 +78,7 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).get({ -======= -export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -174,15 +87,7 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -191,15 +96,7 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -208,15 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -226,8 +115,6 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); @@ -261,48 +148,6 @@ export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -======= -export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); - -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); - -export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); - -export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); - -export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); - -export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); - -export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); - -export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); - -export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); - -export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); - -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); - -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); - -<<<<<<< HEAD -export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const uploadFile = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -312,41 +157,17 @@ export const uploadFile = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ -======= -export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options) => (options.client ?? client).get({ ->>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -<<<<<<< HEAD -<<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -356,15 +177,7 @@ export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).put({ -======= -export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const complexParams = (options: Options) => (options.client ?? client).put({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -373,40 +186,16 @@ export const complexParams = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); -======= -export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -======= -export const callWithResultFromHeader = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); - -<<<<<<< HEAD -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ -<<<<<<< HEAD -<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ -======= -export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/client.gen.ts index 5eadd37a84..74291d3dc9 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/utils.gen.ts index 202243f37c..51f0285a9b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts index 9b2337c15f..711f1017eb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/tsconfig-nodenext-sdk/sdk.gen.ts @@ -1,17 +1,8 @@ // This file is auto-generated by @hey-api/openapi-ts import { client } from './client.gen.js'; -<<<<<<< HEAD import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type RequestResult, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; -<<<<<<< HEAD import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.js'; -======= -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses } from './types.gen.js'; ->>>>>>> 4a5f34551 (updated test snapshots) -======= -import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client/index.js'; -import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, 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.js'; ->>>>>>> d54cb4956 (ignored nuxt client) export type Options = Options2 & { /** @@ -27,27 +18,11 @@ export type Options; }; -<<<<<<< HEAD -<<<<<<< HEAD export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); export const patchApiVbyApiVersionNoTag = (options: Options): RequestResult => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const export_ = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -======= -export const export_ = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const patchApiVbyApiVersionNoTag = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); - -<<<<<<< HEAD -export const import_ = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const import_ = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/no+tag', ...options, headers: { @@ -56,8 +31,6 @@ export const import_ = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const apiVVersionODataControllerCount = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); @@ -81,57 +54,13 @@ export const putCallWithoutParametersAndResponse = (options: Options): RequestResult => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); -======= -export const fooWow = (options: Options): RequestResult => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -======= -export const fooWow = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const apiVVersionODataControllerCount = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); - -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); - -export const deleteCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); - -export const getCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple', ...options }); - -export const headCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).head({ url: '/api/v{api-version}/simple', ...options }); - -export const optionsCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).options({ url: '/api/v{api-version}/simple', ...options }); - -export const patchCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).patch({ url: '/api/v{api-version}/simple', ...options }); - -export const postCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/simple', ...options }); - -export const putCallWithoutParametersAndResponse = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/simple', ...options }); - -export const deleteFoo = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', ...options }); - -<<<<<<< HEAD -export const callWithDescriptions = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const callWithDescriptions = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/descriptions', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * @deprecated */ -<<<<<<< HEAD -<<<<<<< HEAD export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const deprecatedCall = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const deprecatedCall = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/parameters/deprecated', ...options }); - -export const callWithParameters = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameterPath}', ...options, headers: { @@ -140,15 +69,7 @@ export const callWithParameters = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const callWithWeirdParameterNames = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', ...options, headers: { @@ -157,15 +78,7 @@ export const callWithWeirdParameterNames = (options: Options): RequestResult => (options.client ?? client).get({ -======= -export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const getCallWithOptionalParam = (options: Options) => (options.client ?? client).get({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -174,15 +87,7 @@ export const getCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postCallWithOptionalParam = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/parameters', ...options, headers: { @@ -191,15 +96,7 @@ export const postCallWithOptionalParam = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postApiVbyApiVersionRequestBody = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -208,15 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const postApiVbyApiVersionFormData = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, @@ -226,8 +115,6 @@ export const postApiVbyApiVersionFormData = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); export const callWithDefaultOptionalParameters = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); @@ -261,48 +148,6 @@ export const collectionFormat = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const callWithDefaultParameters = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); -======= -export const callWithDefaultParameters = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/defaults', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const callWithDefaultOptionalParameters = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/defaults', ...options }); - -export const callToTestOrderOfParams = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/defaults', ...options }); - -export const duplicateName = (options: Options) => (options.client ?? client).delete({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName2 = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName3 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/duplicate', ...options }); - -export const duplicateName4 = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/duplicate', ...options }); - -export const callWithNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/no-content', ...options }); - -export const callWithResponseAndNoContentResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/response-and-no-content', ...options }); - -export const dummyA = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/a', ...options }); - -export const dummyB = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multiple-tags/b', ...options }); - -export const callWithResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/response', ...options }); - -export const callWithDuplicateResponses = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/response', ...options }); - -export const callWithResponses = (options: Options) => (options.client ?? client).put({ url: '/api/v{api-version}/response', ...options }); - -export const collectionFormat = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/collectionFormat', ...options }); - -export const types = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/types', ...options }); - -<<<<<<< HEAD -export const uploadFile = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const uploadFile = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/upload', ...options, @@ -312,41 +157,17 @@ export const uploadFile = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ -======= -export const fileResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options): RequestResult => (options.client ?? client).get({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const fileResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/file/{id}', ...options }); - -export const complexTypes = (options: Options) => (options.client ?? client).get({ ->>>>>>> d54cb4956 (ignored nuxt client) querySerializer: { parameters: { parameterObject: { object: { style: 'form' } } } }, url: '/api/v{api-version}/complex', ...options }); -<<<<<<< HEAD -<<<<<<< HEAD export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ -======= -export const multipartResponse = (options: Options): RequestResult => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).post({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const multipartResponse = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/multipart', ...options }); - -export const multipartRequest = (options: Options) => (options.client ?? client).post({ ->>>>>>> d54cb4956 (ignored nuxt client) ...formDataBodySerializer, url: '/api/v{api-version}/multipart', ...options, @@ -356,15 +177,7 @@ export const multipartRequest = (options: Options): RequestResult => (options.client ?? client).put({ -======= -export const complexParams = (options: Options): RequestResult => (options.client ?? client).put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const complexParams = (options: Options) => (options.client ?? client).put({ ->>>>>>> d54cb4956 (ignored nuxt client) url: '/api/v{api-version}/complex/{id}', ...options, headers: { @@ -373,40 +186,16 @@ export const complexParams = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); export const testErrorCode = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); -======= -export const callWithResultFromHeader = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); -======= -export const callWithResultFromHeader = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/header', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) - -export const testErrorCode = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/error', ...options }); - -<<<<<<< HEAD -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options): RequestResult => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) /** * Login User */ -<<<<<<< HEAD -<<<<<<< HEAD export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ -======= -export const putWithFormUrlEncoded = (options: Options): RequestResult => (options.client ?? client).put({ ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const putWithFormUrlEncoded = (options: Options) => (options.client ?? client).put({ ->>>>>>> d54cb4956 (ignored nuxt client) ...urlSearchParamsBodySerializer, url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/client.gen.ts index 849bdb19e8..6d997f95ef 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/utils.gen.ts index 4c2116287a..5c46c75617 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/client.gen.ts index 849bdb19e8..6d997f95ef 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/utils.gen.ts index 4c2116287a..5c46c75617 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/client.gen.ts index 849bdb19e8..6d997f95ef 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/utils.gen.ts index 4c2116287a..5c46c75617 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/client.gen.ts index 849bdb19e8..6d997f95ef 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/utils.gen.ts index 4c2116287a..5c46c75617 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/client.gen.ts index 849bdb19e8..6d997f95ef 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/utils.gen.ts index 4c2116287a..5c46c75617 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/client.gen.ts index 849bdb19e8..6d997f95ef 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/utils.gen.ts index 4c2116287a..5c46c75617 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/client.gen.ts index 99995d59a6..fe583ddb70 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/utils.gen.ts index be7295de1b..636918a094 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/client.gen.ts index 849bdb19e8..6d997f95ef 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/utils.gen.ts index 4c2116287a..5c46c75617 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/client.gen.ts index 849bdb19e8..6d997f95ef 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/utils.gen.ts index 4c2116287a..5c46c75617 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/client.gen.ts index 6878e5152f..2c1a2d1b3d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/utils.gen.ts index db1e18fb69..662077b8be 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-node16-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/client.gen.ts index 6878e5152f..2c1a2d1b3d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/utils.gen.ts index db1e18fb69..662077b8be 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/content-types/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false-axios/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts index 2446e5d146..230de2cf1e 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts @@ -108,10 +108,7 @@ export const createClient = (config: Config = {}): Client => { const { opts, req, url } = requestOptions(options); if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/utils.gen.ts index 33dd0e56bb..adc95220e1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/utils.gen.ts @@ -182,13 +182,12 @@ export const getParseAs = ( return; }; -export const setAuthParams = async ( - options: Pick, 'security'> & - Pick & { - headers: HttpHeaders; - }, -): Promise => { - for (const auth of options.security) { +export async function setAuthParams( + options: Pick & { + headers: HttpHeaders; + }, +): Promise { + for (const auth of options.security ?? []) { const token = await getAuthToken(auth, options.auth); if (!token) { @@ -215,7 +214,7 @@ export const setAuthParams = async ( return; } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-axios/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/client.gen.ts index 1e8882f023..5e7ac14691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/client.gen.ts @@ -47,10 +47,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/utils.gen.ts index c34b11e5a1..998513234d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/client/utils.gen.ts @@ -198,14 +198,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -233,7 +231,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-next/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/client.gen.ts index 2bb44b288f..46e7a8a77a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/client.gen.ts @@ -40,10 +40,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { @@ -74,12 +71,16 @@ export const createClient = (config: Config = {}): Client => { opts.onRequest = [ async ({ options }) => { if (security) { - await setAuthParams({ + const authOpts: Parameters[0] = { auth: opts.auth, headers: options.headers, query: options.query, security, - }); + }; + await setAuthParams(authOpts); + if (authOpts.query !== options.query) { + options.query = authOpts.query; + } } if (requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/utils.gen.ts index c131ed0046..7b0038439f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/client/utils.gen.ts @@ -165,14 +165,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -204,7 +202,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const url = getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts index 2530acbddc..fc31bb9d40 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-nuxt/sdk.gen.ts @@ -1,14 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -<<<<<<< HEAD -<<<<<<< HEAD import type { Client, Composable, Options as Options2, RequestResult, ServerSentEventsResult, TDataShape } from './client'; -======= -import type { Client, Composable, Options as Options2, RequestResult, TDataShape } from './client'; ->>>>>>> 4a5f34551 (updated test snapshots) -======= -import type { Client, Composable, Options as Options2, TDataShape } from './client'; ->>>>>>> d54cb4956 (ignored nuxt client) import { client } from './client.gen'; import type { EventSubscribeData, EventSubscribeResponse } from './types.gen'; @@ -31,12 +23,4 @@ export type Options(options: Options): Promise>> => (options.client ?? client).sse.get({ url: '/event', ...options }); -======= -export const eventSubscribe = (options: Options): RequestResult => (options.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> 4a5f34551 (updated test snapshots) -======= -export const eventSubscribe = (options: Options) => (options.client ?? client).sse.get({ url: '/event', ...options }); ->>>>>>> d54cb4956 (ignored nuxt client) diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/client.gen.ts index 849bdb19e8..6d997f95ef 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/client.gen.ts @@ -49,10 +49,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/utils.gen.ts index 4c2116287a..5c46c75617 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/utils.gen.ts @@ -149,14 +149,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -185,7 +183,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-additional-properties/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-allof-response-wrapper/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-one-of-discriminated/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/client.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/utils.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/export-all/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/queryKeySerializer.gen.ts index 773b0650b1..531a582e69 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/core/queryKeySerializer.gen.ts @@ -14,7 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { +export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/client.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/client.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/utils.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/utils.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/asClass/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/axios/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/fetch/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/@tanstack/react-query.gen.ts index beb90989d4..592095237d 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/@tanstack/react-query.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/@tanstack/react-query.gen.ts @@ -63,6 +63,37 @@ export const useServiceWithEmptyTagSetQueryData = () => { return (options: Options | undefined, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(serviceWithEmptyTagOptions(options).queryKey, updater); }; +export type MutationKey> = [ + Pick & { + _id: string; + tags?: ReadonlyArray; + } +]; + +const createMutationKey = >(id: string, options?: TOptions, tags?: ReadonlyArray): [ + MutationKey[0] +] => { + const params: MutationKey[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl }; + if (tags) { + params.tags = tags; + } + if (options?.body) { + params.body = options.body; + } + if (options?.headers) { + params.headers = options.headers; + } + if (options?.path) { + params.path = options.path; + } + if (options?.query) { + params.query = options.query; + } + return [params]; +}; + +export const patchApiVbyApiVersionNoTagMutationKey = (options?: Partial>) => createMutationKey('patchApiVbyApiVersionNoTag', options); + export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -72,13 +103,16 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...patchApiVbyApiVersionNoTagMutation(), ...mutationOptions }); +export const fooWowMutationKey = (options?: Partial>) => createMutationKey('fooWow', options); + export const fooWowMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -88,13 +122,16 @@ export const fooWowMutation = (options?: Partial>): UseMutat throwOnError: true }); return data; - } + }, + mutationKey: fooWowMutationKey(options) }; return mutationOptions; }; export const useFooWowMutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...fooWowMutation(), ...mutationOptions }); +export const deleteCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('deleteCallWithoutParametersAndResponse', options); + export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -104,7 +141,8 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial throwOnError: true }); return data; - } + }, + mutationKey: deleteCallWithoutParametersAndResponseMutationKey(options) }; return mutationOptions; }; @@ -135,6 +173,8 @@ export const useGetCallWithoutParametersAndResponseSetQueryData = () => { return (options: Options | undefined, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(getCallWithoutParametersAndResponseOptions(options).queryKey, updater); }; +export const patchCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('patchCallWithoutParametersAndResponse', options); + export const patchCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -144,13 +184,16 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial< throwOnError: true }); return data; - } + }, + mutationKey: patchCallWithoutParametersAndResponseMutationKey(options) }; return mutationOptions; }; export const usePatchCallWithoutParametersAndResponseMutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...patchCallWithoutParametersAndResponseMutation(), ...mutationOptions }); +export const postCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('postCallWithoutParametersAndResponse', options); + export const postCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -160,13 +203,16 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...postCallWithoutParametersAndResponseMutation(), ...mutationOptions }); +export const putCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('putCallWithoutParametersAndResponse', options); + export const putCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -176,13 +222,16 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...putCallWithoutParametersAndResponseMutation(), ...mutationOptions }); +export const callWithDescriptionsMutationKey = (options?: Partial>) => createMutationKey('callWithDescriptions', options); + export const callWithDescriptionsMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -192,13 +241,16 @@ export const callWithDescriptionsMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithDescriptionsMutation(), ...mutationOptions }); +export const callWithParametersMutationKey = (options?: Partial>) => createMutationKey('callWithParameters', options); + export const callWithParametersMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -208,13 +260,16 @@ export const callWithParametersMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithParametersMutation(), ...mutationOptions }); +export const callWithWeirdParameterNamesMutationKey = (options?: Partial>) => createMutationKey('callWithWeirdParameterNames', options); + export const callWithWeirdParameterNamesMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -224,7 +279,8 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial { return (options: Options, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(callWithDefaultParametersOptions(options).queryKey, updater); }; +export const callWithDefaultOptionalParametersMutationKey = (options?: Partial>) => createMutationKey('callWithDefaultOptionalParameters', options); + export const callWithDefaultOptionalParametersMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -264,13 +322,16 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithDefaultOptionalParametersMutation(), ...mutationOptions }); +export const callToTestOrderOfParamsMutationKey = (options?: Partial>) => createMutationKey('callToTestOrderOfParams', options); + export const callToTestOrderOfParamsMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -280,13 +341,16 @@ export const callToTestOrderOfParamsMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callToTestOrderOfParamsMutation(), ...mutationOptions }); +export const duplicateNameMutationKey = (options?: Partial>) => createMutationKey('duplicateName', options); + export const duplicateNameMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -296,7 +360,8 @@ export const duplicateNameMutation = (options?: Partial { return (options: Options | undefined, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(duplicateName2Options(options).queryKey, updater); }; +export const duplicateName3MutationKey = (options?: Partial>) => createMutationKey('duplicateName3', options); + export const duplicateName3Mutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -336,13 +403,16 @@ export const duplicateName3Mutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...duplicateName3Mutation(), ...mutationOptions }); +export const duplicateName4MutationKey = (options?: Partial>) => createMutationKey('duplicateName4', options); + export const duplicateName4Mutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -352,7 +422,8 @@ export const duplicateName4Mutation = (options?: Partial { return (options: Options | undefined, updater: CallWithResponseResponse | undefined | ((old: CallWithResponseResponse | undefined) => CallWithResponseResponse | undefined)) => queryClient.setQueryData(callWithResponseOptions(options).queryKey, updater); }; +export const callWithDuplicateResponsesMutationKey = (options?: Partial>) => createMutationKey('callWithDuplicateResponses', options); + export const callWithDuplicateResponsesMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -488,13 +561,16 @@ export const callWithDuplicateResponsesMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithDuplicateResponsesMutation(), ...mutationOptions }); +export const callWithResponsesMutationKey = (options?: Partial>) => createMutationKey('callWithResponses', options); + export const callWithResponsesMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -504,7 +580,8 @@ export const callWithResponsesMutation = (options?: Partial { return (options: Options, updater: ComplexTypesResponse | undefined | ((old: ComplexTypesResponse | undefined) => ComplexTypesResponse | undefined)) => queryClient.setQueryData(complexTypesOptions(options).queryKey, updater); }; +export const callWithResultFromHeaderMutationKey = (options?: Partial>) => createMutationKey('callWithResultFromHeader', options); + export const callWithResultFromHeaderMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -592,13 +671,16 @@ export const callWithResultFromHeaderMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithResultFromHeaderMutation(), ...mutationOptions }); +export const testErrorCodeMutationKey = (options?: Partial>) => createMutationKey('testErrorCode', options); + export const testErrorCodeMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -608,13 +690,16 @@ export const testErrorCodeMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...testErrorCodeMutation(), ...mutationOptions }); +export const nonAsciiæøåÆøÅöôêÊ字符串MutationKey = (options?: Partial>) => createMutationKey('nonAsciiæøåÆøÅöôêÊ字符串', options); + export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -624,13 +709,16 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< throwOnError: true }); return data; - } + }, + mutationKey: nonAsciiæøåÆøÅöôêÊ字符串MutationKey(options) }; return mutationOptions; }; export const useNonAsciiæøåÆøÅöôêÊ字符串Mutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...nonAsciiæøåÆøÅöôêÊ字符串Mutation(), ...mutationOptions }); +export const postApiVbyApiVersionBodyMutationKey = (options?: Partial>) => createMutationKey('postApiVbyApiVersionBody', options); + /** * Body should not be unknown * @@ -645,7 +733,8 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/full-config/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/2.0.x/plugins/name-builder/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/internal-name-conflict/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/asClass/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/client.gen.ts index 4412209baf..d42045a3c2 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/client.gen.ts @@ -50,10 +50,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/utils.gen.ts index 5816078989..6b0faec428 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/client/utils.gen.ts @@ -83,14 +83,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Record; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -124,7 +122,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => { const instanceBaseUrl = options.axios?.defaults?.baseURL; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/axios/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/client.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/client.gen.ts index 377b6c9e09..fc3f037f16 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/client.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/client.gen.ts @@ -48,10 +48,7 @@ export const createClient = (config: Config = {}): Client => { }; if (opts.security) { - await setAuthParams({ - ...opts, - security: opts.security, - }); + await setAuthParams(opts); } if (opts.requestValidator) { diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/utils.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/utils.gen.ts index 25a1f0db52..d4a728438a 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/utils.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/client/utils.gen.ts @@ -118,14 +118,12 @@ const checkForExistence = ( return false; }; -export const setAuthParams = async ({ - security, - ...options -}: Pick, 'security'> & - Pick & { +export async function setAuthParams( + options: Pick & { headers: Headers; - }): Promise => { - for (const auth of security) { + }, +): Promise { + for (const auth of options.security ?? []) { if (checkForExistence(options, auth.name)) { continue; } @@ -154,7 +152,7 @@ export const setAuthParams = async ({ break; } } -}; +} export const buildUrl: Client['buildUrl'] = (options) => getUrl({ diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts index 6ad4becf93..0e534b9daf 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/pathSerializer.gen.ts @@ -25,11 +25,7 @@ interface SerializePrimitiveParam extends SerializePrimitiveOptions { value: string; } -<<<<<<< HEAD -export const separatorArrayExplode = (style: ArraySeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; @@ -42,11 +38,7 @@ export const separatorArrayExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorArrayNoExplode = (style: ArraySeparatorStyle): ',' | '|' | '%20' => { -======= export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'form': return ','; @@ -59,11 +51,7 @@ export const separatorArrayNoExplode = (style: ArraySeparatorStyle): string => { } }; -<<<<<<< HEAD -export const separatorObjectExplode = (style: ObjectSeparatorStyle): '.' | ';' | ',' | '&' => { -======= export const separatorObjectExplode = (style: ObjectSeparatorStyle): string => { ->>>>>>> 4a5f34551 (updated test snapshots) switch (style) { case 'label': return '.'; diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts index fdbb10b65f..531a582e69 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/fetch/core/queryKeySerializer.gen.ts @@ -14,11 +14,7 @@ export type JsonValue = /** * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes. */ -<<<<<<< HEAD -export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown | undefined => { -======= export const queryKeyJsonReplacer = (_key: string, value: unknown): unknown => { ->>>>>>> 4a5f34551 (updated test snapshots) if (value === undefined || typeof value === 'function' || typeof value === 'symbol') { return undefined; } diff --git a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/@tanstack/react-query.gen.ts index a20d9df7d0..58e2cb35bc 100644 --- a/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/@tanstack/react-query.gen.ts +++ b/packages/openapi-ts-tests/tanstack-query/v5/__snapshots__/3.0.x/plugins/full-config/@tanstack/react-query.gen.ts @@ -63,6 +63,37 @@ export const useExportSetQueryData = () => { return (options: Options | undefined, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(exportOptions(options).queryKey, updater); }; +export type MutationKey> = [ + Pick & { + _id: string; + tags?: ReadonlyArray; + } +]; + +const createMutationKey = >(id: string, options?: TOptions, tags?: ReadonlyArray): [ + MutationKey[0] +] => { + const params: MutationKey[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl }; + if (tags) { + params.tags = tags; + } + if (options?.body) { + params.body = options.body; + } + if (options?.headers) { + params.headers = options.headers; + } + if (options?.path) { + params.path = options.path; + } + if (options?.query) { + params.query = options.query; + } + return [params]; +}; + +export const patchApiVbyApiVersionNoTagMutationKey = (options?: Partial>) => createMutationKey('patchApiVbyApiVersionNoTag', options); + export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -72,13 +103,16 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...patchApiVbyApiVersionNoTagMutation(), ...mutationOptions }); +export const importMutationKey = (options?: Partial>) => createMutationKey('import', options); + export const importMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -88,13 +122,16 @@ export const importMutation = (options?: Partial>): UseMutat throwOnError: true }); return data; - } + }, + mutationKey: importMutationKey(options) }; return mutationOptions; }; export const useImportMutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...importMutation(), ...mutationOptions }); +export const fooWowMutationKey = (options?: Partial>) => createMutationKey('fooWow', options); + export const fooWowMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -104,7 +141,8 @@ export const fooWowMutation = (options?: Partial>): UseMutat throwOnError: true }); return data; - } + }, + mutationKey: fooWowMutationKey(options) }; return mutationOptions; }; @@ -159,6 +197,8 @@ export const useGetApiVbyApiVersionSimpleOperationSetQueryData = () => { return (options: Options, updater: GetApiVbyApiVersionSimpleOperationResponse | undefined | ((old: GetApiVbyApiVersionSimpleOperationResponse | undefined) => GetApiVbyApiVersionSimpleOperationResponse | undefined)) => queryClient.setQueryData(getApiVbyApiVersionSimpleOperationOptions(options).queryKey, updater); }; +export const deleteCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('deleteCallWithoutParametersAndResponse', options); + export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -168,7 +208,8 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial throwOnError: true }); return data; - } + }, + mutationKey: deleteCallWithoutParametersAndResponseMutationKey(options) }; return mutationOptions; }; @@ -199,6 +240,8 @@ export const useGetCallWithoutParametersAndResponseSetQueryData = () => { return (options: Options | undefined, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(getCallWithoutParametersAndResponseOptions(options).queryKey, updater); }; +export const patchCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('patchCallWithoutParametersAndResponse', options); + export const patchCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -208,13 +251,16 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial< throwOnError: true }); return data; - } + }, + mutationKey: patchCallWithoutParametersAndResponseMutationKey(options) }; return mutationOptions; }; export const usePatchCallWithoutParametersAndResponseMutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...patchCallWithoutParametersAndResponseMutation(), ...mutationOptions }); +export const postCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('postCallWithoutParametersAndResponse', options); + export const postCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -224,13 +270,16 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...postCallWithoutParametersAndResponseMutation(), ...mutationOptions }); +export const putCallWithoutParametersAndResponseMutationKey = (options?: Partial>) => createMutationKey('putCallWithoutParametersAndResponse', options); + export const putCallWithoutParametersAndResponseMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -240,13 +289,16 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...putCallWithoutParametersAndResponseMutation(), ...mutationOptions }); +export const deleteFooMutationKey = (options?: Partial>) => createMutationKey('deleteFoo', options); + export const deleteFooMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -256,13 +308,16 @@ export const deleteFooMutation = (options?: Partial>): U throwOnError: true }); return data; - } + }, + mutationKey: deleteFooMutationKey(options) }; return mutationOptions; }; export const useDeleteFooMutation = (mutationOptions?: Partial>, 'mutationFn'>>) => useMutation({ ...deleteFooMutation(), ...mutationOptions }); +export const callWithDescriptionsMutationKey = (options?: Partial>) => createMutationKey('callWithDescriptions', options); + export const callWithDescriptionsMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -272,13 +327,16 @@ export const callWithDescriptionsMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithDescriptionsMutation(), ...mutationOptions }); +export const deprecatedCallMutationKey = (options?: Partial>) => createMutationKey('deprecatedCall', options); + /** * @deprecated */ @@ -291,7 +349,8 @@ export const deprecatedCallMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...deprecatedCallMutation(), ...mutationOptions }); +export const callWithParametersMutationKey = (options?: Partial>) => createMutationKey('callWithParameters', options); + export const callWithParametersMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -310,13 +371,16 @@ export const callWithParametersMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...callWithParametersMutation(), ...mutationOptions }); +export const callWithWeirdParameterNamesMutationKey = (options?: Partial>) => createMutationKey('callWithWeirdParameterNames', options); + export const callWithWeirdParameterNamesMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -326,7 +390,8 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial { return (options: Options, updater: unknown | undefined | ((old: unknown | undefined) => unknown | undefined)) => queryClient.setQueryData(getCallWithOptionalParamOptions(options).queryKey, updater); }; +export const postCallWithOptionalParamMutationKey = (options?: Partial>) => createMutationKey('postCallWithOptionalParam', options); + export const postCallWithOptionalParamMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -419,13 +486,16 @@ export const postCallWithOptionalParamMutation = (options?: Partial>, 'mutationFn'>>) => useMutation({ ...postCallWithOptionalParamMutation(), ...mutationOptions }); +export const postApiVbyApiVersionRequestBodyMutationKey = (options?: Partial>) => createMutationKey('postApiVbyApiVersionRequestBody', options); + export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { @@ -435,13 +505,16 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial