@devlearning/swagger-generator 1.1.14 → 1.1.15

package/dist/generator.js

@@ -74,7 +74,10 @@ export class Generator {
             const apiSwaggerMethodKey = this._swagger.paths[apiName];
             const apiMethod = Object.getOwnPropertyNames(apiSwaggerMethodKey)[0];
             const apiSwaggerMethod = apiSwaggerMethodKey[apiMethod];
-            if (apiSwaggerMethod.requestBody?.content[contentTypeMultipartFormData]?.schema != null) {
+            const multipartSchema = apiSwaggerMethod.requestBody?.content?.[contentTypeMultipartFormData]?.schema;
+            // Only create an ad-hoc request model when the multipart schema is inline.
+            // If the schema is a $ref, it's already part of components/schemas and will be generated there.
+            if (multipartSchema != null && multipartSchema.$ref == null) {
                 usedMultiPart.push(apiName);
             }
         }
@@ -114,6 +117,9 @@ export class Generator {
             const method = Object.getOwnPropertyNames(swaggerMethod)[0];
             const swaggerMethodInfo = swaggerMethod[method];
             const schema = swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema;
+            if (schema?.$ref != null) {
+                return;
+            }
             this._models.push({
                 typeName: this.getApiNameNormalized(apiName),
                 modelType: 'class',
@@ -164,24 +170,58 @@ export class Generator {
             return [];
         let parameters = [];
         try {
+            // Path params are always explicit parameters.
+            swaggerMethod.parameters?.filter(x => x.in == 'path').forEach(parameter => {
+                const name = this.toFirstLetterLowercase(parameter.name);
+                if (parameter.schema?.$ref != null) {
+                    const type = this.retrieveType(parameter.schema);
+                    parameters.push({
+                        name,
+                        typeName: type.typeName,
+                        nullable: false,
+                        swaggerParameter: parameter,
+                        isQuery: false,
+                        isEnum: this.isEnum(parameter.schema.$ref),
+                        isTypeReference: false,
+                        isNativeType: false,
+                        isArray: false,
+                        isVoid: false,
+                    });
+                }
+                else {
+                    parameters.push({
+                        name,
+                        typeName: this.getNativeType(parameter.schema),
+                        nullable: false,
+                        swaggerParameter: parameter,
+                        isQuery: false,
+                        isEnum: false,
+                        isTypeReference: false,
+                        isNativeType: true,
+                        isArray: false,
+                        isVoid: false,
+                    });
+                }
+            });
             if (swaggerMethod.requestBody != null && swaggerMethod.requestBody.content[contentTypeMultipartFormData] != null) {
-                var modelName = this.getApiNameNormalized(apiName);
-                parameters.push({
+                const schema = swaggerMethod.requestBody.content[contentTypeMultipartFormData].schema;
+                const type = this.retrieveType(schema);
+                parameters.unshift({
                     name: 'request',
-                    typeName: modelName,
+                    typeName: type.typeName,
                     nullable: false,
                     isQuery: false,
                     isEnum: false,
-                    isTypeReference: true,
-                    isNativeType: false,
-                    isArray: false,
-                    isVoid: 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);
-                    parameters.push({
+                    parameters.unshift({
                         name: 'request',
                         typeName: type.typeName,
                         nullable: false,
@@ -327,12 +367,16 @@ export class Generator {
                 };
             }
             else {
+                // Array of native types (including binary/file)
+                const itemType = swaggerComponentProperty.items
+                    ? this.getNativeType(swaggerComponentProperty.items)
+                    : this.getNativeType(swaggerComponentProperty);
                 return {
-                    typeName: this.getNativeType(swaggerComponentProperty),
+                    typeName: itemType,
                     isTypeReference: false,
                     isNativeType: true,
                     nullable: swaggerComponentProperty.nullable ?? false,
-                    isArray: false,
+                    isArray: true,
                     isVoid: false,
                 };
             }

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

@@ -105,17 +105,32 @@ export class ApiDartWriter {
         if (methodName.toLowerCase().indexOf("productsave") >= 0) {
             debugger;
         }
+        const pathParams = (api.parameters ?? [])
+            .filter(p => p.name !== 'request' && p.isQuery === false)
+            .map(p => ({
+            name: p.name,
+            type: p.typeName ? Normalizator.mapTsTypeToDart(p.typeName) : 'String',
+            nullable: false,
+        }));
+        // Build a Dart-interpolated path string (e.g. '/x/{id}' -> '/x/$id')
+        const pathExpression = api.url.replace(/\{([^}]+)\}/g, (_, rawName) => {
+            const varName = Utils.toFirstLetterLowercase(rawName);
+            return `\$${varName}`;
+        });
         const endpoint = {
             methodName: methodName,
             httpMethod: api.method.toLowerCase(),
-            path: api.url,
+            path: pathExpression,
             responseType: responseType,
             isResponseNativeType: api.returnType ? api.returnType.isNativeType : true,
             haveRequest: api.haveRequest,
             requestType: requestType,
+            pathParams,
+            isMultiPart: api.isMultiPart === true,
         };
         if (api.parameters && api.parameters.length > 0 && !api.haveRequest) {
             endpoint.queryParams = api.parameters
+                .filter(p => p.isQuery === true)
                 .map(p => ({
                 name: p.name,
                 type: p.typeName ? Normalizator.mapTsTypeToDart(p.typeName) : 'String',
@@ -136,6 +151,22 @@ export class ApiDartWriter {
                 });
             }
         }
+        // Multipart: include request model fields so template can build FormData
+        if (endpoint.isMultiPart && api.haveRequest && api.parameters[0]?.typeName) {
+            const requestModelTypeName = api.parameters[0].typeName;
+            const requestModel = models.find(m => m.typeName === requestModelTypeName);
+            if (requestModel) {
+                endpoint.multipartFields = requestModel.properties.map(p => ({
+                    name: p.name,
+                    isFile: p.typeName === 'File',
+                    isArray: p.isArray === true,
+                    nullable: p.nullable === true,
+                }));
+            }
+            else {
+                endpoint.multipartFields = [];
+            }
+        }
         if (api.returnType && !api.returnType.isNativeType) {
             if (imports.findIndex(x => x.type.typeName == api.returnType.typeName) == -1) {
                 models.forEach(model => {

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

@@ -33,15 +33,30 @@ export class ModelDartWriter {
                     imports: [],
                 };
                 var imports = [];
+                const needsDartIo = model.properties.some(p => {
+                    const normalized = (p.typeName ?? '').trim();
+                    return normalized === 'File' || (p.isArray && normalized === 'File');
+                });
+                if (needsDartIo) {
+                    imports.push({
+                        type: { typeName: 'dart:io' },
+                        import: `import 'dart:io';`
+                    });
+                }
                 model.properties.forEach(property => {
                     var fieldTypeName = Normalizator.mapTsTypeToDart(property.typeName);
                     fieldTypeName = Normalizator.getNormalizedTypeName(fieldTypeName);
+                    const isFileField = property.typeName === 'File';
+                    const jsonKeyAnnotation = isFileField
+                        ? "@JsonKey(includeFromJson: false, includeToJson: false)"
+                        : undefined;
                     dartModel.fields.push({
                         name: property.name,
                         type: property.isArray ? `List<${fieldTypeName}>` : fieldTypeName,
                         typeName: property.typeName,
                         nullable: property.nullable && !property.isArray ? '?' : '',
                         required: property.nullable && !property.isArray ? '' : 'required ',
+                        jsonKeyAnnotation,
                     });
                     if (property.isTypeReference) {
                         if (imports.findIndex(x => x.type.typeName == property.typeName) == -1) {

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

@@ -11,15 +11,80 @@ class {{apiClassName}} {
 
   {{#endpoints}}
   Future<{{responseType}}> {{methodName}}(
-    {{#haveRequest}}{{requestType}} request{{/haveRequest}}
+    {{#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: {

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

@@ -10,6 +10,9 @@ part '{{filename}}.g.dart';
 abstract class {{className}} with _${{className}} {
   const factory {{className}}({
     {{#fields}}
+    {{#jsonKeyAnnotation}}
+    {{{jsonKeyAnnotation}}}
+    {{/jsonKeyAnnotation}}
     {{required}}{{{type}}}{{nullable}} {{name}},
     {{/fields}}
   }) = _{{className}};

package/dist/generators-writers/utils.d.ts

@@ -8,6 +8,6 @@ export declare class Utils {
     static isDate(schema?: SwaggerSchema): boolean;
     static toDartFileName(name: string): string;
     static toDartClassName(name: string): string | undefined;
-    static ensureDirectorySync(dirPath: string): Promise<void>;
-    static clearDirectory(dirPath: string): Promise<void>;
+    static ensureDirectorySync(dirPath: string): void;
+    static clearDirectory(dirPath: string): void;
 }

package/dist/generators-writers/utils.js

@@ -10,6 +10,8 @@ export class Utils {
         return normalizedApiName;
     }
     static getNormalizedApiPathDart(apiName) {
+        // Remove path params like {id} from the method name.
+        apiName = apiName.replace(/\{[^}]+\}/g, '');
         let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
         if (normalizedApiName.charAt(0) == '_') {
             normalizedApiName = normalizedApiName.slice(1);
@@ -47,12 +49,12 @@ export class Utils {
             return undefined;
         return name.replace(/\./g, ''); // rimuove i punti per ottenere PascalCase
     }
-    static async ensureDirectorySync(dirPath) {
+    static ensureDirectorySync(dirPath) {
         if (!fs.existsSync(dirPath)) {
             fs.mkdirSync(dirPath, { recursive: true });
         }
     }
-    static async clearDirectory(dirPath) {
+    static clearDirectory(dirPath) {
         if (!fs.existsSync(dirPath))
             return;
         for (const file of fs.readdirSync(dirPath)) {

package/package.json

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

package/src/generator.ts

@@ -103,7 +103,10 @@ export class Generator {
       const apiMethod = Object.getOwnPropertyNames(apiSwaggerMethodKey)[0];
       const apiSwaggerMethod = apiSwaggerMethodKey[apiMethod];
 
-      if (apiSwaggerMethod.requestBody?.content[contentTypeMultipartFormData]?.schema != null) {
+      const multipartSchema = apiSwaggerMethod.requestBody?.content?.[contentTypeMultipartFormData]?.schema;
+      // Only create an ad-hoc request model when the multipart schema is inline.
+      // If the schema is a $ref, it's already part of components/schemas and will be generated there.
+      if (multipartSchema != null && multipartSchema.$ref == null) {
         usedMultiPart.push(apiName);
       }
     }
@@ -154,6 +157,10 @@ export class Generator {
       const swaggerMethodInfo = swaggerMethod[method];
       const schema = swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema;
 
+      if (schema?.$ref != null) {
+        return;
+      }
+
       this._models.push({
         typeName: this.getApiNameNormalized(apiName),
         modelType: 'class',
@@ -209,23 +216,57 @@ export class Generator {
 
     let parameters: ParameterDto[] = [];
     try {
+      // Path params are always explicit parameters.
+      swaggerMethod.parameters?.filter(x => x.in == 'path').forEach(parameter => {
+        const name = this.toFirstLetterLowercase(parameter.name);
+        if (parameter.schema?.$ref != null) {
+          const type = this.retrieveType(parameter.schema);
+          parameters.push({
+            name,
+            typeName: type.typeName,
+            nullable: false,
+            swaggerParameter: parameter,
+            isQuery: false,
+            isEnum: this.isEnum(parameter.schema.$ref),
+            isTypeReference: false,
+            isNativeType: false,
+            isArray: false,
+            isVoid: false,
+          });
+        } else {
+          parameters.push({
+            name,
+            typeName: this.getNativeType(parameter.schema),
+            nullable: false,
+            swaggerParameter: parameter,
+            isQuery: false,
+            isEnum: false,
+            isTypeReference: false,
+            isNativeType: true,
+            isArray: false,
+            isVoid: false,
+          });
+        }
+      });
+
       if (swaggerMethod.requestBody != null && swaggerMethod.requestBody.content[contentTypeMultipartFormData] != null) {
-        var modelName = this.getApiNameNormalized(apiName);
-        parameters.push({
+        const schema = swaggerMethod.requestBody.content[contentTypeMultipartFormData].schema;
+        const type = this.retrieveType(schema);
+        parameters.unshift({
           name: 'request',
-          typeName: modelName,
+          typeName: type.typeName,
           nullable: false,
           isQuery: false,
           isEnum: false,
-          isTypeReference: true,
-          isNativeType: false,
-          isArray: false,
-          isVoid: 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);
-          parameters.push({
+          parameters.unshift({
             name: 'request',
             typeName: type.typeName, //swaggerMethod.requestBody.content[contentTypeApplicationJson].schema.$ref.replace('#/components/schemas/', ''),
             nullable: false,
@@ -376,12 +417,16 @@ export class Generator {
         };
       }
       else {
+        // Array of native types (including binary/file)
+        const itemType = swaggerComponentProperty.items
+          ? this.getNativeType(swaggerComponentProperty.items)
+          : this.getNativeType(swaggerComponentProperty);
         return {
-          typeName: this.getNativeType(swaggerComponentProperty),
+          typeName: itemType,
           isTypeReference: false,
           isNativeType: true,
           nullable: swaggerComponentProperty.nullable ?? false,
-          isArray: false,
+          isArray: true,
           isVoid: false,
         };
       }

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

@@ -30,6 +30,16 @@ interface EndpointDefinitionDart {
   haveRequest: boolean;
   requestType?: string; // solo se haveRequest è true
   queryParams?: Parameter[],
+  pathParams?: Parameter[],
+  isMultiPart: boolean;
+  multipartFields?: MultipartFieldDefinitionDart[];
+}
+
+interface MultipartFieldDefinitionDart {
+  name: string;
+  isFile: boolean;
+  isArray: boolean;
+  nullable: boolean;
 }
 
 interface Parameter {
@@ -167,18 +177,35 @@ export class ApiDartWriter {
       debugger
     }
 
+    const pathParams: Parameter[] = (api.parameters ?? [])
+      .filter(p => p.name !== 'request' && p.isQuery === false)
+      .map(p => ({
+        name: p.name,
+        type: p.typeName ? Normalizator.mapTsTypeToDart(p.typeName)! : 'String',
+        nullable: false,
+      }));
+
+    // Build a Dart-interpolated path string (e.g. '/x/{id}' -> '/x/$id')
+    const pathExpression = api.url.replace(/\{([^}]+)\}/g, (_, rawName) => {
+      const varName = Utils.toFirstLetterLowercase(rawName);
+      return `\$${varName}`;
+    });
+
     const endpoint = <EndpointDefinitionDart>{
       methodName: methodName,
       httpMethod: api.method.toLowerCase() as HttpMethodDart,
-      path: api.url,
+      path: pathExpression,
       responseType: responseType,
       isResponseNativeType: api.returnType ? api.returnType.isNativeType : true,
       haveRequest: api.haveRequest,
       requestType: requestType,
+      pathParams,
+      isMultiPart: api.isMultiPart === true,
     };
 
     if (api.parameters && api.parameters.length > 0 && !api.haveRequest) {
       endpoint.queryParams = api.parameters
+        .filter(p => p.isQuery === true)
         .map(p => ({
           name: p.name,
           type: p.typeName ? Normalizator.mapTsTypeToDart(p.typeName)! : 'String',
@@ -201,6 +228,22 @@ export class ApiDartWriter {
       }
     }
 
+    // Multipart: include request model fields so template can build FormData
+    if (endpoint.isMultiPart && api.haveRequest && api.parameters[0]?.typeName) {
+      const requestModelTypeName = api.parameters[0].typeName;
+      const requestModel = models.find(m => m.typeName === requestModelTypeName);
+      if (requestModel) {
+        endpoint.multipartFields = requestModel.properties.map(p => ({
+          name: p.name,
+          isFile: p.typeName === 'File',
+          isArray: p.isArray === true,
+          nullable: p.nullable === true,
+        }));
+      } else {
+        endpoint.multipartFields = [];
+      }
+    }
+
     if (api.returnType && !api.returnType.isNativeType) {
       if (imports.findIndex(x => x.type.typeName == api.returnType!.typeName) == -1) {
         models.forEach(model => {

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

@@ -32,6 +32,7 @@ interface FieldDefinitionDart {
   typeName: string;
   nullable: string;
   required: string;
+  jsonKeyAnnotation?: string;
 }
 
 interface ExportClassDefinitionDart {
@@ -82,17 +83,35 @@ export class ModelDartWriter {
 
         var imports = <ImportDefinitionDart[]>[];
 
+        const needsDartIo = model.properties.some(p => {
+          const normalized = (p.typeName ?? '').trim();
+          return normalized === 'File' || (p.isArray && normalized === 'File');
+        });
+
+        if (needsDartIo) {
+          imports.push({
+            type: { typeName: 'dart:io' } as any,
+            import: `import 'dart:io';`
+          });
+        }
+
         model.properties.forEach(property => {
           var fieldTypeName = Normalizator.mapTsTypeToDart(property.typeName);
 
           fieldTypeName = Normalizator.getNormalizedTypeName(fieldTypeName);
 
+          const isFileField = property.typeName === 'File';
+          const jsonKeyAnnotation = isFileField
+            ? "@JsonKey(includeFromJson: false, includeToJson: false)"
+            : undefined;
+
           dartModel.fields!.push(<FieldDefinitionDart>{
             name: property.name,
             type: property.isArray ? `List<${fieldTypeName}>` : fieldTypeName,
             typeName: property.typeName,
             nullable: property.nullable && !property.isArray ? '?' : '',
             required: property.nullable && !property.isArray ? '' : 'required ',
+            jsonKeyAnnotation,
           });
 
           if (property.isTypeReference) {

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

@@ -11,15 +11,80 @@ class {{apiClassName}} {
 
   {{#endpoints}}
   Future<{{responseType}}> {{methodName}}(
-    {{#haveRequest}}{{requestType}} request{{/haveRequest}}
+    {{#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: {

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

@@ -10,6 +10,9 @@ part '{{filename}}.g.dart';
 abstract class {{className}} with _${{className}} {
   const factory {{className}}({
     {{#fields}}
+    {{#jsonKeyAnnotation}}
+    {{{jsonKeyAnnotation}}}
+    {{/jsonKeyAnnotation}}
     {{required}}{{{type}}}{{nullable}} {{name}},
     {{/fields}}
   }) = _{{className}};

package/src/generators-writers/utils.ts

@@ -17,6 +17,9 @@ export class Utils {
   }
 
   public static getNormalizedApiPathDart(apiName: string) {
+    // Remove path params like {id} from the method name.
+    apiName = apiName.replace(/\{[^}]+\}/g, '');
+
     let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
 
     if (normalizedApiName.charAt(0) == '_') {
@@ -67,13 +70,13 @@ export class Utils {
     return name.replace(/\./g, ''); // rimuove i punti per ottenere PascalCase
   }
 
-  public static async ensureDirectorySync(dirPath: string) {
+  public static ensureDirectorySync(dirPath: string) {
     if (!fs.existsSync(dirPath)) {
       fs.mkdirSync(dirPath, { recursive: true });
     }
   }
 
-  public static async clearDirectory(dirPath: string) {
+  public static clearDirectory(dirPath: string) {
     if (!fs.existsSync(dirPath)) return;
 
     for (const file of fs.readdirSync(dirPath)) {