@devlearning/swagger-generator 1.0.24 → 1.0.25

package/autogen/user_profile/api/user_profile_api.dart

@@ -1,62 +1,51 @@
-import 'package:coqudo_app/core/di/injector.dart';
-import 'package:dio/dio.dart';
-import 'package:coqudo_app/autogen/service_defaults/models/result.dart';
-import 'package:coqudo_app/autogen/user_profile/models/test_save_command.dart';
-import 'package:coqudo_app/autogen/user_profile/models/user_general_info_save_command.dart';
-
-class UserProfileApi {
-  final Dio _dio;
-
-  UserProfileApi() : _dio = getIt<Dio>();
-
-  Future<Result> userGeneralInfoTestRead(
-    
-    String name,
-    DateTime? date,
-    int? integer,
-    ) async {
-    final response = await _dio.get(
-      '/user-profile/UserGeneralInfo/test/read',
-      queryParameters: {
-      'name': name,
-      if (date != null) 'date': date,
-      if (integer != null) 'integer': integer,
-      },
-    );
-    return Result.fromJson(response.data);
-  }
-
-  Future<Result> userGeneralInfoTestList(
-    
-    String name,
-    ) async {
-    final response = await _dio.get(
-      '/user-profile/UserGeneralInfo/test/list',
-      queryParameters: {
-      'name': name,
-      },
-    );
-    return Result.fromJson(response.data);
-  }
-
-  Future<Result> userGeneralInfoTestSave(
-    TestSaveCommand request
-    ) async {
-    final response = await _dio.post(
-      '/user-profile/UserGeneralInfo/test/save',
-      data: request.toJson(),
-    );
-    return Result.fromJson(response.data);
-  }
-
-  Future<Result> userGeneralInfoSave(
-    UserGeneralInfoSaveCommand request
-    ) async {
-    final response = await _dio.post(
-      '/user-profile/UserGeneralInfo/save',
-      data: request.toJson(),
-    );
-    return Result.fromJson(response.data);
-  }
-
-}
+import 'package:coqudo_app/core/di/injector.dart';
+import 'package:dio/dio.dart';
+import 'package:coqudo_app/autogen/service_defaults/models/result.dart';
+import 'package:coqudo_app/autogen/user_profile/models/user_general_info_save_command.dart';
+
+class UserProfileApi {
+  final Dio _dio;
+
+  UserProfileApi() : _dio = getIt<Dio>();
+
+  Future<Result> userGeneralInfoRead(
+    
+    String name,
+    DateTime? date,
+    int? integer,
+    ) async {
+    final response = await _dio.get(
+      '/user-profile/UserGeneralInfo/read',
+      queryParameters: {
+      'name': name,
+      if (date != null) 'date': date,
+      if (integer != null) 'integer': integer,
+      },
+    );
+    return Result.fromJson(response.data);
+  }
+
+  Future<Result> userGeneralInfoList(
+    
+    String name,
+    ) async {
+    final response = await _dio.get(
+      '/user-profile/UserGeneralInfo/list',
+      queryParameters: {
+      'name': name,
+      },
+    );
+    return Result.fromJson(response.data);
+  }
+
+  Future<Result> userGeneralInfoSave(
+    UserGeneralInfoSaveCommand request
+    ) async {
+    final response = await _dio.post(
+      '/user-profile/UserGeneralInfo/save',
+      data: request.toJson(),
+    );
+    return Result.fromJson(response.data);
+  }
+
+}

package/autogen/user_profile/models/user_general_info_save_command.dart

@@ -1,13 +1,17 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'user_general_info_save_command.freezed.dart';
-part 'user_general_info_save_command.g.dart';
-
-@freezed
-abstract class UserGeneralInfoSaveCommand with _$UserGeneralInfoSaveCommand {
-  const factory UserGeneralInfoSaveCommand({
-    String? name,
-  }) = _UserGeneralInfoSaveCommand;
-
-  factory UserGeneralInfoSaveCommand.fromJson(Map<String, dynamic> json) => _$UserGeneralInfoSaveCommandFromJson(json);
-}
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'user_general_info_save_command.freezed.dart';
+part 'user_general_info_save_command.g.dart';
+
+@freezed
+abstract class  with _$ {
+  const factory ({
+    String? displayName,
+    String? profilePictureUrl,
+    String? email,
+    String? phoneNumber,
+    required int avgRating,
+  }) = _;
+
+  factory .fromJson(Map<String, dynamic> json) => _$FromJson(json);
+}

