From 31674b2b7c03826941c18b2344c87e0bd2f96c90 Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Thu, 27 Mar 2025 16:17:33 +0100 Subject: [PATCH 01/12] Keep static middleware when options contain no middleware field --- .../typescript/configuration.mustache | 4 ++-- .../tests/default/test/api/PetApi.test.ts | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache index e16f368d889b..36583143feb8 100644 --- a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache @@ -113,7 +113,7 @@ export function mergeConfiguration(conf: Configuration, options?: Configuration) {{/useInversify}} {{^useInversify}} export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -138,7 +138,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts index ab402abc816f..fa1c7ba2c8fa 100644 --- a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts +++ b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts @@ -103,6 +103,24 @@ describe("PetApi", () => { expect(CallOrder).deep.equal(['base-pre', 'base-post']) }) + it("should keep middleware when options are given without middleware", async () => { + let { CallOrder, BaseMiddleware, CalltimeMiddleware } = MiddlewareCallTracker() + const configuration = petstore.createConfiguration({ promiseMiddleware: [BaseMiddleware] }); + const petApi = new petstore.PetApi(configuration); + const callTimeAppendedRightPet = await petApi.getPetById(pet.id, {}); + expect(callTimeAppendedRightPet).to.deep.equal(pet); + expect(CallOrder).deep.equal(['base-pre', 'base-post']) + }) + + it("should replace middleware when options contain an empty array of middlewares", async () => { + let { CallOrder, BaseMiddleware, CalltimeMiddleware } = MiddlewareCallTracker() + const configuration = petstore.createConfiguration({ promiseMiddleware: [BaseMiddleware] }); + const petApi = new petstore.PetApi(configuration); + const callTimeAppendedRightPet = await petApi.getPetById(pet.id, { middleware: [] }); + expect(callTimeAppendedRightPet).to.deep.equal(pet); + expect(CallOrder).deep.equal([]) + }) + it("replace Middleware call order", async () => { let { CallOrder, BaseMiddleware, CalltimeMiddleware } = MiddlewareCallTracker() const configuration = petstore.createConfiguration({ promiseMiddleware: [BaseMiddleware] }) From fed65e6184688dfb64f8d4f5973b2184466f0532 Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Thu, 27 Mar 2025 16:18:48 +0100 Subject: [PATCH 02/12] Regenerate samples --- samples/client/echo_api/typescript/build/configuration.ts | 4 ++-- .../others/typescript/builds/array-of-lists/configuration.ts | 4 ++-- .../typescript/builds/enum-single-value/configuration.ts | 4 ++-- .../typescript/builds/null-types-simple/configuration.ts | 4 ++-- .../typescript/builds/with-unique-items/configuration.ts | 4 ++-- .../others/typescript/encode-decode/build/configuration.ts | 4 ++-- .../petstore/typescript/builds/browser/configuration.ts | 4 ++-- .../typescript/builds/composed-schemas/configuration.ts | 4 ++-- .../petstore/typescript/builds/default/configuration.ts | 4 ++-- .../client/petstore/typescript/builds/deno/configuration.ts | 4 ++-- .../typescript/builds/deno_object_params/configuration.ts | 4 ++-- .../petstore/typescript/builds/explode-query/configuration.ts | 4 ++-- .../client/petstore/typescript/builds/jquery/configuration.ts | 4 ++-- .../petstore/typescript/builds/nullable-enum/configuration.ts | 4 ++-- .../petstore/typescript/builds/object_params/configuration.ts | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/samples/client/echo_api/typescript/build/configuration.ts b/samples/client/echo_api/typescript/build/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/client/echo_api/typescript/build/configuration.ts +++ b/samples/client/echo_api/typescript/build/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/client/others/typescript/builds/array-of-lists/configuration.ts b/samples/client/others/typescript/builds/array-of-lists/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/client/others/typescript/builds/array-of-lists/configuration.ts +++ b/samples/client/others/typescript/builds/array-of-lists/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/client/others/typescript/builds/enum-single-value/configuration.ts b/samples/client/others/typescript/builds/enum-single-value/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/client/others/typescript/builds/enum-single-value/configuration.ts +++ b/samples/client/others/typescript/builds/enum-single-value/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/client/others/typescript/builds/null-types-simple/configuration.ts b/samples/client/others/typescript/builds/null-types-simple/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/client/others/typescript/builds/null-types-simple/configuration.ts +++ b/samples/client/others/typescript/builds/null-types-simple/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/client/others/typescript/builds/with-unique-items/configuration.ts b/samples/client/others/typescript/builds/with-unique-items/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/client/others/typescript/builds/with-unique-items/configuration.ts +++ b/samples/client/others/typescript/builds/with-unique-items/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/client/others/typescript/encode-decode/build/configuration.ts b/samples/client/others/typescript/encode-decode/build/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/client/others/typescript/encode-decode/build/configuration.ts +++ b/samples/client/others/typescript/encode-decode/build/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts index 1996d770eb15..d79952389fe8 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts index 1996d770eb15..d79952389fe8 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts index ed54d874a86b..769b085744d7 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts index 483dc5e54137..3ac0d4e379ad 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts @@ -97,7 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = []; + let allMiddleware: Middleware[] = conf.middleware; if (options && options.middleware) { const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior // call-time middleware provided @@ -122,7 +122,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO baseServer: options.baseServer || conf.baseServer, httpApi: options.httpApi || conf.httpApi, authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware || conf.middleware + middleware: allMiddleware, }; } return conf; From 5b1f719fcd8ed9b5f2b191b5849fa0528db5fc31 Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Tue, 1 Apr 2025 12:28:32 +0200 Subject: [PATCH 03/12] Fix indentation and quotes --- .../main/resources/typescript/configuration.mustache | 12 ++++++------ .../echo_api/typescript/build/configuration.ts | 12 ++++++------ .../builds/array-of-lists/configuration.ts | 12 ++++++------ .../builds/enum-single-value/configuration.ts | 12 ++++++------ .../builds/null-types-simple/configuration.ts | 12 ++++++------ .../builds/with-unique-items/configuration.ts | 12 ++++++------ .../typescript/encode-decode/build/configuration.ts | 12 ++++++------ .../typescript/builds/browser/configuration.ts | 12 ++++++------ .../builds/composed-schemas/configuration.ts | 12 ++++++------ .../typescript/builds/default/configuration.ts | 12 ++++++------ .../petstore/typescript/builds/deno/configuration.ts | 12 ++++++------ .../builds/deno_object_params/configuration.ts | 12 ++++++------ .../typescript/builds/explode-query/configuration.ts | 12 ++++++------ .../typescript/builds/inversify/configuration.ts | 12 ++++++------ .../typescript/builds/jquery/configuration.ts | 12 ++++++------ .../typescript/builds/nullable-enum/configuration.ts | 12 ++++++------ .../typescript/builds/object_params/configuration.ts | 12 ++++++------ 17 files changed, 102 insertions(+), 102 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache index 36583143feb8..2e57d4db365e 100644 --- a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache @@ -12,16 +12,16 @@ import { BaseServerConfiguration, server1 } from "./servers{{importFileExtension import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth{{importFileExtension}}"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/client/echo_api/typescript/build/configuration.ts b/samples/client/echo_api/typescript/build/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/client/echo_api/typescript/build/configuration.ts +++ b/samples/client/echo_api/typescript/build/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/client/others/typescript/builds/array-of-lists/configuration.ts b/samples/client/others/typescript/builds/array-of-lists/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/client/others/typescript/builds/array-of-lists/configuration.ts +++ b/samples/client/others/typescript/builds/array-of-lists/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/client/others/typescript/builds/enum-single-value/configuration.ts b/samples/client/others/typescript/builds/enum-single-value/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/client/others/typescript/builds/enum-single-value/configuration.ts +++ b/samples/client/others/typescript/builds/enum-single-value/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/client/others/typescript/builds/null-types-simple/configuration.ts b/samples/client/others/typescript/builds/null-types-simple/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/client/others/typescript/builds/null-types-simple/configuration.ts +++ b/samples/client/others/typescript/builds/null-types-simple/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/client/others/typescript/builds/with-unique-items/configuration.ts b/samples/client/others/typescript/builds/with-unique-items/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/client/others/typescript/builds/with-unique-items/configuration.ts +++ b/samples/client/others/typescript/builds/with-unique-items/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/client/others/typescript/encode-decode/build/configuration.ts b/samples/client/others/typescript/encode-decode/build/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/client/others/typescript/encode-decode/build/configuration.ts +++ b/samples/client/others/typescript/encode-decode/build/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts index d79952389fe8..28e671ccd543 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers.ts"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth.ts"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts index d79952389fe8..28e671ccd543 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers.ts"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth.ts"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts index 586313ff22e9..fa3e0b4dfd93 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts index 769b085744d7..45e42c9f4a98 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts index 3ac0d4e379ad..3b60819f9fda 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts @@ -5,16 +5,16 @@ import { BaseServerConfiguration, server1 } from "./servers"; import { configureAuthMethods, AuthMethods, AuthMethodsConfiguration } from "./auth/auth"; export interface Configuration { - readonly baseServer: BaseServerConfiguration; - readonly httpApi: HttpLibrary; - readonly middleware: M[]; - readonly authMethods: AuthMethods; + readonly baseServer: BaseServerConfiguration; + readonly httpApi: HttpLibrary; + readonly middleware: M[]; + readonly authMethods: AuthMethods; } // Additional option specific to middleware merge strategy export interface MiddlewareMergeOptions { - // default is `'replace'` for backwards compatibility - middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; + // default is `"replace"` for backwards compatibility + middlewareMergeStrategy?: "replace" | "append" | "prepend"; } // Unify configuration options using Partial plus extra merge strategy From 843f813a78eae732b9ad857fc5bb34ba6bfde08a Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Thu, 27 Mar 2025 16:31:31 +0100 Subject: [PATCH 04/12] Extract middleware merge logic into function --- .../typescript/configuration.mustache | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache index 2e57d4db365e..d1c7fb0dde8b 100644 --- a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache @@ -113,18 +113,31 @@ export function mergeConfiguration(conf: Configuration, options?: Configuration) {{/useInversify}} {{^useInversify}} export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -133,15 +146,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } {{/useInversify}} From d28fda8f579dfdca4c83863324c619fa352f0cc4 Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Thu, 27 Mar 2025 16:31:45 +0100 Subject: [PATCH 05/12] Regenerate samples --- .../typescript/build/configuration.ts | 35 +++++++++++-------- .../builds/array-of-lists/configuration.ts | 35 +++++++++++-------- .../builds/enum-single-value/configuration.ts | 35 +++++++++++-------- .../builds/null-types-simple/configuration.ts | 35 +++++++++++-------- .../builds/with-unique-items/configuration.ts | 35 +++++++++++-------- .../encode-decode/build/configuration.ts | 35 +++++++++++-------- .../builds/browser/configuration.ts | 35 +++++++++++-------- .../builds/composed-schemas/configuration.ts | 35 +++++++++++-------- .../builds/default/configuration.ts | 35 +++++++++++-------- .../typescript/builds/deno/configuration.ts | 35 +++++++++++-------- .../deno_object_params/configuration.ts | 35 +++++++++++-------- .../builds/explode-query/configuration.ts | 35 +++++++++++-------- .../typescript/builds/jquery/configuration.ts | 35 +++++++++++-------- .../builds/nullable-enum/configuration.ts | 35 +++++++++++-------- .../builds/object_params/configuration.ts | 35 +++++++++++-------- 15 files changed, 300 insertions(+), 225 deletions(-) diff --git a/samples/client/echo_api/typescript/build/configuration.ts b/samples/client/echo_api/typescript/build/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/client/echo_api/typescript/build/configuration.ts +++ b/samples/client/echo_api/typescript/build/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/client/others/typescript/builds/array-of-lists/configuration.ts b/samples/client/others/typescript/builds/array-of-lists/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/client/others/typescript/builds/array-of-lists/configuration.ts +++ b/samples/client/others/typescript/builds/array-of-lists/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/client/others/typescript/builds/enum-single-value/configuration.ts b/samples/client/others/typescript/builds/enum-single-value/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/client/others/typescript/builds/enum-single-value/configuration.ts +++ b/samples/client/others/typescript/builds/enum-single-value/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/client/others/typescript/builds/null-types-simple/configuration.ts b/samples/client/others/typescript/builds/null-types-simple/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/client/others/typescript/builds/null-types-simple/configuration.ts +++ b/samples/client/others/typescript/builds/null-types-simple/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/client/others/typescript/builds/with-unique-items/configuration.ts b/samples/client/others/typescript/builds/with-unique-items/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/client/others/typescript/builds/with-unique-items/configuration.ts +++ b/samples/client/others/typescript/builds/with-unique-items/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/client/others/typescript/encode-decode/build/configuration.ts b/samples/client/others/typescript/encode-decode/build/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/client/others/typescript/encode-decode/build/configuration.ts +++ b/samples/client/others/typescript/encode-decode/build/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts index 28e671ccd543..b43c14fcd309 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts index 28e671ccd543..b43c14fcd309 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts index 45e42c9f4a98..c06f5ee5d56d 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts index 3b60819f9fda..b56ea723b880 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts @@ -97,18 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = conf.middleware; - if (options && options.middleware) { - const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior + let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); + if (options) { + conf = { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: allMiddleware, + }; + } + return conf; +} + +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { + let allMiddleware: Middleware[] = staticMiddleware; + if (calltimeMiddleware) { + const middlewareMergeStrategy = strategy || "replace" // default to replace behavior // call-time middleware provided - const calltimeMiddleware: Middleware[] = options.middleware; + const calltimeMiddleware: Middleware[] = calltimeMiddleware; switch(middlewareMergeStrategy) { case "append": - allMiddleware = conf.middleware.concat(calltimeMiddleware); + allMiddleware = staticMiddleware.concat(calltimeMiddleware); break; case "prepend": - allMiddleware = calltimeMiddleware.concat(conf.middleware) + allMiddleware = calltimeMiddleware.concat(staticMiddleware) break; case "replace": allMiddleware = calltimeMiddleware @@ -117,15 +130,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); } } - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; - } - return conf; + return allMiddleware; } /** From 3af67cfdc58d62be1f968207a6673de8e2642161 Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Thu, 27 Mar 2025 16:37:36 +0100 Subject: [PATCH 06/12] Simplify extracted functions --- .../typescript/configuration.mustache | 48 +++++++------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache index d1c7fb0dde8b..0fb07e87e4e0 100644 --- a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache @@ -105,48 +105,36 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu */ {{#useInversify}} export function mergeConfiguration(conf: Configuration, options?: Configuration): Configuration { - if (options) { - conf = options; - } - return conf; + return options || conf; } {{/useInversify}} {{^useInversify}} export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } {{/useInversify}} From 6af63e9b930684c3e36b30a6dc33cf05e0b05d0e Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Thu, 27 Mar 2025 16:47:12 +0100 Subject: [PATCH 07/12] Regenerate samples --- .../typescript/build/configuration.ts | 43 ++++++++----------- .../builds/array-of-lists/configuration.ts | 43 ++++++++----------- .../builds/enum-single-value/configuration.ts | 43 ++++++++----------- .../builds/null-types-simple/configuration.ts | 43 ++++++++----------- .../builds/with-unique-items/configuration.ts | 43 ++++++++----------- .../encode-decode/build/configuration.ts | 43 ++++++++----------- .../builds/browser/configuration.ts | 43 ++++++++----------- .../builds/composed-schemas/configuration.ts | 43 ++++++++----------- .../builds/default/configuration.ts | 43 ++++++++----------- .../typescript/builds/deno/configuration.ts | 43 ++++++++----------- .../deno_object_params/configuration.ts | 43 ++++++++----------- .../builds/explode-query/configuration.ts | 43 ++++++++----------- .../builds/inversify/configuration.ts | 5 +-- .../typescript/builds/jquery/configuration.ts | 43 ++++++++----------- .../builds/nullable-enum/configuration.ts | 43 ++++++++----------- .../builds/object_params/configuration.ts | 43 ++++++++----------- 16 files changed, 256 insertions(+), 394 deletions(-) diff --git a/samples/client/echo_api/typescript/build/configuration.ts b/samples/client/echo_api/typescript/build/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/client/echo_api/typescript/build/configuration.ts +++ b/samples/client/echo_api/typescript/build/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/client/others/typescript/builds/array-of-lists/configuration.ts b/samples/client/others/typescript/builds/array-of-lists/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/client/others/typescript/builds/array-of-lists/configuration.ts +++ b/samples/client/others/typescript/builds/array-of-lists/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/client/others/typescript/builds/enum-single-value/configuration.ts b/samples/client/others/typescript/builds/enum-single-value/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/client/others/typescript/builds/enum-single-value/configuration.ts +++ b/samples/client/others/typescript/builds/enum-single-value/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/client/others/typescript/builds/null-types-simple/configuration.ts b/samples/client/others/typescript/builds/null-types-simple/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/client/others/typescript/builds/null-types-simple/configuration.ts +++ b/samples/client/others/typescript/builds/null-types-simple/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/client/others/typescript/builds/with-unique-items/configuration.ts b/samples/client/others/typescript/builds/with-unique-items/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/client/others/typescript/builds/with-unique-items/configuration.ts +++ b/samples/client/others/typescript/builds/with-unique-items/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/client/others/typescript/encode-decode/build/configuration.ts b/samples/client/others/typescript/encode-decode/build/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/client/others/typescript/encode-decode/build/configuration.ts +++ b/samples/client/others/typescript/encode-decode/build/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts index b43c14fcd309..fb53f7bce2ef 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts index b43c14fcd309..fb53f7bce2ef 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts index fa3e0b4dfd93..7f1fad5c3e18 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/configuration.ts @@ -97,10 +97,7 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: Configuration): Configuration { - if (options) { - conf = options; - } - return conf; + return options || conf; } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts index c06f5ee5d56d..24e7c1bb4c6e 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts index b56ea723b880..84a1ec47b34d 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts @@ -97,40 +97,31 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu * Merge configuration options into a configuration. */ export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration { - let allMiddleware: Middleware[] = mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy); - if (options) { - conf = { - baseServer: options.baseServer || conf.baseServer, - httpApi: options.httpApi || conf.httpApi, - authMethods: options.authMethods || conf.authMethods, - middleware: allMiddleware, - }; + if (!options) { + return conf; } - return conf; + return { + baseServer: options.baseServer || conf.baseServer, + httpApi: options.httpApi || conf.httpApi, + authMethods: options.authMethods || conf.authMethods, + middleware: mergeMiddleware(conf.middleware, options?.middleware, options?.middlewareMergeStrategy), + }; } function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { - let allMiddleware: Middleware[] = staticMiddleware; - if (calltimeMiddleware) { - const middlewareMergeStrategy = strategy || "replace" // default to replace behavior - // call-time middleware provided - const calltimeMiddleware: Middleware[] = calltimeMiddleware; - - switch(middlewareMergeStrategy) { + if (!calltimeMiddleware) { + return staticMiddleware; + } + // default to replace behavior + switch(strategy ?? "replace") { case "append": - allMiddleware = staticMiddleware.concat(calltimeMiddleware); - break; + return staticMiddleware.concat(calltimeMiddleware); case "prepend": - allMiddleware = calltimeMiddleware.concat(staticMiddleware) - break; + return calltimeMiddleware.concat(staticMiddleware) case "replace": - allMiddleware = calltimeMiddleware - break; - default: - throw new Error(`unrecognized middleware merge strategy '${middlewareMergeStrategy}'`); - } + return calltimeMiddleware } - return allMiddleware; + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** From ecf04562e56309f5b83fea902f92d456832d142c Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Thu, 27 Mar 2025 17:00:16 +0100 Subject: [PATCH 08/12] Fix: Pass static config when no options are given for inversify --- .../typescript/types/ObservableAPI.mustache | 2 +- .../builds/inversify/types/ObservableAPI.ts | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache index f7a2c71014fa..c1d2566f349b 100644 --- a/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache @@ -65,7 +65,7 @@ export class Observable{{classname}} { public {{nickname}}WithHttpInfo({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}_options?: Configuration{{^useInversify}}Options{{/useInversify}}): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}{{#useInversify}}_options{{/useInversify}}{{^useInversify}}_config{{/useInversify}}); + const requestContextPromise = this.requestFactory.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}_config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts index 85b1058c73a5..d240f19d5351 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts @@ -39,7 +39,7 @@ export class ObservablePetApi { public addPetWithHttpInfo(pet: Pet, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.addPet(pet, _options); + const requestContextPromise = this.requestFactory.addPet(pet, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -74,7 +74,7 @@ export class ObservablePetApi { public deletePetWithHttpInfo(petId: number, apiKey?: string, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, _options); + const requestContextPromise = this.requestFactory.deletePet(petId, apiKey, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -109,7 +109,7 @@ export class ObservablePetApi { public findPetsByStatusWithHttpInfo(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable>> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); + const requestContextPromise = this.requestFactory.findPetsByStatus(status, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -143,7 +143,7 @@ export class ObservablePetApi { public findPetsByTagsWithHttpInfo(tags: Array, _options?: Configuration): Observable>> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.findPetsByTags(tags, _options); + const requestContextPromise = this.requestFactory.findPetsByTags(tags, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -177,7 +177,7 @@ export class ObservablePetApi { public getPetByIdWithHttpInfo(petId: number, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.getPetById(petId, _options); + const requestContextPromise = this.requestFactory.getPetById(petId, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -211,7 +211,7 @@ export class ObservablePetApi { public updatePetWithHttpInfo(pet: Pet, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.updatePet(pet, _options); + const requestContextPromise = this.requestFactory.updatePet(pet, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -247,7 +247,7 @@ export class ObservablePetApi { public updatePetWithFormWithHttpInfo(petId: number, name?: string, status?: string, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, _options); + const requestContextPromise = this.requestFactory.updatePetWithForm(petId, name, status, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -285,7 +285,7 @@ export class ObservablePetApi { public uploadFileWithHttpInfo(petId: number, additionalMetadata?: string, file?: HttpFile, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, _options); + const requestContextPromise = this.requestFactory.uploadFile(petId, additionalMetadata, file, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -342,7 +342,7 @@ export class ObservableStoreApi { public deleteOrderWithHttpInfo(orderId: string, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.deleteOrder(orderId, _options); + const requestContextPromise = this.requestFactory.deleteOrder(orderId, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -375,7 +375,7 @@ export class ObservableStoreApi { public getInventoryWithHttpInfo(_options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.getInventory(_options); + const requestContextPromise = this.requestFactory.getInventory(_config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -408,7 +408,7 @@ export class ObservableStoreApi { public getOrderByIdWithHttpInfo(orderId: number, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.getOrderById(orderId, _options); + const requestContextPromise = this.requestFactory.getOrderById(orderId, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -442,7 +442,7 @@ export class ObservableStoreApi { public placeOrderWithHttpInfo(order: Order, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.placeOrder(order, _options); + const requestContextPromise = this.requestFactory.placeOrder(order, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -497,7 +497,7 @@ export class ObservableUserApi { public createUserWithHttpInfo(user: User, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.createUser(user, _options); + const requestContextPromise = this.requestFactory.createUser(user, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -531,7 +531,7 @@ export class ObservableUserApi { public createUsersWithArrayInputWithHttpInfo(user: Array, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, _options); + const requestContextPromise = this.requestFactory.createUsersWithArrayInput(user, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -565,7 +565,7 @@ export class ObservableUserApi { public createUsersWithListInputWithHttpInfo(user: Array, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.createUsersWithListInput(user, _options); + const requestContextPromise = this.requestFactory.createUsersWithListInput(user, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -599,7 +599,7 @@ export class ObservableUserApi { public deleteUserWithHttpInfo(username: string, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.deleteUser(username, _options); + const requestContextPromise = this.requestFactory.deleteUser(username, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -633,7 +633,7 @@ export class ObservableUserApi { public getUserByNameWithHttpInfo(username: string, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.getUserByName(username, _options); + const requestContextPromise = this.requestFactory.getUserByName(username, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -668,7 +668,7 @@ export class ObservableUserApi { public loginUserWithHttpInfo(username: string, password: string, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.loginUser(username, password, _options); + const requestContextPromise = this.requestFactory.loginUser(username, password, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -702,7 +702,7 @@ export class ObservableUserApi { public logoutUserWithHttpInfo(_options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.logoutUser(_options); + const requestContextPromise = this.requestFactory.logoutUser(_config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { @@ -736,7 +736,7 @@ export class ObservableUserApi { public updateUserWithHttpInfo(username: string, user: User, _options?: Configuration): Observable> { const _config = mergeConfiguration(this.configuration, _options); - const requestContextPromise = this.requestFactory.updateUser(username, user, _options); + const requestContextPromise = this.requestFactory.updateUser(username, user, _config); // build promise chain let middlewarePreObservable = from(requestContextPromise); for (const middleware of _config.middleware) { From b4ace69d4ec77a7b97197d200c4f8cfed93d9ac5 Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Thu, 27 Mar 2025 17:17:39 +0100 Subject: [PATCH 09/12] Fix: Allow overriding http api with options --- .../typescript/types/ObservableAPI.mustache | 2 +- .../tests/default/test/api/PetApi.test.ts | 27 ++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache b/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache index c1d2566f349b..f1eab3a96bac 100644 --- a/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache @@ -72,7 +72,7 @@ export class Observable{{classname}} { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts index fa1c7ba2c8fa..c8137a5312e1 100644 --- a/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts +++ b/samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts @@ -1,5 +1,5 @@ import * as petstore from 'ts-petstore-client' -import { Middleware, RequestContext, ResponseContext } from 'ts-petstore-client' +import { Middleware, RequestContext, ResponseContext, wrapHttpLibrary } from 'ts-petstore-client' import { expect } from "chai"; import * as fs from 'fs'; @@ -158,6 +158,31 @@ describe("PetApi", () => { expect(callTimeAppendedRightPet).to.deep.equal(pet); }) + it("should override http api from option", async () => { + const configuration = petstore.createConfiguration(); + const petApi = new petstore.PetApi(configuration); + + let overriddenCalls = 0; + const mockHttpLibrary = { + async send(): Promise { + overriddenCalls++; + return new ResponseContext(200, { + "content-type": "application/json", + }, { + async text() { + return "{}"; + }, + async binary() { + throw new Error("Unexpected usage of mock body as binary."); + } + }); + } + }; + + await petApi.getPetById(pet.id, { httpApi: wrapHttpLibrary(mockHttpLibrary) }); + expect(overriddenCalls).to.equal(1); + }) + it("deletePet", async () => { await petApi.deletePet(pet.id); let deletedPet; From f102f026dbb59edd4591221f0f11655f9f8f02be Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Thu, 27 Mar 2025 17:19:48 +0100 Subject: [PATCH 10/12] Regenerate samples --- .../typescript/build/types/ObservableAPI.ts | 54 ++++++------ .../array-of-lists/types/ObservableAPI.ts | 2 +- .../with-unique-items/types/ObservableAPI.ts | 2 +- .../build/types/ObservableAPI.ts | 64 +++++++------- .../builds/browser/types/ObservableAPI.ts | 40 ++++----- .../composed-schemas/types/ObservableAPI.ts | 6 +- .../builds/default/types/ObservableAPI.ts | 40 ++++----- .../builds/deno/types/ObservableAPI.ts | 40 ++++----- .../deno_object_params/types/ObservableAPI.ts | 40 ++++----- .../explode-query/types/ObservableAPI.ts | 84 +++++++++---------- .../builds/inversify/types/ObservableAPI.ts | 40 ++++----- .../builds/jquery/types/ObservableAPI.ts | 40 ++++----- .../nullable-enum/types/ObservableAPI.ts | 2 +- .../object_params/types/ObservableAPI.ts | 40 ++++----- 14 files changed, 247 insertions(+), 247 deletions(-) diff --git a/samples/client/echo_api/typescript/build/types/ObservableAPI.ts b/samples/client/echo_api/typescript/build/types/ObservableAPI.ts index 2032d741f309..ebedfaf274d0 100644 --- a/samples/client/echo_api/typescript/build/types/ObservableAPI.ts +++ b/samples/client/echo_api/typescript/build/types/ObservableAPI.ts @@ -46,7 +46,7 @@ export class ObservableAuthApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -78,7 +78,7 @@ export class ObservableAuthApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -128,7 +128,7 @@ export class ObservableBodyApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -161,7 +161,7 @@ export class ObservableBodyApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -195,7 +195,7 @@ export class ObservableBodyApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -229,7 +229,7 @@ export class ObservableBodyApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -263,7 +263,7 @@ export class ObservableBodyApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -297,7 +297,7 @@ export class ObservableBodyApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -331,7 +331,7 @@ export class ObservableBodyApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -365,7 +365,7 @@ export class ObservableBodyApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -399,7 +399,7 @@ export class ObservableBodyApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -433,7 +433,7 @@ export class ObservableBodyApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -487,7 +487,7 @@ export class ObservableFormApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -523,7 +523,7 @@ export class ObservableFormApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -562,7 +562,7 @@ export class ObservableFormApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -623,7 +623,7 @@ export class ObservableHeaderApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -682,7 +682,7 @@ export class ObservablePathApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -738,7 +738,7 @@ export class ObservableQueryApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -775,7 +775,7 @@ export class ObservableQueryApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -813,7 +813,7 @@ export class ObservableQueryApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -849,7 +849,7 @@ export class ObservableQueryApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -883,7 +883,7 @@ export class ObservableQueryApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -917,7 +917,7 @@ export class ObservableQueryApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -951,7 +951,7 @@ export class ObservableQueryApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -985,7 +985,7 @@ export class ObservableQueryApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1019,7 +1019,7 @@ export class ObservableQueryApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1053,7 +1053,7 @@ export class ObservableQueryApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/client/others/typescript/builds/array-of-lists/types/ObservableAPI.ts b/samples/client/others/typescript/builds/array-of-lists/types/ObservableAPI.ts index c81c9ff213db..5a77711dfea5 100644 --- a/samples/client/others/typescript/builds/array-of-lists/types/ObservableAPI.ts +++ b/samples/client/others/typescript/builds/array-of-lists/types/ObservableAPI.ts @@ -34,7 +34,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/client/others/typescript/builds/with-unique-items/types/ObservableAPI.ts b/samples/client/others/typescript/builds/with-unique-items/types/ObservableAPI.ts index 54132586b760..8c4dae1fb563 100644 --- a/samples/client/others/typescript/builds/with-unique-items/types/ObservableAPI.ts +++ b/samples/client/others/typescript/builds/with-unique-items/types/ObservableAPI.ts @@ -33,7 +33,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/client/others/typescript/encode-decode/build/types/ObservableAPI.ts b/samples/client/others/typescript/encode-decode/build/types/ObservableAPI.ts index e4b2aa862ec7..98a4d0cbf06f 100644 --- a/samples/client/others/typescript/encode-decode/build/types/ObservableAPI.ts +++ b/samples/client/others/typescript/encode-decode/build/types/ObservableAPI.ts @@ -34,7 +34,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -62,7 +62,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -90,7 +90,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -118,7 +118,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -146,7 +146,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -174,7 +174,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -202,7 +202,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -230,7 +230,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -258,7 +258,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -286,7 +286,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -314,7 +314,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -342,7 +342,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -370,7 +370,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -398,7 +398,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -426,7 +426,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -454,7 +454,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -483,7 +483,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -513,7 +513,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -543,7 +543,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -573,7 +573,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -603,7 +603,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -633,7 +633,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -663,7 +663,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -693,7 +693,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -723,7 +723,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -753,7 +753,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -783,7 +783,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -813,7 +813,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -843,7 +843,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -873,7 +873,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -903,7 +903,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -933,7 +933,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts index 58459af26d41..0ccd300d0fcf 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts @@ -41,7 +41,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -76,7 +76,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -111,7 +111,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -145,7 +145,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -179,7 +179,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -213,7 +213,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -249,7 +249,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -287,7 +287,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -341,7 +341,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -374,7 +374,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -407,7 +407,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -441,7 +441,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -493,7 +493,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -527,7 +527,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -561,7 +561,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -595,7 +595,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -629,7 +629,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -664,7 +664,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -698,7 +698,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -732,7 +732,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObservableAPI.ts index 5cfef19528da..3f657b1f3144 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/types/ObservableAPI.ts @@ -40,7 +40,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -70,7 +70,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -100,7 +100,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts index 58459af26d41..0ccd300d0fcf 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts @@ -41,7 +41,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -76,7 +76,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -111,7 +111,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -145,7 +145,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -179,7 +179,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -213,7 +213,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -249,7 +249,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -287,7 +287,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -341,7 +341,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -374,7 +374,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -407,7 +407,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -441,7 +441,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -493,7 +493,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -527,7 +527,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -561,7 +561,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -595,7 +595,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -629,7 +629,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -664,7 +664,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -698,7 +698,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -732,7 +732,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts index e2bc011b234c..6a38fcfe63db 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts @@ -41,7 +41,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -76,7 +76,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -111,7 +111,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -145,7 +145,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -179,7 +179,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -213,7 +213,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -249,7 +249,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -287,7 +287,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -341,7 +341,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -374,7 +374,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -407,7 +407,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -441,7 +441,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -493,7 +493,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -527,7 +527,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -561,7 +561,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -595,7 +595,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -629,7 +629,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -664,7 +664,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -698,7 +698,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -732,7 +732,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/types/ObservableAPI.ts index e2bc011b234c..6a38fcfe63db 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/types/ObservableAPI.ts @@ -41,7 +41,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -76,7 +76,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -111,7 +111,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -145,7 +145,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -179,7 +179,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -213,7 +213,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -249,7 +249,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -287,7 +287,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -341,7 +341,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -374,7 +374,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -407,7 +407,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -441,7 +441,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -493,7 +493,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -527,7 +527,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -561,7 +561,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -595,7 +595,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -629,7 +629,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -664,7 +664,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -698,7 +698,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -732,7 +732,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/builds/explode-query/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/explode-query/types/ObservableAPI.ts index 7e20b9204034..e6627dbbe7a8 100644 --- a/samples/openapi3/client/petstore/typescript/builds/explode-query/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/explode-query/types/ObservableAPI.ts @@ -82,7 +82,7 @@ export class ObservableAnotherFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -131,7 +131,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -178,7 +178,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -208,7 +208,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -241,7 +241,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -275,7 +275,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -307,7 +307,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -339,7 +339,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -371,7 +371,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -403,7 +403,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -435,7 +435,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -467,7 +467,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -499,7 +499,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -532,7 +532,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -579,7 +579,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -634,7 +634,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -681,7 +681,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -720,7 +720,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -755,7 +755,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -795,7 +795,7 @@ export class ObservableFakeApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -852,7 +852,7 @@ export class ObservableFakeClassnameTags123Api { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -904,7 +904,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -939,7 +939,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -974,7 +974,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1008,7 +1008,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1042,7 +1042,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1076,7 +1076,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1112,7 +1112,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1150,7 +1150,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1188,7 +1188,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1242,7 +1242,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1275,7 +1275,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1308,7 +1308,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1342,7 +1342,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1394,7 +1394,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1428,7 +1428,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1462,7 +1462,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1496,7 +1496,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1530,7 +1530,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1565,7 +1565,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1599,7 +1599,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -1633,7 +1633,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts index d240f19d5351..9317ecb7bef6 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts @@ -46,7 +46,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -81,7 +81,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -116,7 +116,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -150,7 +150,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -184,7 +184,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -218,7 +218,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -254,7 +254,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -292,7 +292,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -349,7 +349,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -382,7 +382,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -415,7 +415,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -449,7 +449,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -504,7 +504,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -538,7 +538,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -572,7 +572,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -606,7 +606,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -640,7 +640,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -675,7 +675,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -709,7 +709,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -743,7 +743,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts index 58459af26d41..0ccd300d0fcf 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts @@ -41,7 +41,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -76,7 +76,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -111,7 +111,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -145,7 +145,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -179,7 +179,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -213,7 +213,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -249,7 +249,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -287,7 +287,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -341,7 +341,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -374,7 +374,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -407,7 +407,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -441,7 +441,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -493,7 +493,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -527,7 +527,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -561,7 +561,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -595,7 +595,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -629,7 +629,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -664,7 +664,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -698,7 +698,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -732,7 +732,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/types/ObservableAPI.ts index 54132586b760..8c4dae1fb563 100644 --- a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/types/ObservableAPI.ts @@ -33,7 +33,7 @@ export class ObservableDefaultApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts index 58459af26d41..0ccd300d0fcf 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts @@ -41,7 +41,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -76,7 +76,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -111,7 +111,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -145,7 +145,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -179,7 +179,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -213,7 +213,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -249,7 +249,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -287,7 +287,7 @@ export class ObservablePetApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -341,7 +341,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -374,7 +374,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -407,7 +407,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -441,7 +441,7 @@ export class ObservableStoreApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -493,7 +493,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -527,7 +527,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -561,7 +561,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -595,7 +595,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -629,7 +629,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -664,7 +664,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -698,7 +698,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { @@ -732,7 +732,7 @@ export class ObservableUserApi { middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx))); } - return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => this.configuration.httpApi.send(ctx))). + return middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => _config.httpApi.send(ctx))). pipe(mergeMap((response: ResponseContext) => { let middlewarePostObservable = of(response); for (const middleware of _config.middleware.reverse()) { From 9c3205296ef39a2431ef3a5df7754628e1b5904b Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Tue, 1 Apr 2025 15:41:49 +0200 Subject: [PATCH 11/12] Use default parameter for default middlware merge strategy --- .../src/main/resources/typescript/configuration.mustache | 5 ++--- samples/client/echo_api/typescript/build/configuration.ts | 5 ++--- .../others/typescript/builds/array-of-lists/configuration.ts | 5 ++--- .../typescript/builds/enum-single-value/configuration.ts | 5 ++--- .../typescript/builds/null-types-simple/configuration.ts | 5 ++--- .../typescript/builds/with-unique-items/configuration.ts | 5 ++--- .../others/typescript/encode-decode/build/configuration.ts | 5 ++--- .../petstore/typescript/builds/browser/configuration.ts | 5 ++--- .../typescript/builds/composed-schemas/configuration.ts | 5 ++--- .../petstore/typescript/builds/default/configuration.ts | 5 ++--- .../client/petstore/typescript/builds/deno/configuration.ts | 5 ++--- .../typescript/builds/deno_object_params/configuration.ts | 5 ++--- .../typescript/builds/explode-query/configuration.ts | 5 ++--- .../petstore/typescript/builds/jquery/configuration.ts | 5 ++--- .../typescript/builds/nullable-enum/configuration.ts | 5 ++--- .../typescript/builds/object_params/configuration.ts | 5 ++--- 16 files changed, 32 insertions(+), 48 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache index 0fb07e87e4e0..0b45e84d1449 100644 --- a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache @@ -121,12 +121,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/client/echo_api/typescript/build/configuration.ts b/samples/client/echo_api/typescript/build/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/client/echo_api/typescript/build/configuration.ts +++ b/samples/client/echo_api/typescript/build/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/client/others/typescript/builds/array-of-lists/configuration.ts b/samples/client/others/typescript/builds/array-of-lists/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/client/others/typescript/builds/array-of-lists/configuration.ts +++ b/samples/client/others/typescript/builds/array-of-lists/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/client/others/typescript/builds/enum-single-value/configuration.ts b/samples/client/others/typescript/builds/enum-single-value/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/client/others/typescript/builds/enum-single-value/configuration.ts +++ b/samples/client/others/typescript/builds/enum-single-value/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/client/others/typescript/builds/null-types-simple/configuration.ts b/samples/client/others/typescript/builds/null-types-simple/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/client/others/typescript/builds/null-types-simple/configuration.ts +++ b/samples/client/others/typescript/builds/null-types-simple/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/client/others/typescript/builds/with-unique-items/configuration.ts b/samples/client/others/typescript/builds/with-unique-items/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/client/others/typescript/builds/with-unique-items/configuration.ts +++ b/samples/client/others/typescript/builds/with-unique-items/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/client/others/typescript/encode-decode/build/configuration.ts b/samples/client/others/typescript/encode-decode/build/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/client/others/typescript/encode-decode/build/configuration.ts +++ b/samples/client/others/typescript/encode-decode/build/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts index fb53f7bce2ef..91cf19eacbce 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts index fb53f7bce2ef..91cf19eacbce 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts index 24e7c1bb4c6e..dfa628c5f434 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts index 84a1ec47b34d..46b432f63c2a 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts @@ -108,12 +108,11 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO }; } -function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy?: "append" | "prepend" | "replace") { +function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Middleware[], strategy: "append" | "prepend" | "replace" = "replace") { if (!calltimeMiddleware) { return staticMiddleware; } - // default to replace behavior - switch(strategy ?? "replace") { + switch(strategy) { case "append": return staticMiddleware.concat(calltimeMiddleware); case "prepend": From df15f6b56f83bf4d9176485a12cf78f4299a6bbe Mon Sep 17 00:00:00 2001 From: Bodo Graumann Date: Tue, 1 Apr 2025 16:04:18 +0200 Subject: [PATCH 12/12] Throw exception for failed match within switch block --- .../src/main/resources/typescript/configuration.mustache | 3 ++- samples/client/echo_api/typescript/build/configuration.ts | 3 ++- .../others/typescript/builds/array-of-lists/configuration.ts | 3 ++- .../typescript/builds/enum-single-value/configuration.ts | 3 ++- .../typescript/builds/null-types-simple/configuration.ts | 3 ++- .../typescript/builds/with-unique-items/configuration.ts | 3 ++- .../others/typescript/encode-decode/build/configuration.ts | 3 ++- .../client/petstore/typescript/builds/browser/configuration.ts | 3 ++- .../typescript/builds/composed-schemas/configuration.ts | 3 ++- .../client/petstore/typescript/builds/default/configuration.ts | 3 ++- .../client/petstore/typescript/builds/deno/configuration.ts | 3 ++- .../typescript/builds/deno_object_params/configuration.ts | 3 ++- .../petstore/typescript/builds/explode-query/configuration.ts | 3 ++- .../client/petstore/typescript/builds/jquery/configuration.ts | 3 ++- .../petstore/typescript/builds/nullable-enum/configuration.ts | 3 ++- .../petstore/typescript/builds/object_params/configuration.ts | 3 ++- 16 files changed, 32 insertions(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache index 0b45e84d1449..06fb3994de64 100644 --- a/modules/openapi-generator/src/main/resources/typescript/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/configuration.mustache @@ -132,8 +132,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } {{/useInversify}} diff --git a/samples/client/echo_api/typescript/build/configuration.ts b/samples/client/echo_api/typescript/build/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/client/echo_api/typescript/build/configuration.ts +++ b/samples/client/echo_api/typescript/build/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/client/others/typescript/builds/array-of-lists/configuration.ts b/samples/client/others/typescript/builds/array-of-lists/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/client/others/typescript/builds/array-of-lists/configuration.ts +++ b/samples/client/others/typescript/builds/array-of-lists/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/client/others/typescript/builds/enum-single-value/configuration.ts b/samples/client/others/typescript/builds/enum-single-value/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/client/others/typescript/builds/enum-single-value/configuration.ts +++ b/samples/client/others/typescript/builds/enum-single-value/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/client/others/typescript/builds/null-types-simple/configuration.ts b/samples/client/others/typescript/builds/null-types-simple/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/client/others/typescript/builds/null-types-simple/configuration.ts +++ b/samples/client/others/typescript/builds/null-types-simple/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/client/others/typescript/builds/with-unique-items/configuration.ts b/samples/client/others/typescript/builds/with-unique-items/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/client/others/typescript/builds/with-unique-items/configuration.ts +++ b/samples/client/others/typescript/builds/with-unique-items/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/client/others/typescript/encode-decode/build/configuration.ts b/samples/client/others/typescript/encode-decode/build/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/client/others/typescript/encode-decode/build/configuration.ts +++ b/samples/client/others/typescript/encode-decode/build/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts index 91cf19eacbce..2869965cf9c1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts index 91cf19eacbce..2869965cf9c1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno_object_params/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/explode-query/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts index dfa628c5f434..85521458d947 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/nullable-enum/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /** diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts index 46b432f63c2a..4e654728905c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/configuration.ts @@ -119,8 +119,9 @@ function mergeMiddleware(staticMiddleware: Middleware[], calltimeMiddleware?: Mi return calltimeMiddleware.concat(staticMiddleware) case "replace": return calltimeMiddleware + default: + throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } - throw new Error(`Unrecognized middleware merge strategy '${strategy}'`) } /**