@penkov/swagger-code-gen 1.5.0 → 1.6.0

package/README.md

@@ -106,7 +106,7 @@ export interface ApiResponse {
  */
 export async function updatePet(
         body: Pet,
-        requestOptions: RequestOptions = defaultRequestOptions()
+        requestOptions: RequestOptions = defReqOpts()
 ): Promise<Pet> {
   let query = '';
   const request = new Request(`${requestOptions.apiPrefix}/pet${query}`, {
@@ -133,7 +133,7 @@ export async function updatePet(
  */
 export async function findPetsByStatus(
         status: 'available' | 'pending' | 'sold' = 'available',
-        requestOptions: RequestOptions = defaultRequestOptions()
+        requestOptions: RequestOptions = defReqOpts()
 ): Promise<ReadonlyArray<Pet>> {
   let query = '';
   const queryParams = [];
@@ -212,7 +212,7 @@ export class PetDto {
 
 export class ApiClient {
 
-  constructor(private readonly requestOptions: RequestOptions = defaultRequestOptions()) {
+  constructor(private readonly requestOptions: RequestOptions = defReqOpts()) {
   }
 
   // ... some methods skipped

package/dist/method.js

@@ -41,7 +41,19 @@ export class Method {
             return mimeTypes
                 .find(_ => _ === 'application/json')
                 .orElseValue(mimeTypes.headOption)
-                .map(mt => SchemaFactory.build('body', body[mt].schema, schemasTypes, options));
+                .map(mt => {
+                const bodySchemaDef = body[mt].schema;
+                const res = SchemaFactory.build('body', bodySchemaDef, schemasTypes, options);
+                if (res.schemaType === 'property') {
+                    const bProperty = res;
+                    return bProperty.copy({
+                        nullable: bProperty.referencesObject ? option(bodySchemaDef['nullable']).contains(true) : bProperty.nullable
+                    });
+                }
+                else {
+                    return res;
+                }
+            });
         });
         this.bodyDescription = option(def.requestBody).flatMap(body => option(body.description));
         const statusCodes = Collection.from(Object.keys(def.responses))

package/dist/templates/index.ejs

@@ -18,8 +18,8 @@ import {option, Option, Collection, Try, TryLike, none} from 'scats';
 export interface RequestOptions {
     apiPrefix?: string;
     headers?: Record<string, string>;
-    preProcessRequest?: (request: Request) => Request;
-    postProcessResponse?: (request: Request, response: Response) => Response;
+    preProcessRequest?: (request: Request) => Request | Promise<Request>;
+    postProcessResponse?: (request: Request, response: Response) => Response | Promise<Response>;
 }
 
 
@@ -33,12 +33,11 @@ export const defaultRequestOptions: RequestOptions = {
 
 const defReqOpts = () => defaultRequestOptions;
 
-
 async function requestImpl<T>(request: Request, requestOptions: RequestOptions): Promise<T> {
-    const preProcessed = requestOptions.preProcessRequest ? requestOptions.preProcessRequest(request) : request;
+    const preProcessed = requestOptions.preProcessRequest ? await requestOptions.preProcessRequest(request) : request;
     const resp = await fetch(preProcessed);
-    if (resp.ok) {
-        const postProcessed = requestOptions.postProcessResponse ? requestOptions.postProcessResponse(preProcessed, resp) : resp;
+    const postProcessed = requestOptions.postProcessResponse ? await requestOptions.postProcessResponse(preProcessed, resp) : resp;
+    if (postProcessed.ok) {
         let json: any = null;
         if (postProcessed.headers.has('content-length')) {
             const ct = parseInt(postProcessed.headers.get('content-length'));
@@ -48,9 +47,8 @@ async function requestImpl<T>(request: Request, requestOptions: RequestOptions):
         }
         return json as T;
     } else {
-        throw resp;
+        throw postProcessed;
     }
-
 }
 
 <% schemas.foreach(schema => { %>

package/package.json

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