@devlearning/swagger-generator 1.1.11 → 1.1.13

package/README.md

@@ -67,6 +67,60 @@ npx swgen \
 | `--target` | `-t` | Framework target (`angular`, `next`, `flutter`) | ✅ | - |
 | `--dateTimeLibrary` | `-d` | Libreria date (`moment`, `date-fns`) | ❌ | `date-fns` |
 | `--package` | `-p` | Nome package (solo Dart/Flutter) | ❌ | - |
+| `--api-client-name` | `-a` | Nome classe API unificata | ❌ | - |
+
+### 🆕 API Client Unificata
+
+Di default, il generatore crea classi API separate raggruppate per tag Swagger. Con l'opzione `--api-client-name`, puoi generare una **singola classe unificata** contenente tutti i metodi API.
+
+#### Esempio: Flutter con classe unificata
+
+```bash
+npx swgen \
+  --url http://localhost:5000/swagger/v1/swagger.json \
+  --output lib/core/api \
+  --target flutter \
+  --package my_app \
+  --api-client-name ApiClient
+```
+
+Genera:
+```dart
+// lib/core/api/api_client.dart
+class ApiClient {
+  // Tutti i metodi API in una singola classe
+  Future<User> getUser(String id) async { ... }
+  Future<List<Product>> getProducts() async { ... }
+  Future<void> createOrder(Order order) async { ... }
+  // ...
+}
+```
+
+#### Senza --api-client-name (comportamento predefinito)
+
+Genera classi separate per tag:
+```dart
+// lib/core/api/users_api.dart
+class UsersApi { ... }
+
+// lib/core/api/products_api.dart  
+class ProductsApi { ... }
+
+// lib/core/api/orders_api.dart
+class OrdersApi { ... }
+```
+
+#### Quando usare la classe unificata?
+
+- ✅ Progetti piccoli/medi con pochi endpoint
+- ✅ Quando preferisci un singolo punto di accesso alle API
+- ✅ Per semplificare la dependency injection
+
+#### Quando usare classi separate?
+
+- ✅ Progetti grandi con molti endpoint
+- ✅ Quando vuoi separare le responsabilità per dominio
+- ✅ Per team diversi che lavorano su moduli diversi
 
 ## 📁 Struttura File Generati
 

package/dist/generator.js

