@devlearning/swagger-generator 1.0.19 → 1.0.21

package/autogen/identity/api/identity_api.dart

@@ -16,7 +16,9 @@ class IdentityApi {
 
   IdentityApi() : _dio = getIt<Dio>();
 
-  Future<AuthenticationToken> authAppToken(AuthAppAuthenticateCommand request) async {
+  Future<AuthenticationToken> authAppToken(AuthAppAuthenticateCommand request
+    Identity.AuthAppAuthenticateCommand request,
+  ) async {
     final response = await _dio.post(
       '/identity/auth/app/token',
       data: request.toJson(),
@@ -24,7 +26,9 @@ class IdentityApi {
     return AuthenticationToken.fromJson(response.data);
   }
 
-  Future<AuthenticationToken> authUserToken(AuthUserAuthenticateCommand request) async {
+  Future<AuthenticationToken> authUserToken(AuthUserAuthenticateCommand request
+    Identity.AuthUserAuthenticateCommand request,
+  ) async {
     final response = await _dio.post(
       '/identity/auth/user/token',
       data: request.toJson(),
@@ -32,7 +36,9 @@ class IdentityApi {
     return AuthenticationToken.fromJson(response.data);
   }
 
-  Future<AuthenticationToken> authRefreshToken(AuthRefreshTokenCommand request) async {
+  Future<AuthenticationToken> authRefreshToken(AuthRefreshTokenCommand request
+    Identity.AuthRefreshTokenCommand request,
+  ) async {
     final response = await _dio.post(
       '/identity/auth/refresh-token',
       data: request.toJson(),
@@ -40,7 +46,9 @@ class IdentityApi {
     return AuthenticationToken.fromJson(response.data);
   }
 
-  Future<Result> authGenerateResetPasswordCode(AuthGenerateResetPasswordCodeCommand request) async {
+  Future<Result> authGenerateResetPasswordCode(AuthGenerateResetPasswordCodeCommand request
+    Identity.AuthGenerateResetPasswordCodeCommand request,
+  ) async {
     final response = await _dio.post(
       '/identity/auth/generate-reset-password-code',
       data: request.toJson(),
@@ -48,7 +56,9 @@ class IdentityApi {
     return Result.fromJson(response.data);
   }
 
-  Future<Result> authResetPassword(AuthResetPasswordCommand request) async {
+  Future<Result> authResetPassword(AuthResetPasswordCommand request
+    Identity.AuthResetPasswordCommand request,
+  ) async {
     final response = await _dio.post(
       '/identity/auth/reset-password',
       data: request.toJson(),
@@ -56,7 +66,9 @@ class IdentityApi {
     return Result.fromJson(response.data);
   }
 
-  Future<Result> authVerifyResetPasswordCode(AuthVerifyResetPasswordCodeCommand request) async {
+  Future<Result> authVerifyResetPasswordCode(AuthVerifyResetPasswordCodeCommand request
+    Identity.AuthVerifyResetPasswordCodeCommand request,
+  ) async {
     final response = await _dio.post(
       '/identity/auth/verify-reset-password-code',
       data: request.toJson(),
@@ -64,7 +76,9 @@ class IdentityApi {
     return Result.fromJson(response.data);
   }
 
-  Future<Result> authActivate(AuthActivateCommand request) async {
+  Future<Result> authActivate(AuthActivateCommand request
+    Identity.AuthActivateCommand request,
+  ) async {
     final response = await _dio.post(
       '/identity/auth/activate',
       data: request.toJson(),
@@ -72,9 +86,12 @@ class IdentityApi {
     return Result.fromJson(response.data);
   }
 
-  Future<AuthUserDto> authUserRead() async {
+  Future<AuthUserDto> authUserRead(
+) async {
     final response = await _dio.get(
       '/identity/auth-user/read',
+      queryParameters: {
+      },
     );
     return AuthUserDto.fromJson(response.data);
   }

package/autogen/identity/models/auth_activate_command.dart

@@ -6,8 +6,8 @@ part 'auth_activate_command.g.dart';
 @freezed
 abstract class AuthActivateCommand with _$AuthActivateCommand {
   const factory AuthActivateCommand({
-    required String username,
-    required String activationCode,
+    String? username,
+    String? activationCode,
   }) = _AuthActivateCommand;
 
   factory AuthActivateCommand.fromJson(Map<String, dynamic> json) => _$AuthActivateCommandFromJson(json);

package/autogen/identity/models/auth_app_authenticate_command.dart

@@ -6,9 +6,9 @@ part 'auth_app_authenticate_command.g.dart';
 @freezed
 abstract class AuthAppAuthenticateCommand with _$AuthAppAuthenticateCommand {
   const factory AuthAppAuthenticateCommand({
-    required String appId,
-    required String secret,
-    required String audience,
+    String? appId,
+    String? secret,
+    String? audience,
     String? ipAddress,
   }) = _AuthAppAuthenticateCommand;
 

package/autogen/identity/models/auth_generate_reset_password_code_command.dart

@@ -6,9 +6,9 @@ part 'auth_generate_reset_password_code_command.g.dart';
 @freezed
 abstract class AuthGenerateResetPasswordCodeCommand with _$AuthGenerateResetPasswordCodeCommand {
   const factory AuthGenerateResetPasswordCodeCommand({
-    required String usernameOrEmail,
-    required String host,
-    required String urlResetPassword,
+    String? usernameOrEmail,
+    String? host,
+    String? urlResetPassword,
   }) = _AuthGenerateResetPasswordCodeCommand;
 
   factory AuthGenerateResetPasswordCodeCommand.fromJson(Map<String, dynamic> json) => _$AuthGenerateResetPasswordCodeCommandFromJson(json);

package/autogen/identity/models/auth_refresh_token_command.dart

@@ -6,8 +6,8 @@ part 'auth_refresh_token_command.g.dart';
 @freezed
 abstract class AuthRefreshTokenCommand with _$AuthRefreshTokenCommand {
   const factory AuthRefreshTokenCommand({
-    required String uniqueName,
-    required String refreshToken,
+    String? uniqueName,
+    String? refreshToken,
     String? ipAddress,
   }) = _AuthRefreshTokenCommand;
 

package/autogen/identity/models/auth_reset_password_command.dart

@@ -6,10 +6,10 @@ part 'auth_reset_password_command.g.dart';
 @freezed
 abstract class AuthResetPasswordCommand with _$AuthResetPasswordCommand {
   const factory AuthResetPasswordCommand({
-    required String usernameOrEmail,
-    required String verificationCode,
-    required String password,
-    required String confirmPassword,
+    String? usernameOrEmail,
+    String? verificationCode,
+    String? password,
+    String? confirmPassword,
   }) = _AuthResetPasswordCommand;
 
   factory AuthResetPasswordCommand.fromJson(Map<String, dynamic> json) => _$AuthResetPasswordCommandFromJson(json);

package/autogen/identity/models/auth_user_authenticate_command.dart

@@ -6,8 +6,8 @@ part 'auth_user_authenticate_command.g.dart';
 @freezed
 abstract class AuthUserAuthenticateCommand with _$AuthUserAuthenticateCommand {
   const factory AuthUserAuthenticateCommand({
-    required String username,
-    required String password,
+    String? username,
+    String? password,
     String? ipAddress,
   }) = _AuthUserAuthenticateCommand;
 

package/autogen/identity/models/auth_user_dto.dart

@@ -10,8 +10,8 @@ abstract class AuthUserDto with _$AuthUserDto {
     required String uniqueId,
     String? username,
     String? email,
-    String? activationDate,
-    String? lockedDate,
+    DateTime? activationDate,
+    DateTime? lockedDate,
   }) = _AuthUserDto;
 
   factory AuthUserDto.fromJson(Map<String, dynamic> json) => _$AuthUserDtoFromJson(json);

package/autogen/identity/models/authentication_token.dart

@@ -6,11 +6,11 @@ part 'authentication_token.g.dart';
 @freezed
 abstract class AuthenticationToken with _$AuthenticationToken {
   const factory AuthenticationToken({
-    required String uniqueName,
-    required String accessToken,
-    required double expiresIn,
-    required String refreshToken,
-    required double refreshTokenExpiresIn,
+    String? uniqueName,
+    String? accessToken,
+    int? expiresIn,
+    String? refreshToken,
+    int? refreshTokenExpiresIn,
   }) = _AuthenticationToken;
 
   factory AuthenticationToken.fromJson(Map<String, dynamic> json) => _$AuthenticationTokenFromJson(json);

package/autogen/mvc/models/problem_details.dart

@@ -8,7 +8,7 @@ abstract class ProblemDetails with _$ProblemDetails {
   const factory ProblemDetails({
     String? type,
     String? title,
-    double? status,
+    int? status,
     String? detail,
     String? instance,
   }) = _ProblemDetails;

package/autogen/user_profile/api/user_profile_api.dart

@@ -1,8 +1,6 @@
 import 'package:coqudo_app/core/di/injector.dart';
 import 'package:dio/dio.dart';
-import 'package:coqudo_app/autogen/user_profile/models/test_read_query.dart';
 import 'package:coqudo_app/autogen/service_defaults/models/result.dart';
-import 'package:coqudo_app/autogen/user_profile/models/test_list_query.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';
 
@@ -11,23 +9,37 @@ class UserProfileApi {
 
   UserProfileApi() : _dio = getIt<Dio>();
 
-  Future<Result> userGeneralInfoTestRead(TestReadQuery request) async {
+  Future<Result> userGeneralInfoTestRead(
+    String name,
+      DateTime? date,
+      int? integer,
+  ) async {
     final response = await _dio.get(
       '/user-profile/UserGeneralInfo/test/read',
-      queryParameters: request.toJson(),
+      queryParameters: {
+      'name': name,
+      if (date != null) 'date': date,
+      if (integer != null) 'integer': integer,
+      },
     );
     return Result.fromJson(response.data);
   }
 
-  Future<Result> userGeneralInfoTestList(TestListQuery request) async {
+  Future<Result> userGeneralInfoTestList(
+    String name,
+  ) async {
     final response = await _dio.get(
       '/user-profile/UserGeneralInfo/test/list',
-      queryParameters: request.toJson(),
+      queryParameters: {
+      'name': name,
+      },
     );
     return Result.fromJson(response.data);
   }
 
-  Future<Result> userGeneralInfoTestSave(TestSaveCommand request) async {
+  Future<Result> userGeneralInfoTestSave(TestSaveCommand request
+    UserProfile.TestSaveCommand request,
+  ) async {
     final response = await _dio.post(
       '/user-profile/UserGeneralInfo/test/save',
       data: request.toJson(),
@@ -35,7 +47,9 @@ class UserProfileApi {
     return Result.fromJson(response.data);
   }
 
-  Future<Result> userGeneralInfoSave(UserGeneralInfoSaveCommand request) async {
+  Future<Result> userGeneralInfoSave(UserGeneralInfoSaveCommand request
+    UserProfile.UserGeneralInfoSaveCommand request,
+  ) async {
     final response = await _dio.post(
       '/user-profile/UserGeneralInfo/save',
       data: request.toJson(),

package/autogen/user_profile/models/test_save_command.dart

@@ -6,7 +6,7 @@ part 'test_save_command.g.dart';
 @freezed
 abstract class TestSaveCommand with _$TestSaveCommand {
   const factory TestSaveCommand({
-    required String name,
+    String? name,
   }) = _TestSaveCommand;
 
   factory TestSaveCommand.fromJson(Map<String, dynamic> json) => _$TestSaveCommandFromJson(json);

package/dist/generator.js

@@ -3,7 +3,7 @@ import { ApiAngularWriter } from './generators-writers/angular/api-angular-write
 import { SingleBar, Presets } from 'cli-progress';
 import { ModelNextJsWriter } from './generators-writers/nextjs/model-nextjs-writer.js';
 import { ModelAngularWriter } from './generators-writers/angular/model-angular-writer.js';
-import { DateTimeLibrary, TargetGeneration } from './index.js';
+import { TargetGeneration } from './index.js';
 import { ApiDartWriter } from './generators-writers/dart/api-dart-writer.js';
 import { ModelDartWriter } from './generators-writers/dart/model-dart-writer.js';
 import { Utils } from './generators-writers/utils.js';
@@ -49,7 +49,6 @@ export class Generator {
             const apiSwaggerMethodKey = this._swagger.paths[apiName];
             const apiMethod = Object.getOwnPropertyNames(apiSwaggerMethodKey)[0];
             const apiSwaggerMethod = apiSwaggerMethodKey[apiMethod];
-            // console.debug(`\tAPI - ${apiName} - ${apiMethod}`);
             let apiDto = {
                 name: apiName,
                 url: apiName.replace('{version}', '1'),
@@ -109,7 +108,6 @@ export class Generator {
             for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.components.schemas).length; index++) {
                 const modelName = Object.getOwnPropertyNames(this._swagger.components.schemas)[index];
                 const swaggerComponent = this._swagger.components.schemas[modelName];
-                // console.debug(`\tModel - ${modelName}`);
                 this._models.push({
                     typeName: modelName,
                     modelType: swaggerComponent.type == 'integer' ? 'enum' : 'class',
@@ -123,13 +121,14 @@ export class Generator {
             const swaggerMethod = this._swagger.paths[apiName];
             const method = Object.getOwnPropertyNames(swaggerMethod)[0];
             const swaggerMethodInfo = swaggerMethod[method];
-            this._models.push({
-                typeName: this.getApiNameNormalized(apiName),
-                modelType: 'class',
-                name: this.getApiNameNormalized(apiName),
-                properties: this.retrieveComponentProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema),
-                enumValues: [],
-            });
+            throw new Error(`MultiPart FormData is not supported yet for ${apiName} - ${method}.`);
+            // this._models.push({
+            //   typeName: this.getApiNameNormalized(apiName),
+            //   modelType: 'class',
+            //   name: this.getApiNameNormalized(apiName),
+            //   properties: this.retrieveComponentProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema),
+            //   enumValues: [],
+            // });
         });
     }
     generateApi() {
@@ -386,17 +385,18 @@ export class Generator {
     getObjectName(ref) {
         return ref.replace('#/components/schemas/', '');
     }
-    retrieveComponentProperties(swaggerCopmponent) {
-        if (swaggerCopmponent.properties == null)
+    retrieveComponentProperties(swaggerComponent) {
+        if (swaggerComponent.properties == null)
             return [];
         let properties = [];
-        for (let index = 0; index < Object.getOwnPropertyNames(swaggerCopmponent.properties).length; index++) {
-            const propertyName = Object.getOwnPropertyNames(swaggerCopmponent.properties)[index];
-            const type = this.retrieveType(swaggerCopmponent.properties[propertyName]);
+        for (let index = 0; index < Object.getOwnPropertyNames(swaggerComponent.properties).length; index++) {
+            const propertyName = Object.getOwnPropertyNames(swaggerComponent.properties)[index];
+            const required = swaggerComponent.required && swaggerComponent.required.includes(propertyName);
+            const type = this.retrieveType(swaggerComponent.properties[propertyName]);
             properties.push({
                 ...type,
                 name: propertyName,
-                nullable: type.nullable,
+                nullable: required || type.nullable,
             });
         }
         return properties;
@@ -450,11 +450,12 @@ export class Generator {
                 }
                 if (nestedUsedType != '' && usedTypes.findIndex(x => x.typeName == nestedUsedType) == -1) {
                     let nested = this._swagger.components.schemas[nestedUsedType];
+                    const required = swaggerComponent.required && swaggerComponent.required.includes(propertyName);
                     usedTypes.push({
                         typeName: nestedUsedType,
                         isTypeReference: nested.type == 'object',
                         isNativeType: nested.type != 'object',
-                        nullable: false,
+                        nullable: required,
                         isArray: false,
                         isVoid: false,
                         //potrebbe essere un enum
@@ -478,11 +479,11 @@ export class Generator {
         }
         else {
             if (schema.type == 'integer')
-                nativeType = 'number';
+                nativeType = 'integer'; //era number
             if (schema.type == 'string' && schema.format == null)
                 nativeType = 'string';
             if (schema.type == 'string' && schema.format == 'date-time')
-                nativeType = this._commandLineArgs.dateTimeLibrary == DateTimeLibrary.Moment ? 'moment.Moment' : 'Date';
+                nativeType = 'dateTime';
             if (schema.type == 'string' && schema.format == 'uuid')
                 nativeType = 'string';
             if (schema.type == 'string' && schema.format == 'binary')

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

@@ -23,7 +23,10 @@ ${this._properties(model)}${this._enumValues(model)}
     _properties(model) {
         let propertiesString = '';
         model.properties.forEach(property => {
-            propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${property.typeName};\n`;
+            //const libraryDate = this._commandLineArgs.dateTimeLibrary == DateTimeLibrary.Moment ? 'moment.Moment' : 'Date'
+            const libraryDate = 'moment.Moment';
+            const typeName = property.typeName === 'dateTime' ? libraryDate : property.typeName;
+            propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${typeName};\n`;
         });
         return propertiesString.trimEnd();
     }

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

@@ -56,8 +56,15 @@ export class ApiDartWriter {
                     responseType: responseType,
                     haveRequest: api.haveRequest,
                     requestType: requestType,
-                    isGet: api.method.toLowerCase() === 'get'
                 };
+                if (api.parameters && api.parameters.length > 0) {
+                    endpoint.queryParams = api.parameters
+                        .map(p => ({
+                        name: p.name,
+                        type: p.typeName ? Normalizator.mapTsTypeToDart(p.typeName) : 'String',
+                        nullable: p.nullable
+                    }));
+                }
                 if (api.haveRequest && api.parameters[0]?.typeName) {
                     if (imports.findIndex(x => x.type.typeName == api.parameters[0]?.typeName) == -1) {
                         models.forEach(model => {

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

@@ -29,10 +29,7 @@ export class ModelDartWriter {
             };
             var imports = [];
             model.properties.forEach(property => {
-                var fieldTypeName = this._mapTsTypeToDart(property.typeName);
-                //         if (fieldTypeName.endsWith('Exception')) {
-                // debugger
-                //         }
+                var fieldTypeName = Normalizator.mapTsTypeToDart(property.typeName);
                 fieldTypeName = Normalizator.getNormalizedTypeName(fieldTypeName);
                 if (property.isTypeReference) {
                     if (imports.findIndex(x => x.type.typeName == property.typeName) == -1) {
@@ -96,38 +93,4 @@ export class ModelDartWriter {
         // });
         // this._writeFile(modelString);
     }
-    _mapTsTypeToDart(type) {
-        const normalized = type.trim().toLowerCase();
-        if (normalized.endsWith("[]")) {
-            const inner = normalized.slice(0, -2).trim();
-            return `List<${this._mapTsTypeToDart(inner)}>`;
-        }
-        switch (normalized) {
-            case "string":
-            case "uuid":
-            case "date":
-            case "datetime":
-                return "String";
-            case "number":
-            case "float":
-            case "double":
-                return "double";
-            case "integer":
-            case "int":
-            case "long":
-                return "int";
-            case "boolean":
-            case "bool":
-                return "bool";
-            case "any":
-            case "object":
-                return "dynamic";
-            case "null":
-            case "undefined":
-                return "Null";
-            default:
-                // per tipi personalizzati (es. modelli) restituisci con PascalCase
-                return Utils.toPascalCase(type);
-        }
-    }
 }

package/dist/generators-writers/dart/normalizator.js

@@ -1,11 +1,5 @@
 import { Utils } from "../utils.js";
 export class Normalizator {
-    // public static normalizeModelName(modelName: string): string {
-    //      let normalizeModelName = modelName.split('.').pop()!;
-    //       return Utils.toDartClassName(filename) ?? filename;
-    //   }
-    //   subPath = model.name.split('.').slice(0, -1).join('');
-    //           subPath = `${Utils.toDartFileName(subPath)}/models`;
     static getNormalizedInfo(model) {
         let subPath = '';
         let filename = '';
@@ -32,4 +26,39 @@ export class Normalizator {
         let formattedTypeName = typeName.split('.').pop();
         return Utils.toDartClassName(formattedTypeName) ?? typeName;
     }
+    static mapTsTypeToDart(type) {
+        const normalized = type.trim().toLowerCase();
+        if (normalized.endsWith("[]")) {
+            const inner = normalized.slice(0, -2).trim();
+            return `List<${Normalizator.mapTsTypeToDart(inner)}>`;
+        }
+        switch (normalized) {
+            case "string":
+            case "uuid":
+            case "date":
+                return "String";
+            case "dateTime":
+                return "DateTime";
+            case "number":
+            case "float":
+            case "double":
+                return "double";
+            case "integer":
+            case "int":
+            case "long":
+                return "int";
+            case "boolean":
+            case "bool":
+                return "bool";
+            case "any":
+            case "object":
+                return "dynamic";
+            case "null":
+            case "undefined":
+                return "Null";
+            default:
+                // per tipi personalizzati (es. modelli) restituisci con PascalCase
+                return Utils.toPascalCase(type);
+        }
+    }
 }

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

@@ -22,7 +22,10 @@ ${this._properties(model)}${this._enumValues(model)}
     _properties(model) {
         let propertiesString = '';
         model.properties.forEach(property => {
-            propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${property.typeName};\n`;
+            //const libraryDate = this._commandLineArgs.dateTimeLibrary == DateTimeLibrary.Moment ? 'moment.Moment' : 'Date'
+            const libraryDate = 'Date';
+            const typeName = property.typeName === 'dateTime' ? libraryDate : property.typeName;
+            propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${typeName};\n`;
         });
         return propertiesString.trimEnd();
     }

package/package.json

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

package/src/generator.ts

@@ -74,8 +74,6 @@ export class Generator {
       const apiMethod = Object.getOwnPropertyNames(apiSwaggerMethodKey)[0];
       const apiSwaggerMethod = apiSwaggerMethodKey[apiMethod];
 
-      // console.debug(`\tAPI - ${apiName} - ${apiMethod}`);
-
       let apiDto: ApiDto = {
         name: apiName,
         url: apiName.replace('{version}', '1'),
@@ -149,7 +147,6 @@ export class Generator {
 
         const swaggerComponent = this._swagger.components.schemas[modelName];
 
-        // console.debug(`\tModel - ${modelName}`);
         this._models.push({
           typeName: modelName,
           modelType: swaggerComponent.type == 'integer' ? 'enum' : 'class',
@@ -166,13 +163,14 @@ export class Generator {
       const method = Object.getOwnPropertyNames(swaggerMethod)[0];
       const swaggerMethodInfo = swaggerMethod[method];
 
-      this._models.push({
-        typeName: this.getApiNameNormalized(apiName),
-        modelType: 'class',
-        name: this.getApiNameNormalized(apiName),
-        properties: this.retrieveComponentProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema),
-        enumValues: [],
-      });
+      throw new Error(`MultiPart FormData is not supported yet for ${apiName} - ${method}.`);
+      // this._models.push({
+      //   typeName: this.getApiNameNormalized(apiName),
+      //   modelType: 'class',
+      //   name: this.getApiNameNormalized(apiName),
+      //   properties: this.retrieveComponentProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema),
+      //   enumValues: [],
+      // });
     });
   }
 
@@ -446,18 +444,18 @@ export class Generator {
     return ref.replace('#/components/schemas/', '');
   }
 
-  retrieveComponentProperties(swaggerCopmponent: SwaggerComponent | SwaggerSchema) {
-    if (swaggerCopmponent.properties == null) return [];
+  retrieveComponentProperties(swaggerComponent: SwaggerComponent) {
+    if (swaggerComponent.properties == null) return [];
 
     let properties: PropertyDto[] = [];
-    for (let index = 0; index < Object.getOwnPropertyNames(swaggerCopmponent.properties).length; index++) {
-      const propertyName = Object.getOwnPropertyNames(swaggerCopmponent.properties)[index];
-
-      const type = this.retrieveType(swaggerCopmponent.properties[propertyName]);
+    for (let index = 0; index < Object.getOwnPropertyNames(swaggerComponent.properties).length; index++) {
+      const propertyName = Object.getOwnPropertyNames(swaggerComponent.properties)[index];
+      const required = swaggerComponent.required && swaggerComponent.required.includes(propertyName);
+      const type = this.retrieveType(swaggerComponent.properties[propertyName]);
       properties.push({
         ...type,
         name: propertyName,
-        nullable: type.nullable,
+        nullable: required || type.nullable,
       });
     }
 
@@ -512,7 +510,7 @@ export class Generator {
 
         if (swaggerComponent.properties[propertyName].$ref) {
           nestedUsedType = swaggerComponent.properties[propertyName].$ref!.replace('#/components/schemas/', '');
-        }else if (swaggerComponent.properties[propertyName].allOf && swaggerComponent.properties[propertyName].allOf![0] && swaggerComponent.properties[propertyName].allOf![0]!.$ref) {
+        } else if (swaggerComponent.properties[propertyName].allOf && swaggerComponent.properties[propertyName].allOf![0] && swaggerComponent.properties[propertyName].allOf![0]!.$ref) {
           nestedUsedType = swaggerComponent.properties[propertyName].allOf![0]!.$ref!.replace('#/components/schemas/', ''); //TODO Assuming allOf contains a single $ref
         } else if (swaggerComponent.properties[propertyName].type == 'array' && swaggerComponent.properties[propertyName].items?.$ref) {
           nestedUsedType = swaggerComponent.properties[propertyName].items!.$ref!.replace('#/components/schemas/', '');
@@ -520,11 +518,12 @@ export class Generator {
 
         if (nestedUsedType != '' && usedTypes.findIndex(x => x.typeName == nestedUsedType) == -1) {
           let nested = this._swagger.components.schemas[nestedUsedType];
+          const required = swaggerComponent.required && swaggerComponent.required.includes(propertyName);
           usedTypes.push({
             typeName: nestedUsedType,
             isTypeReference: nested.type == 'object',
             isNativeType: nested.type != 'object',
-            nullable: false,
+            nullable: required,
             isArray: false,
             isVoid: false,
             //potrebbe essere un enum
@@ -546,9 +545,9 @@ export class Generator {
       nativeType = this.getNativeType(schema.items);
       nativeType += '[]';
     } else {
-      if (schema.type == 'integer') nativeType = 'number';
+      if (schema.type == 'integer') nativeType = 'integer'; //era number
       if (schema.type == 'string' && schema.format == null) nativeType = 'string';
-      if (schema.type == 'string' && schema.format == 'date-time') nativeType = this._commandLineArgs.dateTimeLibrary == DateTimeLibrary.Moment ? 'moment.Moment' : 'Date';
+      if (schema.type == 'string' && schema.format == 'date-time') nativeType = 'dateTime';
       if (schema.type == 'string' && schema.format == 'uuid') nativeType = 'string';
       if (schema.type == 'string' && schema.format == 'binary') nativeType = 'File';
       if (schema.type == 'number') nativeType = 'number';

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

@@ -34,7 +34,10 @@ ${this._properties(model)}${this._enumValues(model)}
     let propertiesString = '';
 
     model.properties.forEach(property => {
-      propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${property.typeName};\n`;
+      //const libraryDate = this._commandLineArgs.dateTimeLibrary == DateTimeLibrary.Moment ? 'moment.Moment' : 'Date'
+      const libraryDate = 'moment.Moment';
+      const typeName = property.typeName === 'dateTime' ? libraryDate : property.typeName;
+      propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${typeName};\n`;
     });
 
     return propertiesString.trimEnd();

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

@@ -25,9 +25,15 @@ interface EndpointDefinitionDart {
   httpMethod: HttpMethodDart;
   path: string;
   responseType: string;
-  haveRequest?: boolean;
+  haveRequest: boolean;
   requestType?: string; // solo se haveRequest è true
-  isGet?: boolean; // per indicare se è un metodo GET
+  queryParams?: Parameter[],
+}
+
+interface Parameter {
+  name: string;
+  type: string; // "string", "int", ecc
+  nullable: boolean;
 }
 
 type HttpMethodDart = 'get' | 'post' | 'put' | 'delete' | 'patch';
@@ -46,7 +52,7 @@ export class ApiDartWriter {
     const templatePath = path.join(__dirname, 'templates', 'api.mustache');
     const template = fs.readFileSync(templatePath, 'utf-8');
     let importDirectory = this._commandLineArgs.outputDirectory;
-    if(importDirectory.startsWith('lib/')) {
+    if (importDirectory.startsWith('lib/')) {
       importDirectory = importDirectory.slice('lib/'.length);
     }
 
@@ -97,9 +103,17 @@ export class ApiDartWriter {
           responseType: responseType,
           haveRequest: api.haveRequest,
           requestType: requestType,
-          isGet: api.method.toLowerCase() === 'get'
         };
 
+        if (api.parameters && api.parameters.length > 0) {
+          endpoint.queryParams = api.parameters
+            .map(p => ({
+              name: p.name,
+              type: p.typeName ? Normalizator.mapTsTypeToDart(p.typeName)! : 'String',
+              nullable: p.nullable
+            }));
+        }
+
         if (api.haveRequest && api.parameters[0]?.typeName) {
           if (imports.findIndex(x => x.type.typeName == api.parameters[0]?.typeName) == -1) {
             models.forEach(model => {

package/src/generators-writers/dart/model-dart-writer.ts

@@ -60,11 +60,7 @@ export class ModelDartWriter {
       var imports = <ImportDefinitionDart[]>[];
 
       model.properties.forEach(property => {
-        var fieldTypeName = this._mapTsTypeToDart(property.typeName);
-
-        //         if (fieldTypeName.endsWith('Exception')) {
-        // debugger
-        //         }
+        var fieldTypeName = Normalizator.mapTsTypeToDart(property.typeName);
 
         fieldTypeName = Normalizator.getNormalizedTypeName(fieldTypeName);
 
@@ -145,41 +141,4 @@ export class ModelDartWriter {
 
     // this._writeFile(modelString);
   }
-
-  private _mapTsTypeToDart(type: string): string {
-    const normalized = type.trim().toLowerCase();
-
-    if (normalized.endsWith("[]")) {
-      const inner = normalized.slice(0, -2).trim();
-      return `List<${this._mapTsTypeToDart(inner)}>`;
-    }
-
-    switch (normalized) {
-      case "string":
-      case "uuid":
-      case "date":
-      case "datetime":
-        return "String";
-      case "number":
-      case "float":
-      case "double":
-        return "double";
-      case "integer":
-      case "int":
-      case "long":
-        return "int";
-      case "boolean":
-      case "bool":
-        return "bool";
-      case "any":
-      case "object":
-        return "dynamic";
-      case "null":
-      case "undefined":
-        return "Null";
-      default:
-        // per tipi personalizzati (es. modelli) restituisci con PascalCase
-        return Utils.toPascalCase(type);
-    }
-  }
 }

package/src/generators-writers/dart/normalizator.ts

@@ -3,15 +3,6 @@ import { Utils } from "../utils.js";
 
 export class Normalizator {
 
-  // public static normalizeModelName(modelName: string): string {
-  //      let normalizeModelName = modelName.split('.').pop()!;
-  //       return Utils.toDartClassName(filename) ?? filename;
-  //   }
-
-
-  //   subPath = model.name.split('.').slice(0, -1).join('');
-  //           subPath = `${Utils.toDartFileName(subPath)}/models`;
-
   public static getNormalizedInfo(model: ModelDto) {
     let subPath = '';
     let filename = '';
@@ -41,4 +32,42 @@ export class Normalizator {
     return Utils.toDartClassName(formattedTypeName) ?? typeName;
   }
 
+  public static mapTsTypeToDart(type: string): string {
+    const normalized = type.trim().toLowerCase();
+
+    if (normalized.endsWith("[]")) {
+      const inner = normalized.slice(0, -2).trim();
+      return `List<${Normalizator.mapTsTypeToDart(inner)}>`;
+    }
+
+    switch (normalized) {
+      case "string":
+      case "uuid":
+      case "date":
+        return "String";
+      case "dateTime":
+        return "DateTime";
+      case "number":
+      case "float":
+      case "double":
+        return "double";
+      case "integer":
+      case "int":
+      case "long":
+        return "int";
+      case "boolean":
+      case "bool":
+        return "bool";
+      case "any":
+      case "object":
+        return "dynamic";
+      case "null":
+      case "undefined":
+        return "Null";
+      default:
+        // per tipi personalizzati (es. modelli) restituisci con PascalCase
+        return Utils.toPascalCase(type);
+    }
+  }
+
 }

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

@@ -10,16 +10,21 @@ class {{apiClassName}} {
   {{apiClassName}}() : _dio = getIt<Dio>();
 
   {{#endpoints}}
-  Future<{{responseType}}> {{methodName}}({{#haveRequest}}{{requestType}} request{{/haveRequest}}) async {
+  Future<{{responseType}}> {{methodName}}({{#haveRequest}}{{requestType}} request{{/haveRequest}}
+  {{#queryParams}}
+    {{type}}{{#nullable}}?{{/nullable}} {{name}},
+  {{/queryParams}}) async {
     final response = await _dio.{{httpMethod}}(
       '{{{path}}}',
       {{#haveRequest}}
-      {{#isGet}}
-      queryParameters: request.toJson(),
-      {{/isGet}}
-      {{^isGet}}
       data: request.toJson(),
-      {{/isGet}}
+      {{/haveRequest}}
+      {{^haveRequest}}
+      queryParameters: {
+      {{#queryParams}}
+      {{#nullable}}if ({{name}} != null) {{/nullable}}'{{name}}': {{name}},
+      {{/queryParams}}
+      },
       {{/haveRequest}}
     );
     return {{responseType}}.fromJson(response.data);

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

@@ -33,7 +33,10 @@ ${this._properties(model)}${this._enumValues(model)}
     let propertiesString = '';
 
     model.properties.forEach(property => {
-      propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${property.typeName};\n`;
+      //const libraryDate = this._commandLineArgs.dateTimeLibrary == DateTimeLibrary.Moment ? 'moment.Moment' : 'Date'
+      const libraryDate = 'Date';
+      const typeName = property.typeName === 'dateTime' ? libraryDate : property.typeName;
+      propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${typeName};\n`;
     });
 
     return propertiesString.trimEnd();

package/src/models/swagger/swagger-component.ts

@@ -14,4 +14,5 @@ export interface SwaggerComponent {
     properties: { [key: string]: SwaggerSchema; };
     additionalProperties: boolean;
     enum: string[];
+    required: string[];
 }

package/autogen/user_profile/models/test_list_query.dart

@@ -1,13 +0,0 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'test_list_query.freezed.dart';
-part 'test_list_query.g.dart';
-
-@freezed
-abstract class TestListQuery with _$TestListQuery {
-  const factory TestListQuery({
-    String? name,
-  }) = _TestListQuery;
-
-  factory TestListQuery.fromJson(Map<String, dynamic> json) => _$TestListQueryFromJson(json);
-}

package/autogen/user_profile/models/test_read_query.dart

@@ -1,14 +0,0 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'test_read_query.freezed.dart';
-part 'test_read_query.g.dart';
-
-@freezed
-abstract class TestReadQuery with _$TestReadQuery {
-  const factory TestReadQuery({
-    required String name,
-    required String date,
-  }) = _TestReadQuery;
-
-  factory TestReadQuery.fromJson(Map<String, dynamic> json) => _$TestReadQueryFromJson(json);
-}