@penkov/swagger-code-gen 1.1.0 → 1.1.1

package/dist/templates/index.ejs

@@ -10,32 +10,28 @@
  *********************************************************
  *********************************************************
  *********************************************************/
-import fetch from 'node-fetch';
+import fetch, {Request, Response} from 'node-fetch';
 <% if (scats) {%>
 import {option, Option, Collection, Try, TryLike, none} from 'scats';
 <% } %>
 
 export interface RequestOptions {
-    headers: Record<string, string>;
+    apiPrefix?: string;
+    headers?: Record<string, string>;
+    preProcessRequest?: (request: Request) => Request;
+    postProcessResponse?: (request: Request, response: Response) => Response;
 }
 
 
-export interface SwaggerCodeGenParams {
-    apiPrefix: string;
-    requestOptions: RequestOptions
-}
-
-export const swaggerCodeGenParams: SwaggerCodeGenParams = {
+export const defaultReqOpts: RequestOptions = {
     apiPrefix: '',
-    requestOptions: {
-        headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json'
-        }
+    headers: {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json'
     }
 };
 
-const defaultRequestOptions = () => swaggerCodeGenParams.requestOptions;
+const defaultRequestOptions = () => defaultReqOpts;
 
 <% schemas.foreach(schema => { %>
 <%- include('schema.ejs', {schema: schema}); %>

package/dist/templates/method.ejs

@@ -53,11 +53,11 @@ export async function <%= method.endpointName %>(
         query = '?' + queryParams.join('&');
     }
     <%_ }  -%>
-    const resp = await fetch(`${swaggerCodeGenParams.apiPrefix}<%- method.pathWithSubstitutions %>${query}`, {
+    const request = new Request(`${requestOptions.apiPrefix}<%- method.pathWithSubstitutions %>${query}`, {
         method: '<%= method.method %>',
         body: <%= method.body.map(() => 'JSON.stringify(body)').getOrElseValue('undefined') %>,
         headers: {
-            ...requestOptions.headers,
+            ...option(requestOptions.headers).getOrElseValue({}),
             <%_ if (method.parameters.filter(x => x.in === 'header').nonEmpty) { -%>
             <%_ method.parameters.filter(x => x.in === 'header').foreach(p => { -%>
             <%= p.name %>: <%= method.parameters.size > 2 ? 'params.' : '' %><%= p.uniqueName %>
@@ -65,11 +65,15 @@ export async function <%= method.endpointName %>(
             <%_ }  -%>
         }
     });
-   if (resp.ok) {
-       const json = await resp.json();
-       return json as <%= method.response.responseType %>;
-   } else {
-       throw resp;
-   }
-
+    const preprocessed = option(requestOptions.preProcessRequest).map(cb => cb(request)).getOrElseValue(request);
+    const resp = await fetch(preprocessed);
+    if (resp.ok) {
+        const postprocessed = option(requestOptions.postProcessResponse)
+            .map(cb => cb(preprocessed, resp))
+            .getOrElseValue(resp);
+        const json = await postprocessed.json();
+        return json as <%= method.response.responseType %>;
+    } else {
+        throw resp;
+    }
 }

package/dist/templates/scats-method.ejs

@@ -1,6 +1,6 @@
 export class ApiClient {
 
-    constructor(private readonly requestOptions: RequestOptions = swaggerCodeGenParams.requestOptions) {
+    constructor(private readonly requestOptions: RequestOptions = defaultRequestOptions()) {
     }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "bin": {
     "generate-client": "./dist/cli.mjs"