@penkov/swagger-code-gen 1.4.0 → 1.5.1

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 = [];
@@ -148,19 +148,7 @@ export async function findPetsByStatus(
       ...option(requestOptions.headers).getOrElseValue({}),
     }
   });
-  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 = option(resp.headers.get('content-length'))
-            .map(x => parseInt(x))
-            .getOrElseValue(0) > 0 ? await postProcessed.json() : null;
-    return json as ReadonlyArray<Pet>;
-  } else {
-    throw resp;
-  }
+  return requestImpl<Pet>(request, requestOptions);
 }
 
 
@@ -170,48 +158,53 @@ export async function findPetsByStatus(
 
 // scats wrappers
 
-export class OrderDto {
+
+export class PetDto {
 
   constructor(
           readonly id: number,
-          readonly petId: number,
-          readonly quantity: number,
-          readonly shipDate: string,
+          readonly name: string,
+          readonly category: CategoryDto,
+          readonly photoUrls: Collection<string>,
+          readonly tags: Collection<TagDto>,
           readonly status: string,
-          readonly complete: boolean,
   ) {}
 
 
-  static fromJson(json: Order): OrderDto {
-    return new OrderDto(
+  static fromJson(json: Pet): PetDto {
+    return new PetDto(
             json.id,
-            json.petId,
-            json.quantity,
-            json.shipDate,
+            json.name,
+            CategoryDto.fromJson(json.category),
+            Collection.from(option(json.photoUrls).getOrElseValue([]))
+            ,
+            Collection.from(option(json.tags).getOrElseValue([]))
+                    .map(i => TagDto.fromJson(i)),
             json.status,
-            json.complete,
     );
   }
 
-  copy(fields: Partial<OrderDto>): OrderDto {
-    return new OrderDto(
+  copy(fields: Partial<PetDto>): PetDto {
+    return new PetDto(
             option(fields.id).getOrElseValue(this.id),
-            option(fields.petId).getOrElseValue(this.petId),
-            option(fields.quantity).getOrElseValue(this.quantity),
-            option(fields.shipDate).getOrElseValue(this.shipDate),
+            option(fields.name).getOrElseValue(this.name),
+            option(fields.category).getOrElseValue(this.category),
+            option(fields.photoUrls).getOrElseValue(this.photoUrls),
+            option(fields.tags).getOrElseValue(this.tags),
             option(fields.status).getOrElseValue(this.status),
-            option(fields.complete).getOrElseValue(this.complete),
     );
   }
 
-  get toJson(): Order {
+  get toJson(): Pet {
     return {
       id: this.id,
-      petId: this.petId,
-      quantity: this.quantity,
-      shipDate: this.shipDate,
+      name: this.name,
+      category: this.category.toJson,
+      photoUrls: this.photoUrls
+              .toArray,
+      tags: this.tags
+              .map(_ => _.toJson)                .toArray,
       status: this.status,
-      complete: this.complete,
     };
   }
 }
@@ -219,17 +212,18 @@ export class OrderDto {
 
 export class ApiClient {
 
-  constructor(private readonly requestOptions: RequestOptions = defaultRequestOptions()) {
+  constructor(private readonly requestOptions: RequestOptions = defReqOpts()) {
   }
 
+  // ... some methods skipped
 
   async updatePet(
-          body: Pet,
+          body: PetDto,
           requestOptions: RequestOptions = this.requestOptions
   ): Promise<TryLike<PetDto>> {
     return (await Try.promise(() =>
             updatePet(
-                    body,
+                    body.toJson,
                     requestOptions
             )
     ))
@@ -237,17 +231,18 @@ export class ApiClient {
             ;
   }
 
-  async addPet(
-          body: Pet,
+  async findPetsByStatus(
+          status: 'available' | 'pending' | 'sold',
           requestOptions: RequestOptions = this.requestOptions
-  ): Promise<TryLike<PetDto>> {
+  ): Promise<TryLike<Collection<PetDto>>> {
     return (await Try.promise(() =>
-            addPet(
-                    body,
+            findPetsByStatus(
+                    status,
                     requestOptions
             )
     ))
-            .map(res => PetDto.fromJson(res))
+            .map(res => Collection.from(option(res).getOrElseValue([])))
+            .map(items => items.map(i => PetDto.fromJson(i)))
             ;
   }
 

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

@@ -23,7 +23,7 @@ export interface RequestOptions {
 }
 
 
-export const defaultReqOpts: RequestOptions = {
+export const defaultRequestOptions: RequestOptions = {
     apiPrefix: '',
     headers: {
         'Accept': 'application/json',
@@ -31,7 +31,7 @@ export const defaultReqOpts: RequestOptions = {
     }
 };
 
-const defaultRequestOptions = () => defaultReqOpts;
+const defReqOpts = () => defaultRequestOptions;
 
 
 async function requestImpl<T>(request: Request, requestOptions: RequestOptions): Promise<T> {

package/dist/templates/method.ejs

@@ -33,7 +33,7 @@ export async function <%= method.endpointName %>(
     <%_ if (method.body.nonEmpty) { -%>
     body: <%- method.body.get.jsType %>,
     <%_ } -%>
-    requestOptions: RequestOptions = defaultRequestOptions()
+    requestOptions: RequestOptions = defReqOpts()
 ): Promise<<%- method.response.responseType %>> {
     let query = '';
     <%_ if (method.parameters.filter(x => x.in === 'query').nonEmpty) { -%>

package/dist/templates/scats-method.ejs

@@ -1,6 +1,6 @@
 export class ApiClient {
 
-    constructor(private readonly requestOptions: RequestOptions = defaultRequestOptions()) {
+    constructor(private readonly requestOptions: RequestOptions = defReqOpts()) {
     }
 
 
@@ -18,7 +18,7 @@ export class ApiClient {
         },
         <%_ } -%>
         <%_ method.body.foreach(body => { -%>
-        body: <%- body.jsType %>,
+        body: <%- body.scatsWrapperType %>,
         <%_ }); -%>
         requestOptions: RequestOptions = this.requestOptions
     ): Promise<TryLike<<%- method.response.asProperty.scatsWrapperType %>>> {
@@ -31,9 +31,23 @@ export class ApiClient {
                     <%_ } else { -%>
                     params,
                     <%_ } -%>
-                    <%_ if (method.body.nonEmpty) { -%>
+                    <%_ method.body.foreach(body => { -%>
+                    <%_ if (body.schemaType === 'object') { _%>
+                    body.toJson,
+                    <%_ } else if (body.schemaType === 'property') { _%>
+                    <%_ if (body.isArray && body.itemReferencesObject) { _%>
+                    body.map(_ => _.toJson).toArray,
+                    <%_ } else if (body.isArray && !body.itemReferencesObject) { -%>
+                    body.toArray,
+                    <%_ } else if (body.referencesObject) { -%>
+                    body.toJson,
+                    <%_ } else { -%>
+                    body,
+                    <%_ } -%>
+                    <%_ } else { -%>
                     body,
                     <%_ } -%>
+                    <%_ }); -%>
                     requestOptions
                 )
             ))

package/package.json

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