From 4ef0c68329be9dabb9c58bb9e25cacdf12870e4a Mon Sep 17 00:00:00 2001 From: svolkov Date: Sat, 6 Mar 2021 02:00:50 +0300 Subject: [PATCH 01/10] feat: add "onFormatRouteName" hook --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 480b5cd9..328b374a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,6 +87,9 @@ Fixes: Features: - `onFormatRouteName(routeInfo: RawRouteInfo, templateRouteName: string)` hook. Allows to format route name, as you like :) +Features: +- `onFormatRouteName(routeInfo: RawRouteInfo, templateRouteName: string)` hook. Allows to format route name, as you like :) + Fixes: - Bug with wrong complex types (anyOf, oneOf, allOf) when some child schema contains only description ![example](./assets/changelog_assets/fixComplexTypeAny.jpg) From 8f08be049fd64985e1d1868c1633cee25ab61b0d Mon Sep 17 00:00:00 2001 From: svolkov Date: Sat, 6 Mar 2021 02:09:44 +0300 Subject: [PATCH 02/10] chore: try to add github workflows --- .github/workflows/blank.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/blank.yml diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml new file mode 100644 index 00000000..764d824d --- /dev/null +++ b/.github/workflows/blank.yml @@ -0,0 +1,27 @@ +name: CI + +on: + pull_request: + branches: + - next + +jobs: + test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - name: use node + uses: actions/setup-node@v1 + with: + node-version: 10 + + - name: install deps + run: npm i + + - name: simple-tests + run: npm run generate && npm run validate + + - name: specific-tests + run: npm run test-specific From c139ce5e5b69c60702238e4141b650150cf4972b Mon Sep 17 00:00:00 2001 From: svolkov Date: Sat, 6 Mar 2021 02:34:32 +0300 Subject: [PATCH 03/10] chore: rename gh workflow file to main --- .github/workflows/blank.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .github/workflows/blank.yml diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml deleted file mode 100644 index 764d824d..00000000 --- a/.github/workflows/blank.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: CI - -on: - pull_request: - branches: - - next - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - - name: use node - uses: actions/setup-node@v1 - with: - node-version: 10 - - - name: install deps - run: npm i - - - name: simple-tests - run: npm run generate && npm run validate - - - name: specific-tests - run: npm run test-specific From e20f1ad7c61daf6248fa4f324afe5fd78c1a17a3 Mon Sep 17 00:00:00 2001 From: svolkov Date: Sat, 6 Mar 2021 02:38:20 +0300 Subject: [PATCH 04/10] chore: fix changelog after rebase --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 328b374a..480b5cd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,9 +87,6 @@ Fixes: Features: - `onFormatRouteName(routeInfo: RawRouteInfo, templateRouteName: string)` hook. Allows to format route name, as you like :) -Features: -- `onFormatRouteName(routeInfo: RawRouteInfo, templateRouteName: string)` hook. Allows to format route name, as you like :) - Fixes: - Bug with wrong complex types (anyOf, oneOf, allOf) when some child schema contains only description ![example](./assets/changelog_assets/fixComplexTypeAny.jpg) From 690264b37490a9f081cdc2829a1434437d790c3a Mon Sep 17 00:00:00 2001 From: "Sergey S. Volkov" Date: Thu, 11 Mar 2021 23:02:45 +0300 Subject: [PATCH 05/10] fix incorrect working --route-types with --modular option (#207) * chore: try to fix modular route types problem * fix: --route-types with --modular option; fix: better format namespace name (--route-types) --- src/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/index.js b/src/index.js index 7bb79ad3..073a110d 100644 --- a/src/index.js +++ b/src/index.js @@ -21,6 +21,8 @@ const { generateOutputFiles } = require("./output"); const formatFileContent = require("./formatFileContent"); const { eventLog, successLog } = require("./logger"); +const { SCHEMA_TYPES } = constants; + module.exports = { constants: constants, generateApi: ({ From 9441016250fb47ca5c9edb3cd8df22468d85d4de Mon Sep 17 00:00:00 2001 From: svolkov Date: Thu, 11 Mar 2021 23:25:07 +0300 Subject: [PATCH 06/10] feat: add extra output util functions --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ src/index.js | 2 -- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 480b5cd9..aa86734e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,6 +71,33 @@ Features: }) ``` +Features: +- Add output util functions +```ts + createFile: (params: { + path: string; + fileName: string; + content: string; + withPrefix?: boolean; + }) => void; + renderTemplate: ( + templateContent: string, + data: Record, + etaOptions?: import("eta/dist/types/config").PartialConfig + ) => string; + getTemplate: (params: { + fileName: string; + name?: string + }) => string + + + // ... + + generateApi({ /* ... */ }).then(({ createFile, renderTemplate, getTemplate }) => { + // do something + }) +``` + # 6.4.2 Fixes: diff --git a/src/index.js b/src/index.js index 073a110d..7bb79ad3 100644 --- a/src/index.js +++ b/src/index.js @@ -21,8 +21,6 @@ const { generateOutputFiles } = require("./output"); const formatFileContent = require("./formatFileContent"); const { eventLog, successLog } = require("./logger"); -const { SCHEMA_TYPES } = constants; - module.exports = { constants: constants, generateApi: ({ From 737c87607ded7c5842ae86ca5283c57ab823e481 Mon Sep 17 00:00:00 2001 From: svolkov Date: Thu, 11 Mar 2021 23:49:55 +0300 Subject: [PATCH 07/10] chore: improve getTemplate function --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa86734e..000f06f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -86,8 +86,9 @@ Features: etaOptions?: import("eta/dist/types/config").PartialConfig ) => string; getTemplate: (params: { - fileName: string; - name?: string + fileName?: string; + name?: string; + path?: string; }) => string From 880b0161ff0f07b6690ebc16afee309aba04a2d2 Mon Sep 17 00:00:00 2001 From: svolkov Date: Fri, 12 Mar 2021 00:19:26 +0300 Subject: [PATCH 08/10] feat: add formatTSContent util function --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 000f06f2..62585afe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -90,6 +90,7 @@ Features: name?: string; path?: string; }) => string + formatTSContent: (content: string) => string; // ... From 0f67039f2b2180f0076dbd787254cce5dfdf929e Mon Sep 17 00:00:00 2001 From: svolkov Date: Fri, 19 Mar 2021 11:30:48 +0300 Subject: [PATCH 09/10] fix: bugs after rebase --- CHANGELOG.md | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62585afe..480b5cd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,35 +71,6 @@ Features: }) ``` -Features: -- Add output util functions -```ts - createFile: (params: { - path: string; - fileName: string; - content: string; - withPrefix?: boolean; - }) => void; - renderTemplate: ( - templateContent: string, - data: Record, - etaOptions?: import("eta/dist/types/config").PartialConfig - ) => string; - getTemplate: (params: { - fileName?: string; - name?: string; - path?: string; - }) => string - formatTSContent: (content: string) => string; - - - // ... - - generateApi({ /* ... */ }).then(({ createFile, renderTemplate, getTemplate }) => { - // do something - }) -``` - # 6.4.2 Fixes: From 6427aa3463882c347d1382eb01d726d900eafa3d Mon Sep 17 00:00:00 2001 From: svolkov Date: Mon, 5 Apr 2021 10:42:06 +0300 Subject: [PATCH 10/10] bump: up version to 8.0.2; fix: `format` option in `fetch` http client --- CHANGELOG.md | 5 +++++ package.json | 2 +- templates/base/http-clients/fetch-http-client.eta | 2 +- tests/generated/v2.0/adafruit.ts | 2 +- tests/generated/v2.0/another-example.ts | 2 +- tests/generated/v2.0/another-schema.ts | 2 +- tests/generated/v2.0/api-with-examples.ts | 2 +- tests/generated/v2.0/authentiq.ts | 2 +- tests/generated/v2.0/enums.ts | 2 +- tests/generated/v2.0/example1.ts | 2 +- tests/generated/v2.0/file-formdata-example.ts | 2 +- tests/generated/v2.0/furkot-example.ts | 2 +- tests/generated/v2.0/giphy.ts | 2 +- tests/generated/v2.0/github-swagger.ts | 2 +- tests/generated/v2.0/path-args.ts | 2 +- tests/generated/v2.0/petstore-expanded.ts | 2 +- tests/generated/v2.0/petstore-minimal.ts | 2 +- tests/generated/v2.0/petstore-simple.ts | 2 +- tests/generated/v2.0/petstore-swagger-io.ts | 2 +- tests/generated/v2.0/petstore-with-external-docs.ts | 2 +- tests/generated/v2.0/petstore.ts | 2 +- tests/generated/v2.0/query-path-param.ts | 2 +- tests/generated/v2.0/uber.ts | 2 +- tests/generated/v3.0/additional-properties.ts | 2 +- tests/generated/v3.0/additional-properties2.ts | 2 +- tests/generated/v3.0/allof-example.ts | 2 +- tests/generated/v3.0/anyof-example.ts | 2 +- tests/generated/v3.0/api-with-examples.ts | 2 +- tests/generated/v3.0/callback-example.ts | 2 +- tests/generated/v3.0/components-responses.ts | 2 +- tests/generated/v3.0/explode-param-3.0.1.ts | 2 +- tests/generated/v3.0/full-swagger-scheme.ts | 2 +- tests/generated/v3.0/link-example.ts | 2 +- tests/generated/v3.0/no-definitions-schema.ts | 2 +- tests/generated/v3.0/nullable-refs.ts | 2 +- tests/generated/v3.0/oneof-example.ts | 2 +- tests/generated/v3.0/personal-api-example.ts | 2 +- tests/generated/v3.0/petstore-expanded.ts | 2 +- tests/generated/v3.0/petstore.ts | 2 +- tests/generated/v3.0/recursive-schema.ts | 2 +- tests/generated/v3.0/responses.ts | 2 +- tests/generated/v3.0/swaggerhub-template.ts | 2 +- tests/generated/v3.0/tsoa-odd-types-3.0.2.ts | 2 +- tests/generated/v3.0/up-banking.ts | 2 +- tests/generated/v3.0/uspto.ts | 2 +- tests/generated/v3.0/wrong-enum-subtypes.ts | 2 +- tests/generated/v3.0/wrong-schema-names.ts | 2 +- tests/spec/defaultAsSuccess/schema.ts | 2 +- tests/spec/defaultResponse/schema.ts | 2 +- tests/spec/enumNamesAsValues/schema.ts | 2 +- tests/spec/extractRequestParams/schema.ts | 2 +- tests/spec/js/schema.js | 2 +- tests/spec/modular/http-client.ts | 2 +- tests/spec/moduleNameFirstTag/schema.ts | 2 +- tests/spec/moduleNameIndex/schema.ts | 2 +- tests/spec/partialBaseTemplate/schema.ts | 2 +- tests/spec/partialDefaultTemplate/schema.ts | 2 +- tests/spec/responses/schema.ts | 2 +- tests/spec/singleHttpClient/schema.ts | 2 +- tests/spec/typeSuffixPrefix/schema.ts | 2 +- tests/spec/unionEnums/schema.ts | 2 +- 61 files changed, 65 insertions(+), 60 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 480b5cd9..26b513a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # next release +# 8.0.2 + +Fixes: +- Wrong working the `format` option in `fetch` http client + # 8.0.1 Fixes: diff --git a/package.json b/package.json index ae2bf656..59a343e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swagger-typescript-api", - "version": "8.0.1", + "version": "8.0.2", "description": "Generate typescript/javascript api from swagger schema", "scripts": { "cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts", diff --git a/templates/base/http-clients/fetch-http-client.eta b/templates/base/http-clients/fetch-http-client.eta index 0dda48d3..8bb2e8a7 100644 --- a/templates/base/http-clients/fetch-http-client.eta +++ b/templates/base/http-clients/fetch-http-client.eta @@ -153,7 +153,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch( `${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, diff --git a/tests/generated/v2.0/adafruit.ts b/tests/generated/v2.0/adafruit.ts index 296b54a2..95b59516 100644 --- a/tests/generated/v2.0/adafruit.ts +++ b/tests/generated/v2.0/adafruit.ts @@ -321,7 +321,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/another-example.ts b/tests/generated/v2.0/another-example.ts index 80282bb4..5d4788dd 100644 --- a/tests/generated/v2.0/another-example.ts +++ b/tests/generated/v2.0/another-example.ts @@ -297,7 +297,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/another-schema.ts b/tests/generated/v2.0/another-schema.ts index 43eaa01a..5db8fdc2 100644 --- a/tests/generated/v2.0/another-schema.ts +++ b/tests/generated/v2.0/another-schema.ts @@ -189,7 +189,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/api-with-examples.ts b/tests/generated/v2.0/api-with-examples.ts index d838b0ac..64077459 100644 --- a/tests/generated/v2.0/api-with-examples.ts +++ b/tests/generated/v2.0/api-with-examples.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/authentiq.ts b/tests/generated/v2.0/authentiq.ts index ad0bbf51..b731209c 100644 --- a/tests/generated/v2.0/authentiq.ts +++ b/tests/generated/v2.0/authentiq.ts @@ -218,7 +218,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/enums.ts b/tests/generated/v2.0/enums.ts index ea7c804c..44cae541 100644 --- a/tests/generated/v2.0/enums.ts +++ b/tests/generated/v2.0/enums.ts @@ -231,7 +231,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/example1.ts b/tests/generated/v2.0/example1.ts index 03c08801..f201edb8 100644 --- a/tests/generated/v2.0/example1.ts +++ b/tests/generated/v2.0/example1.ts @@ -193,7 +193,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/file-formdata-example.ts b/tests/generated/v2.0/file-formdata-example.ts index 3444d012..97a12480 100644 --- a/tests/generated/v2.0/file-formdata-example.ts +++ b/tests/generated/v2.0/file-formdata-example.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/furkot-example.ts b/tests/generated/v2.0/furkot-example.ts index f1eb690c..34a70937 100644 --- a/tests/generated/v2.0/furkot-example.ts +++ b/tests/generated/v2.0/furkot-example.ts @@ -229,7 +229,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/giphy.ts b/tests/generated/v2.0/giphy.ts index 4ba95720..e31f7e1b 100644 --- a/tests/generated/v2.0/giphy.ts +++ b/tests/generated/v2.0/giphy.ts @@ -448,7 +448,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/github-swagger.ts b/tests/generated/v2.0/github-swagger.ts index 93b4a85f..3a438787 100644 --- a/tests/generated/v2.0/github-swagger.ts +++ b/tests/generated/v2.0/github-swagger.ts @@ -1601,7 +1601,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/path-args.ts b/tests/generated/v2.0/path-args.ts index a4d5ba97..091ab3b4 100644 --- a/tests/generated/v2.0/path-args.ts +++ b/tests/generated/v2.0/path-args.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/petstore-expanded.ts b/tests/generated/v2.0/petstore-expanded.ts index 28732c1c..a03ddfb6 100644 --- a/tests/generated/v2.0/petstore-expanded.ts +++ b/tests/generated/v2.0/petstore-expanded.ts @@ -203,7 +203,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/petstore-minimal.ts b/tests/generated/v2.0/petstore-minimal.ts index 8e06165f..b7216651 100644 --- a/tests/generated/v2.0/petstore-minimal.ts +++ b/tests/generated/v2.0/petstore-minimal.ts @@ -174,7 +174,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/petstore-simple.ts b/tests/generated/v2.0/petstore-simple.ts index 4fb3ebdb..8830fa2f 100644 --- a/tests/generated/v2.0/petstore-simple.ts +++ b/tests/generated/v2.0/petstore-simple.ts @@ -189,7 +189,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/petstore-swagger-io.ts b/tests/generated/v2.0/petstore-swagger-io.ts index c86dceb2..ad868cd8 100644 --- a/tests/generated/v2.0/petstore-swagger-io.ts +++ b/tests/generated/v2.0/petstore-swagger-io.ts @@ -234,7 +234,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/petstore-with-external-docs.ts b/tests/generated/v2.0/petstore-with-external-docs.ts index 521d40a2..f7692977 100644 --- a/tests/generated/v2.0/petstore-with-external-docs.ts +++ b/tests/generated/v2.0/petstore-with-external-docs.ts @@ -179,7 +179,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/petstore.ts b/tests/generated/v2.0/petstore.ts index 005cb174..2c9e9d84 100644 --- a/tests/generated/v2.0/petstore.ts +++ b/tests/generated/v2.0/petstore.ts @@ -181,7 +181,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/query-path-param.ts b/tests/generated/v2.0/query-path-param.ts index 10b5a9dc..f00f37f9 100644 --- a/tests/generated/v2.0/query-path-param.ts +++ b/tests/generated/v2.0/query-path-param.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v2.0/uber.ts b/tests/generated/v2.0/uber.ts index b15c5839..c8f42fb8 100644 --- a/tests/generated/v2.0/uber.ts +++ b/tests/generated/v2.0/uber.ts @@ -261,7 +261,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/additional-properties.ts b/tests/generated/v3.0/additional-properties.ts index 9792c373..a83b06a8 100644 --- a/tests/generated/v3.0/additional-properties.ts +++ b/tests/generated/v3.0/additional-properties.ts @@ -173,7 +173,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/additional-properties2.ts b/tests/generated/v3.0/additional-properties2.ts index f82d0a6b..ed68de09 100644 --- a/tests/generated/v3.0/additional-properties2.ts +++ b/tests/generated/v3.0/additional-properties2.ts @@ -170,7 +170,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/allof-example.ts b/tests/generated/v3.0/allof-example.ts index e5fb76be..f918601b 100644 --- a/tests/generated/v3.0/allof-example.ts +++ b/tests/generated/v3.0/allof-example.ts @@ -174,7 +174,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/anyof-example.ts b/tests/generated/v3.0/anyof-example.ts index 6c6400d1..fff02dd6 100644 --- a/tests/generated/v3.0/anyof-example.ts +++ b/tests/generated/v3.0/anyof-example.ts @@ -176,7 +176,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/api-with-examples.ts b/tests/generated/v3.0/api-with-examples.ts index c5b6c779..96c36abd 100644 --- a/tests/generated/v3.0/api-with-examples.ts +++ b/tests/generated/v3.0/api-with-examples.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/callback-example.ts b/tests/generated/v3.0/callback-example.ts index d46d28fd..014764d2 100644 --- a/tests/generated/v3.0/callback-example.ts +++ b/tests/generated/v3.0/callback-example.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/components-responses.ts b/tests/generated/v3.0/components-responses.ts index e59635a5..517c7984 100644 --- a/tests/generated/v3.0/components-responses.ts +++ b/tests/generated/v3.0/components-responses.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/explode-param-3.0.1.ts b/tests/generated/v3.0/explode-param-3.0.1.ts index 407ed178..3c0d27e5 100644 --- a/tests/generated/v3.0/explode-param-3.0.1.ts +++ b/tests/generated/v3.0/explode-param-3.0.1.ts @@ -186,7 +186,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/full-swagger-scheme.ts b/tests/generated/v3.0/full-swagger-scheme.ts index 3235cd80..7c1a44ae 100644 --- a/tests/generated/v3.0/full-swagger-scheme.ts +++ b/tests/generated/v3.0/full-swagger-scheme.ts @@ -9110,7 +9110,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/link-example.ts b/tests/generated/v3.0/link-example.ts index 75386ce3..f475cc6e 100644 --- a/tests/generated/v3.0/link-example.ts +++ b/tests/generated/v3.0/link-example.ts @@ -183,7 +183,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/no-definitions-schema.ts b/tests/generated/v3.0/no-definitions-schema.ts index e807b4e9..af88f9b8 100644 --- a/tests/generated/v3.0/no-definitions-schema.ts +++ b/tests/generated/v3.0/no-definitions-schema.ts @@ -179,7 +179,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/nullable-refs.ts b/tests/generated/v3.0/nullable-refs.ts index 93bad182..3f7ec64a 100644 --- a/tests/generated/v3.0/nullable-refs.ts +++ b/tests/generated/v3.0/nullable-refs.ts @@ -180,7 +180,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/oneof-example.ts b/tests/generated/v3.0/oneof-example.ts index 3289f9df..580065b5 100644 --- a/tests/generated/v3.0/oneof-example.ts +++ b/tests/generated/v3.0/oneof-example.ts @@ -176,7 +176,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/personal-api-example.ts b/tests/generated/v3.0/personal-api-example.ts index ad4abbf9..1b0cbc7e 100644 --- a/tests/generated/v3.0/personal-api-example.ts +++ b/tests/generated/v3.0/personal-api-example.ts @@ -367,7 +367,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/petstore-expanded.ts b/tests/generated/v3.0/petstore-expanded.ts index 0a13266f..d36897a2 100644 --- a/tests/generated/v3.0/petstore-expanded.ts +++ b/tests/generated/v3.0/petstore-expanded.ts @@ -179,7 +179,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/petstore.ts b/tests/generated/v3.0/petstore.ts index b525eb93..857b7dc5 100644 --- a/tests/generated/v3.0/petstore.ts +++ b/tests/generated/v3.0/petstore.ts @@ -183,7 +183,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/recursive-schema.ts b/tests/generated/v3.0/recursive-schema.ts index 75e11849..d6783e39 100644 --- a/tests/generated/v3.0/recursive-schema.ts +++ b/tests/generated/v3.0/recursive-schema.ts @@ -180,7 +180,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/responses.ts b/tests/generated/v3.0/responses.ts index 31153a5a..ad15fd46 100644 --- a/tests/generated/v3.0/responses.ts +++ b/tests/generated/v3.0/responses.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/swaggerhub-template.ts b/tests/generated/v3.0/swaggerhub-template.ts index fa09f432..b0c7174b 100644 --- a/tests/generated/v3.0/swaggerhub-template.ts +++ b/tests/generated/v3.0/swaggerhub-template.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/tsoa-odd-types-3.0.2.ts b/tests/generated/v3.0/tsoa-odd-types-3.0.2.ts index 14a473ba..edd780c4 100644 --- a/tests/generated/v3.0/tsoa-odd-types-3.0.2.ts +++ b/tests/generated/v3.0/tsoa-odd-types-3.0.2.ts @@ -287,7 +287,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/up-banking.ts b/tests/generated/v3.0/up-banking.ts index 05977526..05ae3052 100644 --- a/tests/generated/v3.0/up-banking.ts +++ b/tests/generated/v3.0/up-banking.ts @@ -704,7 +704,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/uspto.ts b/tests/generated/v3.0/uspto.ts index 2827cbd0..4c27e0dc 100644 --- a/tests/generated/v3.0/uspto.ts +++ b/tests/generated/v3.0/uspto.ts @@ -183,7 +183,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/wrong-enum-subtypes.ts b/tests/generated/v3.0/wrong-enum-subtypes.ts index 24aa52fe..fca2fa00 100644 --- a/tests/generated/v3.0/wrong-enum-subtypes.ts +++ b/tests/generated/v3.0/wrong-enum-subtypes.ts @@ -168,7 +168,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/generated/v3.0/wrong-schema-names.ts b/tests/generated/v3.0/wrong-schema-names.ts index 1e23f51c..811254f3 100644 --- a/tests/generated/v3.0/wrong-schema-names.ts +++ b/tests/generated/v3.0/wrong-schema-names.ts @@ -190,7 +190,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/defaultAsSuccess/schema.ts b/tests/spec/defaultAsSuccess/schema.ts index 0b6cef76..ca2ac291 100644 --- a/tests/spec/defaultAsSuccess/schema.ts +++ b/tests/spec/defaultAsSuccess/schema.ts @@ -218,7 +218,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/defaultResponse/schema.ts b/tests/spec/defaultResponse/schema.ts index cb24e38f..0e8776c6 100644 --- a/tests/spec/defaultResponse/schema.ts +++ b/tests/spec/defaultResponse/schema.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/enumNamesAsValues/schema.ts b/tests/spec/enumNamesAsValues/schema.ts index be7bbf2c..155c0237 100644 --- a/tests/spec/enumNamesAsValues/schema.ts +++ b/tests/spec/enumNamesAsValues/schema.ts @@ -364,7 +364,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/extractRequestParams/schema.ts b/tests/spec/extractRequestParams/schema.ts index ef7b6715..5fa3ef3c 100644 --- a/tests/spec/extractRequestParams/schema.ts +++ b/tests/spec/extractRequestParams/schema.ts @@ -258,7 +258,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/js/schema.js b/tests/spec/js/schema.js index ff508f2e..856c903f 100644 --- a/tests/spec/js/schema.js +++ b/tests/spec/js/schema.js @@ -68,7 +68,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, headers: { diff --git a/tests/spec/modular/http-client.ts b/tests/spec/modular/http-client.ts index 7d6bf15d..257147e9 100644 --- a/tests/spec/modular/http-client.ts +++ b/tests/spec/modular/http-client.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/moduleNameFirstTag/schema.ts b/tests/spec/moduleNameFirstTag/schema.ts index 4a2a8d28..265659fd 100644 --- a/tests/spec/moduleNameFirstTag/schema.ts +++ b/tests/spec/moduleNameFirstTag/schema.ts @@ -294,7 +294,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/moduleNameIndex/schema.ts b/tests/spec/moduleNameIndex/schema.ts index 6e9d6f94..8d481e50 100644 --- a/tests/spec/moduleNameIndex/schema.ts +++ b/tests/spec/moduleNameIndex/schema.ts @@ -294,7 +294,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/partialBaseTemplate/schema.ts b/tests/spec/partialBaseTemplate/schema.ts index 9ed59710..4183c433 100644 --- a/tests/spec/partialBaseTemplate/schema.ts +++ b/tests/spec/partialBaseTemplate/schema.ts @@ -178,7 +178,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/partialDefaultTemplate/schema.ts b/tests/spec/partialDefaultTemplate/schema.ts index 0500edc3..81abaefd 100644 --- a/tests/spec/partialDefaultTemplate/schema.ts +++ b/tests/spec/partialDefaultTemplate/schema.ts @@ -174,7 +174,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/responses/schema.ts b/tests/spec/responses/schema.ts index d19646ba..48f78668 100644 --- a/tests/spec/responses/schema.ts +++ b/tests/spec/responses/schema.ts @@ -218,7 +218,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/singleHttpClient/schema.ts b/tests/spec/singleHttpClient/schema.ts index 93cc8cfc..5efb21c8 100644 --- a/tests/spec/singleHttpClient/schema.ts +++ b/tests/spec/singleHttpClient/schema.ts @@ -166,7 +166,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/typeSuffixPrefix/schema.ts b/tests/spec/typeSuffixPrefix/schema.ts index 3fbe8991..5ce23ada 100644 --- a/tests/spec/typeSuffixPrefix/schema.ts +++ b/tests/spec/typeSuffixPrefix/schema.ts @@ -1611,7 +1611,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams, diff --git a/tests/spec/unionEnums/schema.ts b/tests/spec/unionEnums/schema.ts index ff4461e8..d89a6af7 100644 --- a/tests/spec/unionEnums/schema.ts +++ b/tests/spec/unionEnums/schema.ts @@ -178,7 +178,7 @@ export class HttpClient { const requestParams = this.mergeRequestParams(params, secureParams); const queryString = query && this.toQueryString(query); const payloadFormatter = this.contentFormatters[type || ContentType.Json]; - const responseFormat = format && requestParams.format; + const responseFormat = format || requestParams.format; return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, { ...requestParams,