@devlearning/swagger-generator 1.1.23 → 1.1.25

package/dist/generator.d.ts

@@ -41,5 +41,7 @@ export declare class Generator {
     retrieveNestedObjectsRecursive(swaggerComponent: SwaggerComponent, usedTypes: TypeDto[]): void;
     getNativeType(schema: SwaggerSchema): string;
     getApiNameNormalized(apiName: string): string;
+    private getMultipartModelName;
+    private getMultipartModelNameForTarget;
     toFirstLetterLowercase(value: string): string;
 }

package/dist/generator.js

@@ -133,9 +133,9 @@ export class Generator {
                 return;
             }
             this._models.push({
-                typeName: this.getApiNameNormalized(apiName),
+                typeName: this.getMultipartModelNameForTarget(apiName),
                 modelType: 'class',
-                name: this.getApiNameNormalized(apiName),
+                name: this.getMultipartModelNameForTarget(apiName),
                 properties: this.retrieveSchemaProperties(schema),
                 enumValues: [],
             });
@@ -217,18 +217,33 @@ export class Generator {
             });
             if (swaggerMethod.requestBody != null && swaggerMethod.requestBody.content[contentTypeMultipartFormData] != null) {
                 const schema = swaggerMethod.requestBody.content[contentTypeMultipartFormData].schema;
-                const type = this.retrieveType(schema);
-                parameters.unshift({
-                    name: 'request',
-                    typeName: type.typeName,
-                    nullable: false,
-                    isQuery: false,
-                    isEnum: false,
-                    isTypeReference: type.isTypeReference ?? true,
-                    isNativeType: type.isNativeType ?? false,
-                    isArray: type.isArray ?? false,
-                    isVoid: type.isVoid ?? false,
-                });
+                if (schema?.$ref == null && schema?.type === 'object') {
+                    parameters.unshift({
+                        name: 'request',
+                        typeName: this.getMultipartModelNameForTarget(apiName),
+                        nullable: false,
+                        isQuery: false,
+                        isEnum: false,
+                        isTypeReference: true,
+                        isNativeType: false,
+                        isArray: false,
+                        isVoid: false,
+                    });
+                }
+                else {
+                    const type = this.retrieveType(schema);
+                    parameters.unshift({
+                        name: 'request',
+                        typeName: type.typeName,
+                        nullable: false,
+                        isQuery: false,
+                        isEnum: false,
+                        isTypeReference: type.isTypeReference ?? true,
+                        isNativeType: type.isNativeType ?? false,
+                        isArray: type.isArray ?? false,
+                        isVoid: type.isVoid ?? false,
+                    });
+                }
             }
             else {
                 if (swaggerMethod.requestBody != null) {
@@ -675,6 +690,16 @@ export class Generator {
         }
         return normalizedApiName;
     }
+    getMultipartModelName(apiName) {
+        return Utils.toPascalCase(Utils.getNormalizedApiPathAngular(apiName));
+    }
+    getMultipartModelNameForTarget(apiName) {
+        if (this._commandLineArgs.target === TargetGeneration.Angular) {
+            return this.getMultipartModelName(apiName);
+        }
+        // Preserve pre-existing naming for non-Angular targets.
+        return this.getApiNameNormalized(apiName);
+    }
     toFirstLetterLowercase(value) {
         return value.charAt(0).toLowerCase() + value.slice(1);
     }

package/dist/generators-writers/angular/api-angular-writer.d.ts

@@ -12,6 +12,7 @@ export declare class ApiAngularWriter {
     private _queryParameters;
     private _queryParametersStatement;
     private _requestPreparation;
+    private _isIgnoredAngularParameter;
     private _writeFile;
     private _getApiPre;
 }

package/dist/generators-writers/angular/api-angular-writer.js

@@ -41,6 +41,9 @@ export class ApiAngularWriter {
     _parameters(api) {
         let parametersString = '';
         api.parameters.forEach(parameter => {
+            if (this._isIgnoredAngularParameter(parameter)) {
+                return;
+            }
             const libraryDate = 'moment.Moment';
             const prefixType = parameter.isEnum || !parameter.isNativeType ? 'Models.' : '';
             const typeName = parameter.typeName === 'dateTime' ? libraryDate : `${prefixType}${Normalizator.mapTsTypeToAngular(parameter.typeName)}`;
@@ -59,6 +62,9 @@ export class ApiAngularWriter {
     _queryParametersPreparation(api) {
         let queryParametersPreparation = '';
         api.parameters.forEach(parameter => {
+            if (this._isIgnoredAngularParameter(parameter)) {
+                return;
+            }
             if (parameter.isQuery) {
                 queryParametersPreparation += this._queryParametersPreparationStatement(parameter);
             }
@@ -90,6 +96,9 @@ export class ApiAngularWriter {
     _queryParameters(api) {
         let queryParameters = '';
         api.parameters.forEach(parameter => {
+            if (this._isIgnoredAngularParameter(parameter)) {
+                return;
+            }
             if (parameter.isQuery) {
                 queryParameters += this._queryParametersStatement(parameter);
             }
@@ -119,6 +128,9 @@ export class ApiAngularWriter {
     `;
         }
     }
+    _isIgnoredAngularParameter(parameter) {
+        return parameter.name?.toLowerCase() === 'version';
+    }
     _writeFile(apis) {
         const className = this._commandLineArgs.apiClientName || 'ApiAutogeneratedService';
         const apiPre = this._getApiPre(className);
@@ -148,7 +160,7 @@ export abstract class ${className} {
   protected abstract _handleRequest<T>(request: T): T;
   protected abstract _handleMultipart<T>(request: T): FormData;
   protected abstract _handleResponse<T>(response: T): T;
-  protected abstract _handleError(error: any, obs: any): Observable<never>;
+  protected abstract _handleError(error: any, obs: any, skipErrorHandling: boolean): Observable<never>;
 `;
     }
 }

package/dist/generators-writers/angular/constants.d.ts

@@ -1,4 +1,3 @@
-export declare const API_PRE = "import { HttpClient } from '@angular/common/http';\nimport { Observable, catchError, map } from 'rxjs';\nimport * as Models from './model.autogenerated';\nimport { HttpHeaders } from \"@angular/common/http\";\n\nexport const httpOptions = {\n  headers: new HttpHeaders({ 'Content-Type': 'application/json' }),\n};\n\nexport const httpOptionsMultipart = {};\n\nexport abstract class ApiAutogeneratedService {\n  constructor(\n    public _http: HttpClient,\n    public _baseUrl: string,\n  ) { }\n\n  protected abstract _momentToString(moment: moment.Moment): string;\n  protected abstract _handleRequest<T>(request: T): T;\n  protected abstract _handleMultipart<T>(request: T): FormData;\n  protected abstract _handleResponse<T>(response: T): T;\n  protected abstract _handleError<T>(error: any, obs: Observable<T>, skipErrorHandling: boolean): Observable<never>;\n";
 export declare const API_POST = "}";
 export declare const MODEL_PRE = "import * as moment from 'moment';\n  ";
 export declare const MODEL_POST = "\n";

package/dist/generators-writers/angular/constants.js

@@ -1,26 +1,3 @@
-export const API_PRE = `import { HttpClient } from '@angular/common/http';
-import { Observable, catchError, map } from 'rxjs';
-import * as Models from './model.autogenerated';
-import { HttpHeaders } from "@angular/common/http";
-
-export const httpOptions = {
-  headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
-};
-
-export const httpOptionsMultipart = {};
-
-export abstract class ApiAutogeneratedService {
-  constructor(
-    public _http: HttpClient,
-    public _baseUrl: string,
-  ) { }
-
-  protected abstract _momentToString(moment: moment.Moment): string;
-  protected abstract _handleRequest<T>(request: T): T;
-  protected abstract _handleMultipart<T>(request: T): FormData;
-  protected abstract _handleResponse<T>(response: T): T;
-  protected abstract _handleError<T>(error: any, obs: Observable<T>, skipErrorHandling: boolean): Observable<never>;
-`;
 export const API_POST = `}`;
 export const MODEL_PRE = `import * as moment from 'moment';
   `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devlearning/swagger-generator",
-  "version": "1.1.23",
+  "version": "1.1.25",
   "description": "Swagger generator apis and models for Angular and NextJS",
   "main": "index.js",
   "type": "module",

package/src/generator.ts

@@ -175,9 +175,9 @@ export class Generator {
       }
 
       this._models.push({
-        typeName: this.getApiNameNormalized(apiName),
+        typeName: this.getMultipartModelNameForTarget(apiName),
         modelType: 'class',
-        name: this.getApiNameNormalized(apiName),
+        name: this.getMultipartModelNameForTarget(apiName),
         properties: this.retrieveSchemaProperties(schema),
         enumValues: [],
       });
@@ -264,18 +264,32 @@ export class Generator {
 
       if (swaggerMethod.requestBody != null && swaggerMethod.requestBody.content[contentTypeMultipartFormData] != null) {
         const schema = swaggerMethod.requestBody.content[contentTypeMultipartFormData].schema;
-        const type = this.retrieveType(schema);
-        parameters.unshift({
-          name: 'request',
-          typeName: type.typeName,
-          nullable: false,
-          isQuery: false,
-          isEnum: false,
-          isTypeReference: type.isTypeReference ?? true,
-          isNativeType: type.isNativeType ?? false,
-          isArray: type.isArray ?? false,
-          isVoid: type.isVoid ?? false,
-        });
+        if (schema?.$ref == null && schema?.type === 'object') {
+          parameters.unshift({
+            name: 'request',
+            typeName: this.getMultipartModelNameForTarget(apiName),
+            nullable: false,
+            isQuery: false,
+            isEnum: false,
+            isTypeReference: true,
+            isNativeType: false,
+            isArray: false,
+            isVoid: false,
+          });
+        } else {
+          const type = this.retrieveType(schema);
+          parameters.unshift({
+            name: 'request',
+            typeName: type.typeName,
+            nullable: false,
+            isQuery: false,
+            isEnum: false,
+            isTypeReference: type.isTypeReference ?? true,
+            isNativeType: type.isNativeType ?? false,
+            isArray: type.isArray ?? false,
+            isVoid: type.isVoid ?? false,
+          });
+        }
       } else {
         if (swaggerMethod.requestBody != null) {
           const type = this.retrieveType(swaggerMethod.requestBody.content[contentTypeApplicationJson].schema);
@@ -747,6 +761,19 @@ export class Generator {
     return normalizedApiName;
   }
 
+  private getMultipartModelName(apiName: string): string {
+    return Utils.toPascalCase(Utils.getNormalizedApiPathAngular(apiName));
+  }
+
+  private getMultipartModelNameForTarget(apiName: string): string {
+    if (this._commandLineArgs.target === TargetGeneration.Angular) {
+      return this.getMultipartModelName(apiName);
+    }
+
+    // Preserve pre-existing naming for non-Angular targets.
+    return this.getApiNameNormalized(apiName);
+  }
+
   toFirstLetterLowercase(value: string) {
     return value.charAt(0).toLowerCase() + value.slice(1);
   }

package/src/generators-writers/angular/api-angular-writer.ts

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { API_POST, API_PRE } from './constants.js';
+import { API_POST } from './constants.js';
 import { ApiDto } from '../../models/api-dto.js';
 import { Utils } from '../utils.js';
 import { ParameterDto } from '../../models/parameter-dto.js';
@@ -58,6 +58,10 @@ export class ApiAngularWriter {
     let parametersString = '';
 
     api.parameters.forEach(parameter => {
+      if (this._isIgnoredAngularParameter(parameter)) {
+        return;
+      }
+
       const libraryDate = 'moment.Moment';
       const prefixType = parameter.isEnum || !parameter.isNativeType ? 'Models.' : '';
       const typeName = parameter.typeName === 'dateTime' ? libraryDate : `${prefixType}${Normalizator.mapTsTypeToAngular(parameter.typeName)}`;
@@ -83,6 +87,10 @@ export class ApiAngularWriter {
     let queryParametersPreparation = '';
 
     api.parameters.forEach(parameter => {
+      if (this._isIgnoredAngularParameter(parameter)) {
+        return;
+      }
+
       if (parameter.isQuery) {
         queryParametersPreparation += this._queryParametersPreparationStatement(parameter);
       }
@@ -115,6 +123,10 @@ export class ApiAngularWriter {
     let queryParameters = '';
 
     api.parameters.forEach(parameter => {
+      if (this._isIgnoredAngularParameter(parameter)) {
+        return;
+      }
+
       if (parameter.isQuery) {
         queryParameters += this._queryParametersStatement(parameter);
       }
@@ -149,6 +161,10 @@ export class ApiAngularWriter {
     }
   }
 
+  private _isIgnoredAngularParameter(parameter: ParameterDto): boolean {
+    return parameter.name?.toLowerCase() === 'version';
+  }
+
   private _writeFile(apis: string) {
     const className = this._commandLineArgs.apiClientName || 'ApiAutogeneratedService';
     const apiPre = this._getApiPre(className);
@@ -182,7 +198,7 @@ export abstract class ${className} {
   protected abstract _handleRequest<T>(request: T): T;
   protected abstract _handleMultipart<T>(request: T): FormData;
   protected abstract _handleResponse<T>(response: T): T;
-  protected abstract _handleError(error: any, obs: any): Observable<never>;
+  protected abstract _handleError(error: any, obs: any, skipErrorHandling: boolean): Observable<never>;
 `;
   }
 }

package/src/generators-writers/angular/constants.ts

@@ -1,28 +1,3 @@
-export const API_PRE =
-  `import { HttpClient } from '@angular/common/http';
-import { Observable, catchError, map } from 'rxjs';
-import * as Models from './model.autogenerated';
-import { HttpHeaders } from "@angular/common/http";
-
-export const httpOptions = {
-  headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
-};
-
-export const httpOptionsMultipart = {};
-
-export abstract class ApiAutogeneratedService {
-  constructor(
-    public _http: HttpClient,
-    public _baseUrl: string,
-  ) { }
-
-  protected abstract _momentToString(moment: moment.Moment): string;
-  protected abstract _handleRequest<T>(request: T): T;
-  protected abstract _handleMultipart<T>(request: T): FormData;
-  protected abstract _handleResponse<T>(response: T): T;
-  protected abstract _handleError<T>(error: any, obs: Observable<T>, skipErrorHandling: boolean): Observable<never>;
-`;
-
 export const API_POST =
   `}`;