@devlearning/swagger-generator 1.1.15 → 1.1.17

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

@@ -1,143 +1,143 @@
-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}}
-    {{#pathParams}}
-    {{type}}{{#nullable}}?{{/nullable}} {{name}},
-    {{/pathParams}}
-    {{#queryParams}}
-    {{type}}{{#nullable}}?{{/nullable}} {{name}},
-    {{/queryParams}}
-    ) async {
-    {{#isMultiPart}}
-    final formData = FormData();
-    {{#multipartFields}}
-    {{#isFile}}
-    {{#isArray}}
-    {{^nullable}}
-    for (final file in request.{{name}}) {
-      formData.files.add(MapEntry('{{name}}', await MultipartFile.fromFile(file.path)));
-    }
-    {{/nullable}}
-    {{#nullable}}
-    if (request.{{name}} != null) {
-      for (final file in request.{{name}}!) {
-        formData.files.add(MapEntry('{{name}}', await MultipartFile.fromFile(file.path)));
-      }
-    }
-    {{/nullable}}
-    {{/isArray}}
-    {{^isArray}}
-    {{^nullable}}
-    formData.files.add(MapEntry('{{name}}', await MultipartFile.fromFile(request.{{name}}.path)));
-    {{/nullable}}
-    {{#nullable}}
-    if (request.{{name}} != null) {
-      formData.files.add(MapEntry('{{name}}', await MultipartFile.fromFile(request.{{name}}!.path)));
-    }
-    {{/nullable}}
-    {{/isArray}}
-    {{/isFile}}
-    {{^isFile}}
-    {{#isArray}}
-    {{^nullable}}
-    for (final value in request.{{name}}) {
-      formData.fields.add(MapEntry('{{name}}', value.toString()));
-    }
-    {{/nullable}}
-    {{#nullable}}
-    if (request.{{name}} != null) {
-      for (final value in request.{{name}}!) {
-        formData.fields.add(MapEntry('{{name}}', value.toString()));
-      }
-    }
-    {{/nullable}}
-    {{/isArray}}
-    {{^isArray}}
-    {{^nullable}}
-    formData.fields.add(MapEntry('{{name}}', request.{{name}}.toString()));
-    {{/nullable}}
-    {{#nullable}}
-    if (request.{{name}} != null) {
-      formData.fields.add(MapEntry('{{name}}', request.{{name}}!.toString()));
-    }
-    {{/nullable}}
-    {{/isArray}}
-    {{/isFile}}
-    {{/multipartFields}}
-    {{/isMultiPart}}
-    final response = await _dio.{{httpMethod}}(
-      '{{{path}}}',
-      {{#haveRequest}}
-      {{#isMultiPart}}
-      data: formData,
-      {{/isMultiPart}}
-      {{^isMultiPart}}
-      data: request.toJson(),
-      {{/isMultiPart}}
-      {{/haveRequest}}
-      {{^haveRequest}}
-      queryParameters: {
-      {{#queryParams}}
-      {{#nullable}}if ({{name}} != null) {{/nullable}}'{{name}}': {{name}},
-      {{/queryParams}}
-      },
-      {{/haveRequest}}
-    );
-    {{#isResponseNativeType}}
-    return _parseNative<{{responseType}}>(response.data);
-    {{/isResponseNativeType}}
-    {{^isResponseNativeType}}
-    return {{responseType}}.fromJson(response.data);
-    {{/isResponseNativeType}}
-  }
-
-  {{/endpoints}}
-
-  T _parseNative<T>(dynamic data) {
-    if (data == null) {
-      throw Exception('Cannot parse null data as $T');
-    }
-    
-    if (T == String) {
-      return data.toString() as T;
-    }
-    if (T == int) {
-      if (data is int) return data as T;
-      if (data is double) return data.toInt() as T;
-      return int.parse(data.toString()) as T;
-    }
-    if (T == double) {
-      if (data is double) return data as T;
-      if (data is int) return data.toDouble() as T;
-      return double.parse(data.toString()) as T;
-    }
-    if (T == bool) {
-      if (data is bool) return data as T;
-      if (data is String) {
-        final lower = data.toLowerCase();
-        if (lower == 'true' || lower == '1') return true as T;
-        if (lower == 'false' || lower == '0') return false as T;
-      }
-      if (data is int) return (data != 0) as T;
-      throw Exception('Cannot convert $data to bool');
-    }
-    
-    // Se il tipo è dynamic o Object, ritorna direttamente
-    if (T == dynamic || T == Object) {
-      return data as T;
-    }
-    
-    throw UnsupportedError('Unsupported native type $T');
-  }
-}
+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}}
+    {{#pathParams}}
+    {{type}}{{#nullable}}?{{/nullable}} {{name}},
+    {{/pathParams}}
+    {{#queryParams}}
+    {{type}}{{#nullable}}?{{/nullable}} {{name}},
+    {{/queryParams}}
+    ) async {
+    {{#isMultiPart}}
+    final formData = FormData();
+    {{#multipartFields}}
+    {{#isFile}}
+    {{#isArray}}
+    {{^nullable}}
+    for (final file in request.{{name}}) {
+      formData.files.add(MapEntry('{{name}}', await MultipartFile.fromFile(file.path)));
+    }
+    {{/nullable}}
+    {{#nullable}}
+    if (request.{{name}} != null) {
+      for (final file in request.{{name}}!) {
+        formData.files.add(MapEntry('{{name}}', await MultipartFile.fromFile(file.path)));
+      }
+    }
+    {{/nullable}}
+    {{/isArray}}
+    {{^isArray}}
+    {{^nullable}}
+    formData.files.add(MapEntry('{{name}}', await MultipartFile.fromFile(request.{{name}}.path)));
+    {{/nullable}}
+    {{#nullable}}
+    if (request.{{name}} != null) {
+      formData.files.add(MapEntry('{{name}}', await MultipartFile.fromFile(request.{{name}}!.path)));
+    }
+    {{/nullable}}
+    {{/isArray}}
+    {{/isFile}}
+    {{^isFile}}
+    {{#isArray}}
+    {{^nullable}}
+    for (final value in request.{{name}}) {
+      formData.fields.add(MapEntry('{{name}}', value.toString()));
+    }
+    {{/nullable}}
+    {{#nullable}}
+    if (request.{{name}} != null) {
+      for (final value in request.{{name}}!) {
+        formData.fields.add(MapEntry('{{name}}', value.toString()));
+      }
+    }
+    {{/nullable}}
+    {{/isArray}}
+    {{^isArray}}
+    {{^nullable}}
+    formData.fields.add(MapEntry('{{name}}', request.{{name}}.toString()));
+    {{/nullable}}
+    {{#nullable}}
+    if (request.{{name}} != null) {
+      formData.fields.add(MapEntry('{{name}}', request.{{name}}!.toString()));
+    }
+    {{/nullable}}
+    {{/isArray}}
+    {{/isFile}}
+    {{/multipartFields}}
+    {{/isMultiPart}}
+    final response = await _dio.{{httpMethod}}(
+      '{{{path}}}',
+      {{#haveRequest}}
+      {{#isMultiPart}}
+      data: formData,
+      {{/isMultiPart}}
+      {{^isMultiPart}}
+      data: request.toJson(),
+      {{/isMultiPart}}
+      {{/haveRequest}}
+      {{^haveRequest}}
+      queryParameters: {
+      {{#queryParams}}
+      {{#nullable}}if ({{name}} != null) {{/nullable}}'{{name}}': {{name}},
+      {{/queryParams}}
+      },
+      {{/haveRequest}}
+    );
+    {{#isResponseNativeType}}
+    return _parseNative<{{responseType}}>(response.data);
+    {{/isResponseNativeType}}
+    {{^isResponseNativeType}}
+    return {{responseType}}.fromJson(response.data);
+    {{/isResponseNativeType}}
+  }
+
+  {{/endpoints}}
+
+  T _parseNative<T>(dynamic data) {
+    if (data == null) {
+      throw Exception('Cannot parse null data as $T');
+    }
+    
+    if (T == String) {
+      return data.toString() as T;
+    }
+    if (T == int) {
+      if (data is int) return data as T;
+      if (data is double) return data.toInt() as T;
+      return int.parse(data.toString()) as T;
+    }
+    if (T == double) {
+      if (data is double) return data as T;
+      if (data is int) return data.toDouble() as T;
+      return double.parse(data.toString()) as T;
+    }
+    if (T == bool) {
+      if (data is bool) return data as T;
+      if (data is String) {
+        final lower = data.toLowerCase();
+        if (lower == 'true' || lower == '1') return true as T;
+        if (lower == 'false' || lower == '0') return false as T;
+      }
+      if (data is int) return (data != 0) as T;
+      throw Exception('Cannot convert $data to bool');
+    }
+    
+    // Se il tipo è dynamic o Object, ritorna direttamente
+    if (T == dynamic || T == Object) {
+      return data as T;
+    }
+    
+    throw UnsupportedError('Unsupported native type $T');
+  }
+}

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

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

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

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

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

@@ -1,158 +1,158 @@
-import fs from 'fs';
-import { API_PRE } from './constants.js';
-import { ApiDto } from '../../models/api-dto.js';
-import { Utils } from '../utils.js';
-import { ParameterDto } from '../../models/parameter-dto.js';
-import { CommandLineArgs } from '../../index.js';
-
-export class ApiNextJsWriter {
-  private _commandLineArgs: CommandLineArgs;
-
-  constructor(commandLineArgs: CommandLineArgs) {
-    this._commandLineArgs = commandLineArgs;
-  }
-
-  write(apis: ApiDto[]) {
-    let apiString = '';
-
-    apis.forEach(api => {
-      apiString += this._apiString(api);
-    });
-
-
-    this._writeFile(apiString);
-  }
-
-  private _apiString(api: ApiDto) {
-
-    let apiNameNormalized = Utils.toCamelCase(Utils.getNormalizedApiPathDart(api.name));
-    let parametersString = this._parameters(api);
-    let queryParametersPreparation = this._queryParametersPreparation(api);
-    let requestPreparation = this._requestPreparation(api);
-    let queryParameters = this._queryParameters(api);
-    let returnTypeString = this._returnType(api);
-    let haveRequest = api.haveRequest;
-    let method = api.method.toLowerCase();
-    let httpOptions = api.isMultiPart ? 'httpOptionsMultiPart' : 'httpOptions';
-    let preparation = `${queryParametersPreparation}
-  ${requestPreparation}`.trim();
-    preparation = preparation.length > 0 ? `  ${preparation}\n  ` : '';
-
-    //\`\${API_BASE_URL}
-    let apiString = `
-export const ${apiNameNormalized} = async (${parametersString}): Promise<${returnTypeString}> => {
-${preparation}const response = await axios.${method}<${returnTypeString}>(\`${api.url}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''});
-  return response.data;
-}
-`;
-
-    return apiString;
-  }
-
-  private _parameters(api: ApiDto) {
-    let parametersString = '';
-
-    api.parameters.forEach(parameter => {
-      parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${!parameter.isNativeType ? 'Models.' : ''}${parameter.typeName}, `;
-    });
-
-    if (api.parameters.length > 0)
-      parametersString = parametersString.substring(0, parametersString.length - 2);
-
-    return parametersString;
-  }
-
-  private _returnType(api: ApiDto) {
-    return api.returnType ? `${!api.returnType.isNativeType ? 'Models.' : ''}${api.returnType.typeName}` : 'any';
-  }
-
-  private _queryParametersPreparation(api: ApiDto) {
-    let queryParametersPreparation = '';
-
-    api.parameters.forEach(parameter => {
-      if (parameter.isQuery) {
-        queryParametersPreparation += this._queryParametersPreparationStatement(parameter);
-      }
-    });
-
-    return `${queryParametersPreparation}`;
-  }
-
-  private _queryParametersPreparationStatement(parameter: ParameterDto) {
-    if (parameter.nullable) {
-      if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-        return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined && isValid(${parameter.name}) ? encodeURIComponent(dateToZulu(${parameter.name})) : '';
-`;
-      } else {
-        return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined ? encodeURIComponent('' + ${parameter.name}) : '';
-`;
-      }
-    } else {
-      if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-        return `  const ${parameter.name}Param: string = encodeURIComponent(dateToZulu(${parameter.name}));
-`;
-      } else {
-        return `  const ${parameter.name}Param: string = encodeURIComponent('' + ${parameter.name});
-`;
-      }
-    }
-  }
-
-  private _queryParameters(api: ApiDto) {
-    let queryParameters = '';
-
-    api.parameters.forEach(parameter => {
-      if (parameter.isQuery) {
-        queryParameters += this._queryParametersStatement(parameter);
-      }
-    });
-
-    if (queryParameters.length > 0) {
-      queryParameters = '?' + queryParameters.substring(0, queryParameters.length - 1);
-    }
-
-    return queryParameters;
-  }
-
-  private _queryParametersStatement(parameter: ParameterDto) {
-    if (parameter.swaggerParameter == null) return '';
-
-    if (!parameter.isQuery) return '';
-
-    return `${parameter.name}=\${${parameter.name}Param}&`;
-    // if (parameter.isEnum) {
-    //   return `${parameter.name}=\${` + parameter.name + `Param}&`;
-    // } else {
-    //   return `${parameter.name}=\${` + parameter.name + `}&`;
-    // }
-    // if (parameter.swaggerParameter.schema.$ref != null) {
-    //   if (this.isEnum(parameter.schema.$ref) != null) {
-    //     parameters += `${this.toFirstLetterLowercase(parameter.name)}=\${` + this.toFirstLetterLowercase(parameter.name) + `Param}&`;;
-    //   } else {
-    //     throw new Error("retrieveQueryParameters unmanaged parameter.schema.$ref");
-    //   }
-    // } else {
-    //   parameters += `${this.toFirstLetterLowercase(parameter.name)}=\${` + this.toFirstLetterLowercase(parameter.name) + `Param}&`;
-    // }
-    // let paramName = Utils.toFirstLetterLowercase(parameter.name);
-    // return `${parameter.swaggerParameter?.name}=\${${paramName}Param}&`;
-  }
-
-  private _requestPreparation(api: ApiDto) {
-    if (!api.haveRequest) {
-      return ``;
-    }
-
-    return `  const wrappedRequest = handleRequest(request);
-`;
-  }
-
-
-
-  private _writeFile(apis: string) {
-    fs.writeFileSync(this._commandLineArgs.outputDirectory + "/api.autogenerated.ts",
-      `${API_PRE}
-${apis}`,
-      { flag: 'w' });
-  }
+import fs from 'fs';
+import { API_PRE } from './constants.js';
+import { ApiDto } from '../../models/api-dto.js';
+import { Utils } from '../utils.js';
+import { ParameterDto } from '../../models/parameter-dto.js';
+import { CommandLineArgs } from '../../index.js';
+
+export class ApiNextJsWriter {
+  private _commandLineArgs: CommandLineArgs;
+
+  constructor(commandLineArgs: CommandLineArgs) {
+    this._commandLineArgs = commandLineArgs;
+  }
+
+  write(apis: ApiDto[]) {
+    let apiString = '';
+
+    apis.forEach(api => {
+      apiString += this._apiString(api);
+    });
+
+
+    this._writeFile(apiString);
+  }
+
+  private _apiString(api: ApiDto) {
+
+    let apiNameNormalized = Utils.toCamelCase(Utils.getNormalizedApiPathDart(api.name));
+    let parametersString = this._parameters(api);
+    let queryParametersPreparation = this._queryParametersPreparation(api);
+    let requestPreparation = this._requestPreparation(api);
+    let queryParameters = this._queryParameters(api);
+    let returnTypeString = this._returnType(api);
+    let haveRequest = api.haveRequest;
+    let method = api.method.toLowerCase();
+    let httpOptions = api.isMultiPart ? 'httpOptionsMultiPart' : 'httpOptions';
+    let preparation = `${queryParametersPreparation}
+  ${requestPreparation}`.trim();
+    preparation = preparation.length > 0 ? `  ${preparation}\n  ` : '';
+
+    //\`\${API_BASE_URL}
+    let apiString = `
+export const ${apiNameNormalized} = async (${parametersString}): Promise<${returnTypeString}> => {
+${preparation}const response = await axios.${method}<${returnTypeString}>(\`${api.url}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''});
+  return response.data;
+}
+`;
+
+    return apiString;
+  }
+
+  private _parameters(api: ApiDto) {
+    let parametersString = '';
+
+    api.parameters.forEach(parameter => {
+      parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${!parameter.isNativeType ? 'Models.' : ''}${parameter.typeName}, `;
+    });
+
+    if (api.parameters.length > 0)
+      parametersString = parametersString.substring(0, parametersString.length - 2);
+
+    return parametersString;
+  }
+
+  private _returnType(api: ApiDto) {
+    return api.returnType ? `${!api.returnType.isNativeType ? 'Models.' : ''}${api.returnType.typeName}` : 'any';
+  }
+
+  private _queryParametersPreparation(api: ApiDto) {
+    let queryParametersPreparation = '';
+
+    api.parameters.forEach(parameter => {
+      if (parameter.isQuery) {
+        queryParametersPreparation += this._queryParametersPreparationStatement(parameter);
+      }
+    });
+
+    return `${queryParametersPreparation}`;
+  }
+
+  private _queryParametersPreparationStatement(parameter: ParameterDto) {
+    if (parameter.nullable) {
+      if (Utils.isDate(parameter.swaggerParameter?.schema)) {
+        return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined && isValid(${parameter.name}) ? encodeURIComponent(dateToZulu(${parameter.name})) : '';
+`;
+      } else {
+        return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined ? encodeURIComponent('' + ${parameter.name}) : '';
+`;
+      }
+    } else {
+      if (Utils.isDate(parameter.swaggerParameter?.schema)) {
+        return `  const ${parameter.name}Param: string = encodeURIComponent(dateToZulu(${parameter.name}));
+`;
+      } else {
+        return `  const ${parameter.name}Param: string = encodeURIComponent('' + ${parameter.name});
+`;
+      }
+    }
+  }
+
+  private _queryParameters(api: ApiDto) {
+    let queryParameters = '';
+
+    api.parameters.forEach(parameter => {
+      if (parameter.isQuery) {
+        queryParameters += this._queryParametersStatement(parameter);
+      }
+    });
+
+    if (queryParameters.length > 0) {
+      queryParameters = '?' + queryParameters.substring(0, queryParameters.length - 1);
+    }
+
+    return queryParameters;
+  }
+
+  private _queryParametersStatement(parameter: ParameterDto) {
+    if (parameter.swaggerParameter == null) return '';
+
+    if (!parameter.isQuery) return '';
+
+    return `${parameter.name}=\${${parameter.name}Param}&`;
+    // if (parameter.isEnum) {
+    //   return `${parameter.name}=\${` + parameter.name + `Param}&`;
+    // } else {
+    //   return `${parameter.name}=\${` + parameter.name + `}&`;
+    // }
+    // if (parameter.swaggerParameter.schema.$ref != null) {
+    //   if (this.isEnum(parameter.schema.$ref) != null) {
+    //     parameters += `${this.toFirstLetterLowercase(parameter.name)}=\${` + this.toFirstLetterLowercase(parameter.name) + `Param}&`;;
+    //   } else {
+    //     throw new Error("retrieveQueryParameters unmanaged parameter.schema.$ref");
+    //   }
+    // } else {
+    //   parameters += `${this.toFirstLetterLowercase(parameter.name)}=\${` + this.toFirstLetterLowercase(parameter.name) + `Param}&`;
+    // }
+    // let paramName = Utils.toFirstLetterLowercase(parameter.name);
+    // return `${parameter.swaggerParameter?.name}=\${${paramName}Param}&`;
+  }
+
+  private _requestPreparation(api: ApiDto) {
+    if (!api.haveRequest) {
+      return ``;
+    }
+
+    return `  const wrappedRequest = handleRequest(request);
+`;
+  }
+
+
+
+  private _writeFile(apis: string) {
+    fs.writeFileSync(this._commandLineArgs.outputDirectory + "/api.autogenerated.ts",
+      `${API_PRE}
+${apis}`,
+      { flag: 'w' });
+  }
 }