@devlearning/swagger-generator 1.1.5 → 1.1.7

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

@@ -29,7 +29,7 @@ export class ApiAngularWriter {
     ${queryParametersPreparation}${requestPreparation}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${api.url}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''}, ${httpOptions})
       .pipe(
         map(x => this._handleResponse(x)),
-        catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
+        catchError((err, obs) => this._handleError(err, obs, skipErrorHandling))
       );
   }
 `;
@@ -43,6 +43,7 @@ export class ApiAngularWriter {
             const typeName = parameter.typeName === 'dateTime' ? libraryDate : `${prefixType}${Normalizator.mapTsTypeToAngular(parameter.typeName)}`;
             parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${typeName}, `;
         });
+        parametersString += 'skipErrorHandling: boolean = false, ';
         if (api.parameters.length > 0)
             parametersString = parametersString.substring(0, parametersString.length - 2);
         return parametersString;

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

@@ -1,4 +1,4 @@
-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(error: any, obs: any): Observable<never>;\n";
+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

@@ -19,7 +19,7 @@ export abstract class ApiAutogeneratedService {
   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<T>(error: any, obs: Observable<T>, skipErrorHandling: boolean): Observable<never>;
 `;
 export const API_POST = `}`;
 export const MODEL_PRE = `import * as moment from 'moment';

package/dist/models/swagger-component-property.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger-component.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger-content.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger-info.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger-method.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger-schema.js

@@ -0,0 +1 @@
+export {};

package/dist/models/swagger.js

@@ -0,0 +1 @@
+export {};

package/package.json

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

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

@@ -41,7 +41,7 @@ export class ApiAngularWriter {
     ${queryParametersPreparation}${requestPreparation}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${api.url}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''}, ${httpOptions})
       .pipe(
         map(x => this._handleResponse(x)),
-        catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
+        catchError((err, obs) => this._handleError(err, obs, skipErrorHandling))
       );
   }
 `;
@@ -60,6 +60,8 @@ export class ApiAngularWriter {
       parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${typeName}, `;
     });
 
+    parametersString += 'skipErrorHandling: boolean = false, ';
+
     if (api.parameters.length > 0)
       parametersString = parametersString.substring(0, parametersString.length - 2);
 

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

@@ -20,7 +20,7 @@ export abstract class ApiAutogeneratedService {
   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<T>(error: any, obs: Observable<T>, skipErrorHandling: boolean): Observable<never>;
 `;
 
 export const API_POST =

package/dist/templates/api.mustache

@@ -1,29 +0,0 @@
-import 'package:{{package}}/core/di/injector.dart';
-import 'package:dio/dio.dart';
-{{#imports}}
-{{{.}}}
-{{/imports}}
-
-class {{apiClassName}} {
-  final Dio _dio;
-
-  {{apiClassName}}() : _dio = getIt<Dio>();
-
-  {{#endpoints}}
-  Future<{{responseType}}> {{methodName}}({{#haveRequest}}{{requestType}} request{{/haveRequest}}) async {
-    final response = await _dio.{{httpMethod}}(
-      '{{{path}}}',
-      {{#haveRequest}}
-      {{#isGet}}
-      queryParameters: request.toJson(),
-      {{/isGet}}
-      {{^isGet}}
-      data: request.toJson(),
-      {{/isGet}}
-      {{/haveRequest}}
-    );
-    return {{responseType}}.fromJson(response.data);
-  }
-
-  {{/endpoints}}
-}

package/dist/templates/model.mustache

@@ -1,18 +0,0 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-{{#imports}}
-{{{.}}}
-{{/imports}}
-
-part '{{filename}}.freezed.dart';
-part '{{filename}}.g.dart';
-
-@freezed
-abstract class {{modelName}} with _${{modelName}} {
-  const factory {{modelName}}({
-    {{#fields}}
-    {{required}}{{type}}{{nullable}} {{name}},
-    {{/fields}}
-  }) = _{{modelName}};
-
-  factory {{modelName}}.fromJson(Map<String, dynamic> json) => _${{modelName}}FromJson(json);
-}