package/dist/api.constants.js

@@ -1,24 +1,24 @@
-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(error: any, obs: any): Observable<never>;
+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(error: any, obs: any): Observable<never>;
 `;
 export const API_POST = `}`;

package/dist/generator.js

@@ -417,10 +417,15 @@ export class Generator {
             return [];
         let values = [];
         for (let index = 0; index < swaggerCopmponent.enum.length; index++) {
-            values.push({
-                name: swaggerCopmponent.enum[index].split('-')[0].trim(),
-                value: swaggerCopmponent.enum[index].split('-')[1].trim(),
-            });
+            try {
+                values.push({
+                    name: swaggerCopmponent.enum[index].split('-')[0].trim(),
+                    value: swaggerCopmponent.enum[index].split('-')[1].trim(),
+                });
+            }
+            catch (error) {
+                debugger;
+            }
         }
         return values;
     }

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

@@ -23,14 +23,14 @@ export class ApiAngularWriter {
         let haveRequest = api.haveRequest;
         let method = api.method.toLowerCase();
         let httpOptions = api.isMultiPart ? 'httpOptionsMultiPart' : 'httpOptions';
-        let apiString = `
-  public ${apiNameNormalized}(${parametersString}): Observable<${returnTypeString}> {
-    ${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))
-      );
-  }
+        let apiString = `
+  public ${apiNameNormalized}(${parametersString}): Observable<${returnTypeString}> {
+    ${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))
+      );
+  }
 `;
         return apiString;
     }
@@ -61,21 +61,21 @@ export class ApiAngularWriter {
     _queryParametersPreparationStatement(parameter) {
         if (parameter.nullable) {
             if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-                return `let ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined && ${parameter.name}.isValid() ? encodeURIComponent(this._momentToString(${parameter.name})) : '';
+                return `let ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined && ${parameter.name}.isValid() ? encodeURIComponent(this._momentToString(${parameter.name})) : '';
       `;
             }
             else {
-                return `let ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined ? encodeURIComponent('' + ${parameter.name}) : '';
+                return `let ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined ? encodeURIComponent('' + ${parameter.name}) : '';
       `;
             }
         }
         else {
             if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-                return `let ${parameter.name}Param: string = encodeURIComponent(this._momentToString(${parameter.name}));
+                return `let ${parameter.name}Param: string = encodeURIComponent(this._momentToString(${parameter.name}));
       `;
             }
             else {
-                return `let ${parameter.name}Param: string = encodeURIComponent('' + ${parameter.name});
+                return `let ${parameter.name}Param: string = encodeURIComponent('' + ${parameter.name});
       `;
             }
         }
@@ -103,12 +103,12 @@ export class ApiAngularWriter {
         if (!api.haveRequest) {
             return '';
         }
-        return `let wrappedRequest = this._handleRequest(request);
+        return `let wrappedRequest = this._handleRequest(request);
     `;
     }
     _writeFile(apis) {
-        fs.writeFileSync(this._outputDirectory + "/api.autogenerated.ts", `${API_PRE}
-${apis}
+        fs.writeFileSync(this._outputDirectory + "/api.autogenerated.ts", `${API_PRE}
+${apis}
 ${API_POST}`, { flag: 'w' });
     }
 }

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

@@ -1,28 +1,28 @@
-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(error: any, obs: any): Observable<never>;
+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(error: any, obs: any): Observable<never>;
 `;
 export const API_POST = `}`;
-export const MODEL_PRE = `import * as moment from 'moment';
+export const MODEL_PRE = `import * as moment from 'moment';
   `;
-export const MODEL_POST = `
+export const MODEL_POST = `
 `;

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

@@ -13,10 +13,10 @@ export class ModelAngularWriter {
         this._writeFile(modelString);
     }
     _modelString(model) {
-        let modelString = `
-export ${model.modelType} ${model.name} {
-${this._properties(model)}${this._enumValues(model)}
-}
+        let modelString = `
+export ${model.modelType} ${model.name} {
+${this._properties(model)}${this._enumValues(model)}
+}
 `;
         return modelString;
     }
