[typescript] add call-time middleware support

modules/openapi-generator/src/main/resources/typescript/api/api.mustache

@@ -1,6 +1,9 @@
 // TODO: better import syntax?
 import {BaseAPIRequestFactory, RequiredError, COLLECTION_FORMATS} from './baseapi{{importFileExtension}}';
-import {Configuration} from '../configuration{{importFileExtension}}';
+import {Configuration,ConfigurationOptions} from '../configuration{{importFileExtension}}';
+{{^useInversify}}
+import {Middleware} from '../middleware';
+{{/useInversify}}
 import {RequestContext, HttpMethod, ResponseContext, HttpFile, HttpInfo} from '../http/http{{importFileExtension}}';
 {{#platforms}}
 {{#node}}
@@ -43,7 +46,10 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
      {{/allParams}}
      */
     public async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}_options?: Configuration): Promise<RequestContext> {
-        let _config = _options || this.configuration;
+	let _config = this.configuration;
+	if (_options){
+		_config = _options
+	}
         {{#allParams}}
 
         {{#required}}
@@ -183,7 +189,7 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory {
         {{/authMethods}}
 
         {{^useInversify}}
-        const defaultAuth: SecurityAuthentication | undefined = _options?.authMethods?.default || this.configuration?.authMethods?.default
+        const defaultAuth: SecurityAuthentication | undefined = _config?.authMethods?.default
         if (defaultAuth?.applySecurityAuthentication) {
             await defaultAuth?.applySecurityAuthentication(requestContext);
         }

modules/openapi-generator/src/main/resources/typescript/configuration.mustache

@@ -18,6 +18,16 @@ export interface Configuration {
     readonly authMethods: AuthMethods;
 }
 
+/**
+ * Interface for passing options to mutate a configuration
+ */
+export interface ConfigurationOptions {
+    baseServer?: BaseServerConfiguration;
+    httpApi?: HttpLibrary;
+    middleware?: Middleware[];
+    middlewareMergeStrategy?: 'replace' | 'append' | 'prepend'; // default merge is to replace for backward compatibility
+    authMethods?: AuthMethods;
+}
 
 /**
  * Interface with which a configuration object can be configured.
@@ -86,4 +96,4 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu
         );
     }
     return configuration;
-}
+}

modules/openapi-generator/src/main/resources/typescript/index.mustache

@@ -4,7 +4,7 @@ export * from "./auth/auth{{importFileExtension}}";
 export * from "./models/all{{importFileExtension}}";
 {{/models.0}}
 export { createConfiguration } from "./configuration{{importFileExtension}}"
-export type { Configuration } from "./configuration{{importFileExtension}}"
+export type { Configuration{{^useInversify}}, ConfigurationOptions{{/useInversify}} } from "./configuration{{importFileExtension}}"
 export * from "./apis/exception{{importFileExtension}}";
 export * from "./servers{{importFileExtension}}";
 export { RequiredError } from "./apis/baseapi{{importFileExtension}}";

modules/openapi-generator/src/main/resources/typescript/services/ObservableAPI.mustache

@@ -1,6 +1,9 @@
 import type { HttpFile } from "../http/http";
 import type { Observable } from {{#useRxJS}}"rxjs"{{/useRxJS}}{{^useRxJS}}"../rxjsStub"{{/useRxJS}};
 import type { Configuration } from "../configuration";
+{{^useInversify}}
+import type { Middleware } from "../middleware";
+{{/useInversify}}
 
 {{#models}}
 {{#model}}
@@ -14,10 +17,10 @@ import { {{{ classname }}} } from "{{{ importPath }}}";
 
 export abstract class AbstractObservable{{classname}} {
     {{#operation}}
-    public abstract {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration): Observable<{{{returnType}}}{{^returnType}}void{{/returnType}}>;
+    public abstract {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: Configuration{{^useInversify}} | Middleware[]{{/useInversify}}): Observable<{{{returnType}}}{{^returnType}}void{{/returnType}}>;
 
     {{/operation}}
 }
 {{/operations}}
 {{/apis}}
-{{/apiInfo}}
+{{/apiInfo}}

modules/openapi-generator/src/main/resources/typescript/types/ObjectParamAPI.mustache

@@ -1,5 +1,8 @@
 import { ResponseContext, RequestContext, HttpFile, HttpInfo } from '../http/http{{importFileExtension}}';
-import { Configuration} from '../configuration{{importFileExtension}}'
+import { Configuration{{^useInversify}}, ConfigurationOptions{{/useInversify}} } from '../configuration{{importFileExtension}}'
+{{^useInversify}}
+import type { Middleware } from "../middleware";
+{{/useInversify}}
 {{#useRxJS}}
 import { Observable } from 'rxjs';
 {{/useRxJS}}
@@ -55,7 +58,7 @@ export class Object{{classname}} {
      {{/summary}}
      * @param param the request object
      */
-    public {{nickname}}WithHttpInfo(param: {{classname}}{{operationIdCamelCase}}Request{{^hasRequiredParams}} = {}{{/hasRequiredParams}}, options?: Configuration): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<HttpInfo<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
+    public {{nickname}}WithHttpInfo(param: {{classname}}{{operationIdCamelCase}}Request{{^hasRequiredParams}} = {}{{/hasRequiredParams}}, options?: Configuration{{^useInversify}}Options{{/useInversify}}): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<HttpInfo<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
         return this.api.{{nickname}}WithHttpInfo({{#allParams}}param.{{paramName}}, {{/allParams}} options){{^useRxJS}}.toPromise(){{/useRxJS}};
     }
 
@@ -68,7 +71,7 @@ export class Object{{classname}} {
      {{/summary}}
      * @param param the request object
      */
-    public {{nickname}}(param: {{classname}}{{operationIdCamelCase}}Request{{^hasRequiredParams}} = {}{{/hasRequiredParams}}, options?: Configuration): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<{{{returnType}}}{{^returnType}}void{{/returnType}}> {
+    public {{nickname}}(param: {{classname}}{{operationIdCamelCase}}Request{{^hasRequiredParams}} = {}{{/hasRequiredParams}}, options?: Configuration{{^useInversify}}Options{{/useInversify}}): {{#useRxJS}}Observable{{/useRxJS}}{{^useRxJS}}Promise{{/useRxJS}}<{{{returnType}}}{{^returnType}}void{{/returnType}}> {
         return this.api.{{nickname}}({{#allParams}}param.{{paramName}}, {{/allParams}} options){{^useRxJS}}.toPromise(){{/useRxJS}};
     }
 

modules/openapi-generator/src/main/resources/typescript/types/ObservableAPI.mustache

@@ -1,5 +1,6 @@
 import { ResponseContext, RequestContext, HttpFile, HttpInfo } from '../http/http{{importFileExtension}}';
-import { Configuration} from '../configuration{{importFileExtension}}'
+import { Configuration{{^useInversify}}, ConfigurationOptions{{/useInversify}} } from '../configuration{{importFileExtension}}'
+import type { Middleware } from "../middleware";
 import { Observable, of, from } from {{#useRxJS}}'rxjs'{{/useRxJS}}{{^useRxJS}}'../rxjsStub{{importFileExtension}}'{{/useRxJS}};
 import {mergeMap, map} from  {{#useRxJS}}'rxjs/operators'{{/useRxJS}}{{^useRxJS}}'../rxjsStub{{importFileExtension}}'{{/useRxJS}};
 {{#useInversify}}
@@ -61,12 +62,44 @@ export class Observable{{classname}} {
      * @param {{#required}}{{paramName}}{{/required}}{{^required}}[{{paramName}}]{{/required}}{{#description}} {{description}}{{/description}}
      {{/allParams}}
      */
-    public {{nickname}}WithHttpInfo({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}_options?: Configuration): Observable<HttpInfo<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
-        const requestContextPromise = this.requestFactory.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}_options);
+    public {{nickname}}WithHttpInfo({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}_options?: Configuration{{^useInversify}}Options{{/useInversify}}): Observable<HttpInfo<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
+	let _config = this.configuration
+	{{#useInversify}}
+	if (_options){
+	    _config = _options
+	}
+	{{/useInversify}}
+	{{^useInversify}}
+	let allMiddleware: Middleware[] = []
+	if (_options && _options.middleware){
+	    // call-time middleware provided
+            let calltimeMiddleware: Middleware[] = _options.middleware
 
+	    switch(_options.middlewareMergeStrategy){
+	    	case 'append':
+                    allMiddleware = this.configuration.middleware.concat(calltimeMiddleware)
+		    break;
+	    	case 'prepend':
+		    allMiddleware = calltimeMiddleware.concat(this.configuration.middleware)
+		    break;
+		default: // replace
+		    allMiddleware = calltimeMiddleware
+	    }
+	}
+	if (_options){
+		_config = {
+		    baseServer: _options.baseServer || this.configuration.baseServer,
+		    httpApi: _options.httpApi || this.configuration.httpApi,
+		    authMethods: _options.authMethods || this.configuration.authMethods,
+		    middleware: allMiddleware || this.configuration.middleware
+		}
+	}
+	{{/useInversify}}
+
+        const requestContextPromise = this.requestFactory.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}{{#useInversify}}_options{{/useInversify}}{{^useInversify}}_config{{/useInversify}});
         // build promise chain
         let middlewarePreObservable = from<RequestContext>(requestContextPromise);
-        for (const middleware of this.configuration.middleware) {
+        for (const middleware of allMiddleware) {
             middlewarePreObservable = middlewarePreObservable.pipe(mergeMap((ctx: RequestContext) => middleware.pre(ctx)));
         }
 
@@ -91,7 +124,7 @@ export class Observable{{classname}} {
      * @param {{#required}}{{paramName}}{{/required}}{{^required}}[{{paramName}}]{{/required}}{{#description}} {{description}}{{/description}}
      {{/allParams}}
      */
-    public {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}_options?: Configuration): Observable<{{{returnType}}}{{^returnType}}void{{/returnType}}> {
+    public {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}_options?: Configuration{{^useInversify}}Options{{/useInversify}}): Observable<{{{returnType}}}{{^returnType}}void{{/returnType}}> {
         return this.{{nickname}}WithHttpInfo({{#allParams}}{{paramName}}, {{/allParams}}_options).pipe(map((apiResponse: HttpInfo<{{{returnType}}}{{^returnType}}void{{/returnType}}>) => apiResponse.data));
     }
 

modules/openapi-generator/src/main/resources/typescript/types/PromiseAPI.mustache

@@ -1,5 +1,8 @@
 import { ResponseContext, RequestContext, HttpFile, HttpInfo } from '../http/http{{importFileExtension}}';
-import { Configuration} from '../configuration{{importFileExtension}}'
+import { Configuration{{^useInversify}}, ConfigurationOptions{{/useInversify}} } from '../configuration{{importFileExtension}}'
+{{^useInversify}}
+import { PromiseMiddleware, Middleware, PromiseMiddlewareWrapper } from "../middleware";
+{{/useInversify}}
 {{#useInversify}}
 import { injectable, inject, optional } from "inversify";
 import { AbstractConfiguration } from "../services/configuration";
@@ -51,7 +54,7 @@ export class Promise{{classname}} {
      * @param {{#required}}{{paramName}}{{/required}}{{^required}}[{{paramName}}]{{/required}}{{#description}} {{description}}{{/description}}
      {{/allParams}}
      */
-    public {{nickname}}WithHttpInfo({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}_options?: Configuration): Promise<HttpInfo<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
+    public {{nickname}}WithHttpInfo({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}_options?: Configuration{{^useInversify}}Options{{/useInversify}}): Promise<HttpInfo<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
         const result = this.api.{{nickname}}WithHttpInfo({{#allParams}}{{paramName}}, {{/allParams}}_options);
         return result.toPromise();
     }
@@ -67,7 +70,7 @@ export class Promise{{classname}} {
      * @param {{#required}}{{paramName}}{{/required}}{{^required}}[{{paramName}}]{{/required}}{{#description}} {{description}}{{/description}}
      {{/allParams}}
      */
-    public {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}_options?: Configuration): Promise<{{{returnType}}}{{^returnType}}void{{/returnType}}> {
+    public {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}_options?: Configuration{{^useInversify}}Options{{/useInversify}}): Promise<{{{returnType}}}{{^returnType}}void{{/returnType}}> {
         const result = this.api.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}_options);
         return result.toPromise();
     }