@@ -126,11 +126,11 @@ export class Generator {
     generateApi() {
         this._barApis.update(this._apis.length, { message: `Api generating...` });
         if (this._commandLineArgs.target == TargetGeneration.Angular) {
-            const apiWriter = new ApiAngularWriter(this._commandLineArgs.outputDirectory);
+            const apiWriter = new ApiAngularWriter(this._commandLineArgs);
             apiWriter.write(this._apis);
         }
         else if (this._commandLineArgs.target == TargetGeneration.Next) {
-            const apiWriter = new ApiNextJsWriter(this._commandLineArgs.outputDirectory);
+            const apiWriter = new ApiNextJsWriter(this._commandLineArgs);
             apiWriter.write(this._apis);
         }
         else if (this._commandLineArgs.target == TargetGeneration.Flutter) {

package/dist/generators-writers/angular/api-angular-writer.d.ts

@@ -1,7 +1,8 @@
-import { ApiDto } from '@src/models/api-dto.js';
+import { ApiDto } from '../../models/api-dto.js';
+import { CommandLineArgs } from '@src/index.js';
 export declare class ApiAngularWriter {
-    private _outputDirectory;
-    constructor(_outputDirectory: string);
+    private _commandLineArgs;
+    constructor(commandLineArgs: CommandLineArgs);
     write(apis: ApiDto[]): void;
     private _apiString;
     private _parameters;
@@ -12,4 +13,5 @@ export declare class ApiAngularWriter {
     private _queryParametersStatement;
     private _requestPreparation;
     private _writeFile;
+    private _getApiPre;
 }

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

@@ -1,11 +1,11 @@
 import fs from 'fs';
-import { API_POST, API_PRE } from './constants.js';
+import { API_POST } from './constants.js';
 import { Utils } from '../utils.js';
 import { Normalizator } from './normalizator.js';
 export class ApiAngularWriter {
-    _outputDirectory;
-    constructor(_outputDirectory) {
-        this._outputDirectory = _outputDirectory;
+    _commandLineArgs;
+    constructor(commandLineArgs) {
+        this._commandLineArgs = commandLineArgs;
     }
     write(apis) {
         let apiString = '';
@@ -120,8 +120,35 @@ export class ApiAngularWriter {
         }
     }
     _writeFile(apis) {
-        fs.writeFileSync(this._outputDirectory + "/api.autogenerated.ts", `${API_PRE}
+        const className = this._commandLineArgs.apiClientName || 'ApiAutogeneratedService';
+        const apiPre = this._getApiPre(className);
+        fs.writeFileSync(this._commandLineArgs.outputDirectory + "/api.autogenerated.ts", `${apiPre}
 ${apis}
 ${API_POST}`, { flag: 'w' });
     }
+    _getApiPre(className) {
+        return `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 ${className} {
+  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>;
+`;
+    }
 }

package/dist/generators-writers/angular/model-angular-writer.d.ts

@@ -1,4 +1,4 @@
-import { ModelDto } from '@src/models/model-dto.js';
+import { ModelDto } from '../../models/model-dto.js';
 export declare class ModelAngularWriter {
     private _outputDirectory;
     constructor(_outputDirectory: string);

package/dist/generators-writers/dart/api-dart-writer.d.ts

@@ -1,10 +1,13 @@
-import { ApiDto } from '@src/models/api-dto.js';
-import { CommandLineArgs } from '@src/index.js';
-import { ModelDto } from '@src/models/model-dto.js';
+import { ApiDto } from '../../models/api-dto.js';
+import { CommandLineArgs } from '../../index.js';
+import { ModelDto } from '../../models/model-dto.js';
 export declare class ApiDartWriter {
     private _commandLineArgs;
     constructor(commandLineArgs: CommandLineArgs);
     write(apis: ApiDto[], models: ModelDto[]): void;
+    private _writeUnifiedApi;
+    private _writeApisByTag;
+    private _createEndpoint;
     private _toPascalCase;
     private _normalizeApiClassName;
     private _groupByTag;

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

@@ -4,7 +4,7 @@ import Mustache from 'mustache';
 import { Normalizator } from './normalizator.js';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { logger } from '@src/utils/logger.js';
+import { logger } from '../../utils/logger.js';
 export class ApiDartWriter {
     _commandLineArgs;
     constructor(commandLineArgs) {
@@ -19,6 +19,40 @@ export class ApiDartWriter {
         if (importDirectory.startsWith('lib/')) {
             importDirectory = importDirectory.slice('lib/'.length);
         }
+        // Se è specificato apiClientName, genera una singola classe unificata
+        if (this._commandLineArgs.apiClientName) {
+            this._writeUnifiedApi(apis, models, template, importDirectory);
+        }
+        else {
+            // Altrimenti suddividi per tag come prima
+            this._writeApisByTag(apis, models, template, importDirectory);
+        }
+    }
+    _writeUnifiedApi(apis, models, template, importDirectory) {
+        const apiClassName = this._commandLineArgs.apiClientName;
+        const filename = Utils.toDartFileName(apiClassName);
+        console.log(`Api: Unified API Client - ${apiClassName}`);
+        var apiDefinition = {
+            package: this._commandLineArgs.package,
+            outputDirectory: this._commandLineArgs.outputDirectory,
+            filename: filename,
+            apiClassName: apiClassName,
+        };
+        var endpoints = [];
+        var imports = [];
+        // Processa tutte le API senza raggruppamento
+        for (const api of apis) {
+            const endpointData = this._createEndpoint(api, models, imports, importDirectory);
+            endpoints.push(endpointData.endpoint);
+        }
+        apiDefinition.endpoints = endpoints;
+        apiDefinition.imports = imports.map(i => i.import);
+        let destinationPath = `${this._commandLineArgs.outputDirectory}/api`;
+        Utils.ensureDirectorySync(`${destinationPath}`);
+        var result = Mustache.render(template, apiDefinition);
+        writeFileSync(`${destinationPath}/${apiDefinition.filename}.dart`, result, 'utf-8');
+    }
+    _writeApisByTag(apis, models, template, importDirectory) {
         const grouped = this._groupByTag(apis);
         for (const [tag, apis] of Object.entries(grouped)) {
             logger.progress(`Generating Dart API: ${tag}`);
@@ -37,68 +71,8 @@ export class ApiDartWriter {
             var endpoints = [];
             var imports = [];
             for (const api of apis) {
-                var requestType = undefined;
-                requestType = api.haveRequest ? api.parameters[0]?.typeName || 'void' : undefined;
-                requestType = requestType?.split('.').pop();
-                requestType = Utils.toDartClassName(requestType);
-                var responseType = 'void';
-                responseType = api.returnType ? api.returnType.typeName : 'void';
-                responseType = responseType?.split('.').pop();
-                if (api.returnType?.isNativeType) {
-                    responseType = Normalizator.mapTsTypeToDart(responseType);
-                }
-                else {
-                    responseType = Utils.toDartClassName(responseType) ?? responseType;
-                }
-                var methodName = Utils.getNormalizedApiPathDart(api.name);
-                if (methodName.startsWith(Utils.toFirstLetterLowercase(tag))) {
-                    methodName = methodName.slice(tag.length);
-                    methodName = Utils.toFirstLetterLowercase(methodName);
-                }
-                const endpoint = {
-                    methodName: methodName,
-                    httpMethod: api.method.toLowerCase(),
-                    path: api.url,
-                    responseType: responseType,
-                    isResponseNativeType: api.returnType ? api.returnType.isNativeType : true,
-                    haveRequest: api.haveRequest,
-                    requestType: requestType,
-                };
-                if (api.parameters && api.parameters.length > 0 && !api.haveRequest) {
-                    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 => {
-                            if (model.typeName === api.parameters[0]?.typeName) {
-                                const normalizedInfo = Normalizator.getNormalizedInfo(model);
-                                imports.push({
-                                    type: api.parameters[0],
-                                    import: `import 'package:${this._commandLineArgs.package}/${importDirectory}/${normalizedInfo.subPath}/${normalizedInfo.filename}.dart';`
-                                });
-                            }
-                        });
-                    }
-                }
-                if (api.returnType && !api.returnType.isNativeType) {
-                    if (imports.findIndex(x => x.type.typeName == api.returnType.typeName) == -1) {
-                        models.forEach(model => {
-                            if (model.typeName === api.returnType.typeName) {
-                                const normalizedInfo = Normalizator.getNormalizedInfo(model);
-                                imports.push({
-                                    type: api.returnType,
-                                    import: `import 'package:${this._commandLineArgs.package}/${importDirectory}/${normalizedInfo.subPath}/${normalizedInfo.filename}.dart';`
-                                });
-                            }
-                        });
-                    }
-                }
-                endpoints.push(endpoint);
+                const endpointData = this._createEndpoint(api, models, imports, importDirectory, tag);
+                endpoints.push(endpointData.endpoint);
             }
             apiDefinition.endpoints = endpoints;
             apiDefinition.imports = imports.map(i => i.import);
@@ -108,6 +82,74 @@ export class ApiDartWriter {
             writeFileSync(`${destinationPath}/${apiDefinition.filename}.dart`, result, 'utf-8');
         }
     }
+    _createEndpoint(api, models, imports, importDirectory, tag) {
+        var requestType = undefined;
+        requestType = api.haveRequest ? api.parameters[0]?.typeName || 'void' : undefined;
+        requestType = requestType?.split('.').pop();
+        requestType = Utils.toDartClassName(requestType);
+        var responseType = 'void';
+        responseType = api.returnType ? api.returnType.typeName : 'void';
+        responseType = responseType?.split('.').pop();
+        if (api.returnType?.isNativeType) {
+            responseType = Normalizator.mapTsTypeToDart(responseType);
+        }
+        else {
+            responseType = Utils.toDartClassName(responseType) ?? responseType;
+        }
+        var methodName = Utils.getNormalizedApiPathDart(api.name);
+        if (tag && methodName.startsWith(Utils.toFirstLetterLowercase(tag))) {
+            methodName = methodName.slice(tag.length);
+            methodName = Utils.toFirstLetterLowercase(methodName);
+        }
+        // console.debug(`\tAPI - ${apiName} - ${apiMethod}`);
+        if (methodName.toLowerCase().indexOf("productsave") >= 0) {
+            debugger;
+        }
+        const endpoint = {
+            methodName: methodName,
+            httpMethod: api.method.toLowerCase(),
+            path: api.url,
+            responseType: responseType,
+            isResponseNativeType: api.returnType ? api.returnType.isNativeType : true,
+            haveRequest: api.haveRequest,
+            requestType: requestType,
+        };
+        if (api.parameters && api.parameters.length > 0 && !api.haveRequest) {
+            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 => {
+                    if (model.typeName === api.parameters[0]?.typeName) {
+                        const normalizedInfo = Normalizator.getNormalizedInfo(model);
+                        imports.push({
+                            type: api.parameters[0],
+                            import: `import 'package:${this._commandLineArgs.package}/${importDirectory}/${normalizedInfo.subPath}/${normalizedInfo.filename}.dart';`
+                        });
+                    }
+                });
+            }
+        }
+        if (api.returnType && !api.returnType.isNativeType) {
+            if (imports.findIndex(x => x.type.typeName == api.returnType.typeName) == -1) {
+                models.forEach(model => {
+                    if (model.typeName === api.returnType.typeName) {
+                        const normalizedInfo = Normalizator.getNormalizedInfo(model);
+                        imports.push({
+                            type: api.returnType,
+                            import: `import 'package:${this._commandLineArgs.package}/${importDirectory}/${normalizedInfo.subPath}/${normalizedInfo.filename}.dart';`
+                        });
+                    }
+                });
+            }
+        }
+        return { endpoint };
+    }
     _toPascalCase(input) {
         return input
             .replace(/[_\- ]+/g, ' ') // sostituisce underscore, dash e spazi con uno spazio singolo

package/dist/generators-writers/dart/model-dart-writer.d.ts

@@ -1,5 +1,5 @@
-import { ModelDto } from '@src/models/model-dto.js';
-import { CommandLineArgs } from '@src/index.js';
+import { ModelDto } from '../../models/model-dto.js';
+import { CommandLineArgs } from '../../index.js';
 export declare class ModelDartWriter {
     private _commandLineArgs;
     constructor(commandLineArgs: CommandLineArgs);

package/dist/generators-writers/dart/models/import-definition-dart.d.ts

@@ -1,4 +1,4 @@
-import { TypeDto } from "@src/models/type-dto.js";
+import { TypeDto } from "../../../models/type-dto.js";
 export interface ImportDefinitionDart {
     type: TypeDto;
     import: string;

package/dist/generators-writers/dart/normalizator.d.ts

@@ -1,4 +1,4 @@
-import { ModelDto } from "@src/models/model-dto.js";
+import { ModelDto } from "../../models/model-dto.js";
 export declare class Normalizator {
     static getNormalizedInfo(model: ModelDto): {
         filename: string;

package/dist/generators-writers/nextjs/api-nextjs-writer.d.ts

@@ -1,7 +1,8 @@
-import { ApiDto } from '@src/models/api-dto.js';
+import { ApiDto } from '../../models/api-dto.js';
+import { CommandLineArgs } from '../../index.js';
 export declare class ApiNextJsWriter {
-    private _outputDirectory;
-    constructor(_outputDirectory: string);
+    private _commandLineArgs;
+    constructor(commandLineArgs: CommandLineArgs);
     write(apis: ApiDto[]): void;
     private _apiString;
     private _parameters;

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

@@ -2,9 +2,9 @@ import fs from 'fs';
 import { API_PRE } from './constants.js';
 import { Utils } from '../utils.js';
 export class ApiNextJsWriter {
-    _outputDirectory;
-    constructor(_outputDirectory) {
-        this._outputDirectory = _outputDirectory;
+    _commandLineArgs;
+    constructor(commandLineArgs) {
+        this._commandLineArgs = commandLineArgs;
     }
     write(apis) {
         let apiString = '';
@@ -121,7 +121,7 @@ ${preparation}const response = await axios.${method}<${returnTypeString}>(\`${ap
 `;
     }
     _writeFile(apis) {
-        fs.writeFileSync(this._outputDirectory + "/api.autogenerated.ts", `${API_PRE}
+        fs.writeFileSync(this._commandLineArgs.outputDirectory + "/api.autogenerated.ts", `${API_PRE}
 ${apis}`, { flag: 'w' });
     }
 }

package/dist/generators-writers/nextjs/model-nextjs-writer.d.ts

@@ -1,4 +1,4 @@
-import { ModelDto } from '@src/models/model-dto.js';
+import { ModelDto } from '../../models/model-dto.js';
 export declare class ModelNextJsWriter {
     private _outputDirectory;
     constructor(_outputDirectory: string);

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

@@ -1,4 +1,4 @@
-import { SwaggerSchema } from "@src/models/swagger/swagger-schema.js";
+import { SwaggerSchema } from "../models/swagger/swagger-schema.js";
 export declare class Utils {
     static getNormalizedApiPathAngular(apiName: string): string;
     static getNormalizedApiPathDart(apiName: string): string;

package/dist/index.d.ts

@@ -14,4 +14,5 @@ export interface CommandLineArgs {
     target: TargetGeneration;
     dateTimeLibrary?: DateTimeLibrary;
     package?: string;
+    apiClientName?: string;
 }

package/dist/index.js

@@ -16,7 +16,7 @@ export var TargetGeneration;
 })(TargetGeneration || (TargetGeneration = {}));
 const argv = yargs(hideBin(process.argv))
     .scriptName("swagger-gen")
-    .usage('Usage: $0 --url <swaggerJsonUrl> --output <outputDirectory> --target <target> [--dateTimeLibrary <dateTimeLibrary>] [--package <name>]')
+    .usage('Usage: $0 --url <swaggerJsonUrl> --output <outputDirectory> --target <target> [--dateTimeLibrary <dateTimeLibrary>] [--package <name>] [--api-client-name <className>]')
     .option('url', {
     alias: 'u',
     type: 'string',
@@ -47,6 +47,11 @@ const argv = yargs(hideBin(process.argv))
     alias: 'p',
     type: 'string',
     describe: 'For Dart: package name for Dart project',
+})
+    .option('api-client-name', {
+    alias: 'a',
+    type: 'string',
+    describe: 'Name for the unified API client class (all services in one class)',
 })
     .help()
     .parseSync();
@@ -56,6 +61,7 @@ const commandLineArgs = {
     target: parseTargetGeneration(argv.target),
     dateTimeLibrary: parseDateTimeLibrary(argv.dateTimeLibrary),
     package: argv.package ?? '',
+    apiClientName: argv['api-client-name'],
 };
 const swaggerDownloader = new SwaggerDownloader();
 swaggerDownloader.download(new URL(commandLineArgs.swaggerJsonUrl))

package/dist/templates/api.mustache

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

package/dist/templates/model.mustache

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

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@devlearning/swagger-generator",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "Swagger generator apis and models for Angular and NextJS",
   "main": "index.js",
   "type": "module",
   "scripts": {
     "build": "npx tsc && npm run copy-templates",
     "debug-angular": "npx tsx src/index.ts --url http://localhost:5208/swagger/v1/swagger.json --output autogen --target angular --dateTimeLibrary moment",
+    "debug-angular-unified": "npx tsx src/index.ts --url http://localhost:5208/swagger/v1/swagger.json --output autogen --target angular --dateTimeLibrary moment --api-client-name ApiClient",
     "debug-nextjs": "npx tsx src/index.ts --url http://localhost:7550/swagger/ApiGateway/swagger.json --output autogen --target next --dateTimeLibrary date-fns",
-    "debug-flutter": "npx tsx src/index.ts --url http://localhost:7550/swagger/ApiGateway/swagger.json --output autogen --target flutter --package coqudo_app",
+    "debug-flutter": "npx tsx src/index.ts --url http://localhost:7550/swagger/v1/swagger.json --output autogen --target flutter --package app",
+    "debug-flutter-unified": "npx tsx src/index.ts --url http://localhost:7550/swagger/v1/swagger.json --output autogen --target flutter --package app --api-client-name ApiClient",
     "copy-templates": "copyfiles -u 3 \"src/generators-writers/dart/templates/**/*\" dist/generators-writers/dart",
     "prepublishOnly": "npm run build",
     "deploy": "npm publish"

package/src/generator.ts

@@ -168,10 +168,10 @@ export class Generator {
     this._barApis.update(this._apis.length, { message: `Api generating...` });
 
     if (this._commandLineArgs.target == TargetGeneration.Angular) {
-      const apiWriter = new ApiAngularWriter(this._commandLineArgs.outputDirectory);
+      const apiWriter = new ApiAngularWriter(this._commandLineArgs);
       apiWriter.write(this._apis);
     } else if (this._commandLineArgs.target == TargetGeneration.Next) {
-      const apiWriter = new ApiNextJsWriter(this._commandLineArgs.outputDirectory);
+      const apiWriter = new ApiNextJsWriter(this._commandLineArgs);
       apiWriter.write(this._apis);
     } else if (this._commandLineArgs.target == TargetGeneration.Flutter) {
       const apiWriter = new ApiDartWriter(this._commandLineArgs);

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

@@ -1,15 +1,16 @@
 import fs from 'fs';
 import { API_POST, API_PRE } from './constants.js';
-import { ApiDto } from '@src/models/api-dto.js';
+import { ApiDto } from '../../models/api-dto.js';
 import { Utils } from '../utils.js';
-import { ParameterDto } from '@src/models/parameter-dto.js';
+import { ParameterDto } from '../../models/parameter-dto.js';
 import { Normalizator } from './normalizator.js';
+import { CommandLineArgs } from '@src/index.js';
 
 export class ApiAngularWriter {
-  private _outputDirectory: string;
+  private _commandLineArgs: CommandLineArgs;
 
-  constructor(_outputDirectory: string) {
-    this._outputDirectory = _outputDirectory;
+  constructor(commandLineArgs: CommandLineArgs) {
+    this._commandLineArgs = commandLineArgs;
   }
 
   write(apis: ApiDto[]) {
@@ -149,10 +150,39 @@ export class ApiAngularWriter {
   }
 
   private _writeFile(apis: string) {
-    fs.writeFileSync(this._outputDirectory + "/api.autogenerated.ts",
-      `${API_PRE}
+    const className = this._commandLineArgs.apiClientName || 'ApiAutogeneratedService';
+    const apiPre = this._getApiPre(className);
+    
+    fs.writeFileSync(this._commandLineArgs.outputDirectory + "/api.autogenerated.ts",
+      `${apiPre}
 ${apis}
 ${API_POST}`,
       { flag: 'w' });
   }
+
+  private _getApiPre(className: string): string {
+    return `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 ${className} {
+  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>;
+`;
+  }
 }

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

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import { MODEL_POST, MODEL_PRE } from './constants.js';
-import { ModelDto } from '@src/models/model-dto.js';
+import { ModelDto } from '../../models/model-dto.js';
 import { Normalizator } from './normalizator.js';
 import { Utils } from '../utils.js';
 

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

@@ -1,16 +1,16 @@
 import fs, { writeFileSync } from 'fs';
-import { ApiDto } from '@src/models/api-dto.js';
+import { ApiDto } from '../../models/api-dto.js';
 import { Utils } from '../utils.js';
-import { ParameterDto } from '@src/models/parameter-dto.js';
+import { ParameterDto } from '../../models/parameter-dto.js';
 import Mustache from 'mustache';
-import { CommandLineArgs } from '@src/index.js';
-import { ModelDto } from '@src/models/model-dto.js';
-import { TypeDto } from '@src/models/type-dto.js';
+import { CommandLineArgs } from '../../index.js';
+import { ModelDto } from '../../models/model-dto.js';
+import { TypeDto } from '../../models/type-dto.js';
 import { ImportDefinitionDart } from './models/import-definition-dart.js';
 import { Normalizator } from './normalizator.js';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { logger } from '@src/utils/logger.js';
+import { logger } from '../../utils/logger.js';
 
 interface ApiDefinitionDart {
   package: string;
@@ -58,6 +58,49 @@ export class ApiDartWriter {
       importDirectory = importDirectory.slice('lib/'.length);
     }
 
+    // Se è specificato apiClientName, genera una singola classe unificata
+    if (this._commandLineArgs.apiClientName) {
+      this._writeUnifiedApi(apis, models, template, importDirectory);
+    } else {
+      // Altrimenti suddividi per tag come prima
+      this._writeApisByTag(apis, models, template, importDirectory);
+    }
+  }
+
+  private _writeUnifiedApi(apis: ApiDto[], models: ModelDto[], template: string, importDirectory: string) {
+    const apiClassName = this._commandLineArgs.apiClientName!;
+    const filename = Utils.toDartFileName(apiClassName);
+    
+    console.log(`Api: Unified API Client - ${apiClassName}`);
+
+    var apiDefinition = <ApiDefinitionDart>{
+      package: this._commandLineArgs.package,
+      outputDirectory: this._commandLineArgs.outputDirectory,
+      filename: filename,
+      apiClassName: apiClassName,
+    }
+
+    var endpoints = <EndpointDefinitionDart[]>[];
+    var imports = <ImportDefinitionDart[]>[];
+
+    // Processa tutte le API senza raggruppamento
+    for (const api of apis) {
+      const endpointData = this._createEndpoint(api, models, imports, importDirectory);
+      endpoints.push(endpointData.endpoint);
+    }
+
+    apiDefinition.endpoints = endpoints;
+    apiDefinition.imports = imports.map(i => i.import);
+
+    let destinationPath = `${this._commandLineArgs.outputDirectory}/api`;
+
+    Utils.ensureDirectorySync(`${destinationPath}`);
+
+    var result = Mustache.render(template, apiDefinition);
+    writeFileSync(`${destinationPath}/${apiDefinition.filename}.dart`, result, 'utf-8');
+  }
+
+  private _writeApisByTag(apis: ApiDto[], models: ModelDto[], template: string, importDirectory: string) {
     const grouped = this._groupByTag(apis);
 
     for (const [tag, apis] of Object.entries(grouped)) {
@@ -82,76 +125,8 @@ export class ApiDartWriter {
       var imports = <ImportDefinitionDart[]>[];
 
       for (const api of apis) {
-        var requestType: string | undefined = undefined;
-        requestType = api.haveRequest ? api.parameters[0]?.typeName || 'void' : undefined;
-        requestType = requestType?.split('.').pop()!
-        requestType = Utils.toDartClassName(requestType);
-
-
-
-        var responseType: string = 'void';
-        responseType = api.returnType ? api.returnType.typeName : 'void';
-        responseType = responseType?.split('.').pop()!;
-        if (api.returnType?.isNativeType) {
-          responseType = Normalizator.mapTsTypeToDart(responseType);
-        } else {
-          responseType = Utils.toDartClassName(responseType) ?? responseType;
-        }
-
-        var methodName = Utils.getNormalizedApiPathDart(api.name);
-        if (methodName.startsWith(Utils.toFirstLetterLowercase(tag))) {
-          methodName = methodName.slice(tag.length);
-          methodName = Utils.toFirstLetterLowercase(methodName);
-        }
-
-        const endpoint = <EndpointDefinitionDart>{
-          methodName: methodName,
-          httpMethod: api.method.toLowerCase() as HttpMethodDart,
-          path: api.url,
-          responseType: responseType,
-          isResponseNativeType: api.returnType ? api.returnType.isNativeType : true,
-          haveRequest: api.haveRequest,
-          requestType: requestType,
-        };
-
-        if (api.parameters && api.parameters.length > 0 && !api.haveRequest) {
-          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 => {
-              if (model.typeName === api.parameters[0]?.typeName) {
-                const normalizedInfo = Normalizator.getNormalizedInfo(model);
-                imports.push({
-                  type: api.parameters[0],
-                  import: `import 'package:${this._commandLineArgs.package}/${importDirectory}/${normalizedInfo.subPath}/${normalizedInfo.filename}.dart';`
-                });
-              }
-            });
-          }
-        }
-
-        if (api.returnType && !api.returnType.isNativeType) {
-          if (imports.findIndex(x => x.type.typeName == api.returnType!.typeName) == -1) {
-            models.forEach(model => {
-              if (model.typeName === api.returnType!.typeName) {
-                const normalizedInfo = Normalizator.getNormalizedInfo(model);
-                imports.push({
-                  type: api.returnType!,
-                  import: `import 'package:${this._commandLineArgs.package}/${importDirectory}/${normalizedInfo.subPath}/${normalizedInfo.filename}.dart';`
-                });
-              }
-            });
-          }
-        }
-
-        endpoints.push(endpoint);
+        const endpointData = this._createEndpoint(api, models, imports, importDirectory, tag);
+        endpoints.push(endpointData.endpoint);
       }
 
       apiDefinition.endpoints = endpoints;
@@ -166,6 +141,82 @@ export class ApiDartWriter {
     }
   }
 
+  private _createEndpoint(api: ApiDto, models: ModelDto[], imports: ImportDefinitionDart[], importDirectory: string, tag?: string): { endpoint: EndpointDefinitionDart } {
+    var requestType: string | undefined = undefined;
+    requestType = api.haveRequest ? api.parameters[0]?.typeName || 'void' : undefined;
+    requestType = requestType?.split('.').pop()!
+    requestType = Utils.toDartClassName(requestType);
+
+    var responseType: string = 'void';
+    responseType = api.returnType ? api.returnType.typeName : 'void';
+    responseType = responseType?.split('.').pop()!;
+    if (api.returnType?.isNativeType) {
+      responseType = Normalizator.mapTsTypeToDart(responseType);
+    } else {
+      responseType = Utils.toDartClassName(responseType) ?? responseType;
+    }
+
+    var methodName = Utils.getNormalizedApiPathDart(api.name);
+    if (tag && methodName.startsWith(Utils.toFirstLetterLowercase(tag))) {
+      methodName = methodName.slice(tag.length);
+      methodName = Utils.toFirstLetterLowercase(methodName);
+    }
+
+    // console.debug(`\tAPI - ${apiName} - ${apiMethod}`);
+    if (methodName.toLowerCase().indexOf("productsave") >= 0) {
+      debugger
+    }
+
+    const endpoint = <EndpointDefinitionDart>{
+      methodName: methodName,
+      httpMethod: api.method.toLowerCase() as HttpMethodDart,
+      path: api.url,
+      responseType: responseType,
+      isResponseNativeType: api.returnType ? api.returnType.isNativeType : true,
+      haveRequest: api.haveRequest,
+      requestType: requestType,
+    };
+
+    if (api.parameters && api.parameters.length > 0 && !api.haveRequest) {
+      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 => {
+          if (model.typeName === api.parameters[0]?.typeName) {
+            const normalizedInfo = Normalizator.getNormalizedInfo(model);
+            imports.push({
+              type: api.parameters[0],
+              import: `import 'package:${this._commandLineArgs.package}/${importDirectory}/${normalizedInfo.subPath}/${normalizedInfo.filename}.dart';`
+            });
+          }
+        });
+      }
+    }
+
+    if (api.returnType && !api.returnType.isNativeType) {
+      if (imports.findIndex(x => x.type.typeName == api.returnType!.typeName) == -1) {
+        models.forEach(model => {
+          if (model.typeName === api.returnType!.typeName) {
+            const normalizedInfo = Normalizator.getNormalizedInfo(model);
+            imports.push({
+              type: api.returnType!,
+              import: `import 'package:${this._commandLineArgs.package}/${importDirectory}/${normalizedInfo.subPath}/${normalizedInfo.filename}.dart';`
+            });
+          }
+        });
+      }
+    }
+
+    return { endpoint };
+  }
+
   private _toPascalCase(input: string): string {
     return input
       .replace(/[_\- ]+/g, ' ')              // sostituisce underscore, dash e spazi con uno spazio singolo

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

@@ -1,8 +1,8 @@
 import fs, { readFileSync, writeFileSync } from 'fs';
-import { ModelDto } from '@src/models/model-dto.js';
+import { ModelDto } from '../../models/model-dto.js';
 import Mustache from 'mustache';
 import { Utils } from '../utils.js';
-import { CommandLineArgs } from '@src/index.js';
+import { CommandLineArgs } from '../../index.js';
 import { ImportDefinitionDart } from './models/import-definition-dart.js';
 import { Normalizator } from './normalizator.js';
 import path from 'path';

package/src/generators-writers/dart/models/import-definition-dart.ts

@@ -1,4 +1,4 @@
-import { TypeDto } from "@src/models/type-dto.js";
+import { TypeDto } from "../../../models/type-dto.js";
 
 export interface ImportDefinitionDart {
   type: TypeDto;

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

@@ -1,4 +1,4 @@
-import { ModelDto } from "@src/models/model-dto.js";
+import { ModelDto } from "../../models/model-dto.js";
 import { Utils } from "../utils.js";
 
 export class Normalizator {

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

@@ -1,14 +1,15 @@
 import fs from 'fs';
 import { API_PRE } from './constants.js';
-import { ApiDto } from '@src/models/api-dto.js';
+import { ApiDto } from '../../models/api-dto.js';
 import { Utils } from '../utils.js';
-import { ParameterDto } from '@src/models/parameter-dto.js';
+import { ParameterDto } from '../../models/parameter-dto.js';
+import { CommandLineArgs } from '../../index.js';
 
 export class ApiNextJsWriter {
-  private _outputDirectory: string;
+  private _commandLineArgs: CommandLineArgs;
 
-  constructor(_outputDirectory: string) {
-    this._outputDirectory = _outputDirectory;
+  constructor(commandLineArgs: CommandLineArgs) {
+    this._commandLineArgs = commandLineArgs;
   }
 
   write(apis: ApiDto[]) {
@@ -149,7 +150,7 @@ ${preparation}const response = await axios.${method}<${returnTypeString}>(\`${ap
 
 
   private _writeFile(apis: string) {
-    fs.writeFileSync(this._outputDirectory + "/api.autogenerated.ts",
+    fs.writeFileSync(this._commandLineArgs.outputDirectory + "/api.autogenerated.ts",
       `${API_PRE}
 ${apis}`,
       { flag: 'w' });

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

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { ModelDto } from '@src/models/model-dto.js';
+import { ModelDto } from '../../models/model-dto.js';
 
 export class ModelNextJsWriter {
   private _outputDirectory: string;

package/src/generators-writers/utils.ts

@@ -1,4 +1,4 @@
-import { SwaggerSchema } from "@src/models/swagger/swagger-schema.js";
+import { SwaggerSchema } from "../models/swagger/swagger-schema.js";
 import fs from 'fs';
 import path from 'path';
 

package/src/index.ts

@@ -22,11 +22,12 @@ export interface CommandLineArgs {
 	target: TargetGeneration;
 	dateTimeLibrary?: DateTimeLibrary;
 	package?: string;
+	apiClientName?: string;
 }
 
 const argv = yargs(hideBin(process.argv))
 	.scriptName("swagger-gen")
-	.usage('Usage: $0 --url <swaggerJsonUrl> --output <outputDirectory> --target <target> [--dateTimeLibrary <dateTimeLibrary>] [--package <name>]')
+	.usage('Usage: $0 --url <swaggerJsonUrl> --output <outputDirectory> --target <target> [--dateTimeLibrary <dateTimeLibrary>] [--package <name>] [--api-client-name <className>]')
 	.option('url', {
 		alias: 'u',
 		type: 'string',
@@ -58,6 +59,11 @@ const argv = yargs(hideBin(process.argv))
 		type: 'string',
 		describe: 'For Dart: package name for Dart project',
 	})
+	.option('api-client-name', {
+		alias: 'a',
+		type: 'string',
+		describe: 'Name for the unified API client class (all services in one class)',
+	})
 	.help()
 	.parseSync();
 
@@ -67,6 +73,7 @@ const commandLineArgs: CommandLineArgs = {
 	target: parseTargetGeneration(argv.target),
 	dateTimeLibrary: parseDateTimeLibrary(argv.dateTimeLibrary),
 	package: argv.package ?? '',
+	apiClientName: argv['api-client-name'],
 };
 
 const swaggerDownloader = new SwaggerDownloader();

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

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

package/dist/models/swagger-component.js

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

package/dist/models/swagger-content.js

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

package/dist/models/swagger-info.js

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

package/dist/models/swagger-method.js

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

package/dist/models/swagger-schema.js

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

package/dist/models/swagger.js

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