@@ -38,8 +38,8 @@ ${this._properties(model)}${this._enumValues(model)}
         return enumValuesString.trimEnd();
     }
     _writeFile(models) {
-        fs.writeFileSync(this._outputDirectory + "/model.autogenerated.ts", `${MODEL_PRE}
-  ${models}
+        fs.writeFileSync(this._outputDirectory + "/model.autogenerated.ts", `${MODEL_PRE}
+  ${models}
   ${MODEL_POST}`, { flag: 'w' });
     }
 }

package/dist/generators-writers/dart/model-dart-writer.js

@@ -10,6 +10,10 @@ export class ModelDartWriter {
         this._commandLineArgs = commandLineArgs;
     }
     write(models) {
+        this.writeEnums(models.filter(m => m.modelType === 'enum'));
+        this.writeClasses(models);
+    }
+    writeClasses(models) {
         const __filename = fileURLToPath(import.meta.url);
         const __dirname = path.dirname(__filename);
         const templatePath = path.join(__dirname, 'templates', 'model.mustache');
@@ -18,79 +22,78 @@ export class ModelDartWriter {
         if (importDirectory.startsWith('lib/')) {
             importDirectory = importDirectory.slice('lib/'.length);
         }
+        models.forEach(model => {
+            if (model.modelType === 'class' || model.modelType === 'interface') {
+                const normalizedInfo = Normalizator.getNormalizedInfo(model);
+                const dartModel = {
+                    filename: normalizedInfo.filename,
+                    path: this._commandLineArgs.outputDirectory,
+                    className: normalizedInfo.modelName,
+                    fields: [],
+                    imports: [],
+                };
+                var imports = [];
+                model.properties.forEach(property => {
+                    var fieldTypeName = Normalizator.mapTsTypeToDart(property.typeName);
+                    fieldTypeName = Normalizator.getNormalizedTypeName(fieldTypeName);
+                    dartModel.fields.push({
+                        name: property.name,
+                        type: fieldTypeName,
+                        typeName: property.typeName,
+                        nullable: property.nullable ? '?' : '',
+                        required: property.nullable ? '' : 'required ',
+                    });
+                    if (property.isTypeReference) {
+                        if (imports.findIndex(x => x.type.typeName == property.typeName) == -1) {
+                            models.forEach(currModel => {
+                                if (currModel.typeName === property.typeName) {
+                                    const normalizedInfo = Normalizator.getNormalizedInfo(currModel);
+                                    imports.push({
+                                        type: property,
+                                        import: `import 'package:${this._commandLineArgs.package}/${importDirectory}/${normalizedInfo.subPath}/${normalizedInfo.filename}.dart';`
+                                    });
+                                }
+                            });
+                        }
+                    }
+                });
+                dartModel.imports = imports.map(i => i.import);
+                let destinationPath = `${this._commandLineArgs.outputDirectory}/${normalizedInfo.subPath}`;
+                Utils.ensureDirectorySync(`${destinationPath}`);
+                let result = Mustache.default.render(template, dartModel);
+                writeFileSync(`${destinationPath}/${normalizedInfo.filename}.dart`, result, 'utf-8');
+            }
+        });
+    }
+    writeEnums(models) {
+        const __filename = fileURLToPath(import.meta.url);
+        const __dirname = path.dirname(__filename);
+        const templatePath = path.join(__dirname, 'templates', 'enum.mustache');
+        const template = readFileSync(templatePath, 'utf-8');
+        let importDirectory = this._commandLineArgs.outputDirectory;
+        if (importDirectory.startsWith('lib/')) {
+            importDirectory = importDirectory.slice('lib/'.length);
+        }
         models.forEach(model => {
             const normalizedInfo = Normalizator.getNormalizedInfo(model);
             const dartModel = {
-                filename: normalizedInfo.filename,
+                enumName: normalizedInfo.modelName,
                 path: this._commandLineArgs.outputDirectory,
-                modelName: normalizedInfo.modelName,
                 fields: [],
-                imports: [],
             };
-            var imports = [];
-            model.properties.forEach(property => {
-                var fieldTypeName = Normalizator.mapTsTypeToDart(property.typeName);
-                fieldTypeName = Normalizator.getNormalizedTypeName(fieldTypeName);
-                if (property.isTypeReference) {
-                    if (imports.findIndex(x => x.type.typeName == property.typeName) == -1) {
-                        models.forEach(currModel => {
-                            if (currModel.typeName === property.typeName) {
-                                const normalizedInfo = Normalizator.getNormalizedInfo(currModel);
-                                imports.push({
-                                    type: property,
-                                    import: `import 'package:${this._commandLineArgs.package}/${importDirectory}/${normalizedInfo.subPath}/${normalizedInfo.filename}.dart';`
-                                });
-                            }
-                        });
-                    }
-                }
+            model.enumValues.forEach(enumItem => {
                 dartModel.fields.push({
-                    name: property.name,
-                    type: fieldTypeName,
-                    typeName: property.typeName,
-                    nullable: property.nullable ? '?' : '',
-                    required: property.nullable ? '' : 'required ',
+                    name: enumItem.name,
+                    value: enumItem.value,
+                    isLast: false,
                 });
             });
-            dartModel.imports = imports.map(i => i.import);
+            const lastIndex = dartModel.fields.length - 1;
+            dartModel.fields[lastIndex].isLast = true;
             let destinationPath = `${this._commandLineArgs.outputDirectory}/${normalizedInfo.subPath}`;
             Utils.ensureDirectorySync(`${destinationPath}`);
             let result = Mustache.default.render(template, dartModel);
             writeFileSync(`${destinationPath}/${normalizedInfo.filename}.dart`, result, 'utf-8');
         });
-        // var exportDataModels = <ExportModelItemDefinitionDart[]>[];
-        // models.forEach(model => {
-        //   exportDataModels.push({
-        //     filename: `${model.filename}.dart`
-        //   });
-        // });
-        // var exportData = <ExportModelDefinitionDart>{
-        //   models: exportDataModels
-        // };
-        // const exportTemplate = readFileSync('src/generators-writers/dart/templates/model.export.mustache', 'utf-8');
-        // const exportContent = Mustache.default.render(exportTemplate, exportData);
-        // writeFileSync(`${this._commandLineArgs.outputDirectory}/_export_models.dart`, exportContent, 'utf-8');
-        // const model = [
-        //   {
-        //     filename: 'login_request',
-        //     modelName: 'LoginRequest',
-        //     fields: [
-        //       { name: 'email', type: 'String' },
-        //       { name: 'password', type: 'String' }
-        //     ]
-        //   },
-        //   {
-        //     filename: 'login_response',
-        //     modelName: 'LoginResponse',
-        //     fields: [
-        //       { name: 'token', type: 'String' }
-        //     ]
-        //   }
-        // ];
-        // let modelString = '';
-        // models.forEach(model => {
-        //   modelString += this._modelString(model);
-        // });
-        // this._writeFile(modelString);
     }
 }

package/dist/generators-writers/dart/templates/api.mustache

@@ -1,36 +1,36 @@
-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}}
-    {{#queryParams}}
-    {{type}}{{#nullable}}?{{/nullable}} {{name}},
-    {{/queryParams}}
-    ) async {
-    final response = await _dio.{{httpMethod}}(
-      '{{{path}}}',
-      {{#haveRequest}}
-      data: request.toJson(),
-      {{/haveRequest}}
-      {{^haveRequest}}
-      queryParameters: {
-      {{#queryParams}}
-      {{#nullable}}if ({{name}} != null) {{/nullable}}'{{name}}': {{name}},
-      {{/queryParams}}
-      },
-      {{/haveRequest}}
-    );
-    return {{responseType}}.fromJson(response.data);
-  }
-
-  {{/endpoints}}
-}
+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}}
+    {{#queryParams}}
+    {{type}}{{#nullable}}?{{/nullable}} {{name}},
+    {{/queryParams}}
+    ) async {
+    final response = await _dio.{{httpMethod}}(
+      '{{{path}}}',
+      {{#haveRequest}}
+      data: request.toJson(),
+      {{/haveRequest}}
+      {{^haveRequest}}
+      queryParameters: {
+      {{#queryParams}}
+      {{#nullable}}if ({{name}} != null) {{/nullable}}'{{name}}': {{name}},
+      {{/queryParams}}
+      },
+      {{/haveRequest}}
+    );
+    return {{responseType}}.fromJson(response.data);
+  }
+
+  {{/endpoints}}
+}

package/dist/generators-writers/dart/templates/enum.mustache

@@ -0,0 +1,14 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+{{#imports}}
+{{{.}}}
+{{/imports}}
+
+@JsonEnum(fieldRename: FieldRename.pascal)
+enum {{enumName}} {
+    {{#fields}}
+    {{name}}({{value}}){{#isLast}};{{/isLast}}{{^isLast}},{{/isLast}}
+    {{/fields}}
+
+    final int value;
+    const {{enumName}}(this.value);
+}

package/dist/generators-writers/dart/templates/model.mustache

@@ -1,18 +1,18 @@
-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);
-}
+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);
+}