@devlearning/swagger-generator 1.1.16 → 1.1.18

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

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

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

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

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

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

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

@@ -23,15 +23,15 @@ export class ApiNextJsWriter {
         let haveRequest = api.haveRequest;
         let method = api.method.toLowerCase();
         let httpOptions = api.isMultiPart ? 'httpOptionsMultiPart' : 'httpOptions';
-        let preparation = `${queryParametersPreparation}
+        let preparation = `${queryParametersPreparation}
   ${requestPreparation}`.trim();
         preparation = preparation.length > 0 ? `  ${preparation}\n  ` : '';
         //\`\${API_BASE_URL}
-        let apiString = `
-export const ${apiNameNormalized} = async (${parametersString}): Promise<${returnTypeString}> => {
-${preparation}const response = await axios.${method}<${returnTypeString}>(\`${api.url}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''});
-  return response.data;
-}
+        let apiString = `
+export const ${apiNameNormalized} = async (${parametersString}): Promise<${returnTypeString}> => {
+${preparation}const response = await axios.${method}<${returnTypeString}>(\`${api.url}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''});
+  return response.data;
+}
 `;
         return apiString;
     }
@@ -59,21 +59,21 @@ ${preparation}const response = await axios.${method}<${returnTypeString}>(\`${ap
     _queryParametersPreparationStatement(parameter) {
         if (parameter.nullable) {
             if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-                return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined && isValid(${parameter.name}) ? encodeURIComponent(dateToZulu(${parameter.name})) : '';
+                return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined && isValid(${parameter.name}) ? encodeURIComponent(dateToZulu(${parameter.name})) : '';
 `;
             }
             else {
-                return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined ? encodeURIComponent('' + ${parameter.name}) : '';
+                return `  const ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} !== undefined ? encodeURIComponent('' + ${parameter.name}) : '';
 `;
             }
         }
         else {
             if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-                return `  const ${parameter.name}Param: string = encodeURIComponent(dateToZulu(${parameter.name}));
+                return `  const ${parameter.name}Param: string = encodeURIComponent(dateToZulu(${parameter.name}));
 `;
             }
             else {
-                return `  const ${parameter.name}Param: string = encodeURIComponent('' + ${parameter.name});
+                return `  const ${parameter.name}Param: string = encodeURIComponent('' + ${parameter.name});
 `;
             }
         }
@@ -117,11 +117,11 @@ ${preparation}const response = await axios.${method}<${returnTypeString}>(\`${ap
         if (!api.haveRequest) {
             return ``;
         }
-        return `  const wrappedRequest = handleRequest(request);
+        return `  const wrappedRequest = handleRequest(request);
 `;
     }
     _writeFile(apis) {
-        fs.writeFileSync(this._commandLineArgs.outputDirectory + "/api.autogenerated.ts", `${API_PRE}
+        fs.writeFileSync(this._commandLineArgs.outputDirectory + "/api.autogenerated.ts", `${API_PRE}
 ${apis}`, { flag: 'w' });
     }
 }

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

@@ -1,5 +1,5 @@
-export const API_PRE = `import axios from 'axios';
-import * as Models from './model.autogenerated';
-import { handleRequest, dateToZulu } from './utils/axios'
-import { isValid } from 'date-fns';
+export const API_PRE = `import axios from 'axios';
+import * as Models from './model.autogenerated';
+import { handleRequest, dateToZulu } from './utils/axios'
+import { isValid } from 'date-fns';
 `;

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

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

package/dist/models/swagger/swagger-component.d.ts

@@ -5,6 +5,6 @@ export interface SwaggerComponent {
         [key: string]: SwaggerSchema;
     };
     additionalProperties: boolean;
-    enum: string[];
-    required: string[];
+    enum?: Array<string | number>;
+    required?: string[];
 }

package/dist/models/swagger/swagger-schema.d.ts

@@ -7,6 +7,7 @@ export interface SwaggerSchema {
     properties?: {
         [key: string]: SwaggerSchema;
     };
+    enum?: Array<string | number>;
     nullable?: boolean;
     minLength?: number;
 }

package/package.json

@@ -1,49 +1,49 @@
-{
-  "name": "@devlearning/swagger-generator",
-  "version": "1.1.16",
-  "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/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"
-  },
-  "bin": {
-    "swgen": "./dist/index.js"
-  },
-  "keywords": [
-    "swagger",
-    "angular",
-    "nextjs",
-    "dart",
-    "flutter",
-    "api",
-    "generator"
-  ],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cli-progress": "^3.12.0",
-    "mustache": "^4.2.0",
-    "node-fetch": "^3.3.2",
-    "yargs": "^18.0.0"
-  },
-  "node-fetch": "^3.3.2",
-  "devDependencies": {
-    "@types/cli-progress": "^3.11.6",
-    "@types/mustache": "^4.2.6",
-    "@types/node": "^24.7.0",
-    "@types/yargs": "^17.0.33",
-    "copyfiles": "^2.4.1",
-    "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.1.6"
-  }
-}
+{
+  "name": "@devlearning/swagger-generator",
+  "version": "1.1.18",
+  "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/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"
+  },
+  "bin": {
+    "swgen": "./dist/index.js"
+  },
+  "keywords": [
+    "swagger",
+    "angular",
+    "nextjs",
+    "dart",
+    "flutter",
+    "api",
+    "generator"
+  ],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "cli-progress": "^3.12.0",
+    "mustache": "^4.2.0",
+    "node-fetch": "^3.3.2",
+    "yargs": "^18.0.0"
+  },
+  "node-fetch": "^3.3.2",
+  "devDependencies": {
+    "@types/cli-progress": "^3.11.6",
+    "@types/mustache": "^4.2.6",
+    "@types/node": "^24.7.0",
+    "@types/yargs": "^17.0.33",
+    "copyfiles": "^2.4.1",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.1.6"
+  }
+}

package/src/api.constants.ts

@@ -1,27 +1,27 @@
-export const API_PRE =
-    `import { HttpClient } from '@angular/common/http';
-import { Observable, catchError, map } from 'rxjs';
-import * as Models from './model.autogenerated';
-import { HttpHeaders } from "@angular/common/http";
-
-export const httpOptions = {
-  headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
-};
-
-export const httpOptionsMultipart = {};
-
-export abstract class ApiAutogeneratedService {
-  constructor(
-    public _http: HttpClient,
-    public _baseUrl: string,
-  ) { }
-
-  protected abstract _momentToString(moment: moment.Moment): string;
-  protected abstract _handleRequest<T>(request: T): T;
-  protected abstract _handleMultipart<T>(request: T): FormData;
-  protected abstract _handleResponse<T>(response: T): T;
-  protected abstract _handleError(error: any, obs: any): Observable<never>;
-`;
-
-export const API_POST =
+export const API_PRE =
+    `import { HttpClient } from '@angular/common/http';
+import { Observable, catchError, map } from 'rxjs';
+import * as Models from './model.autogenerated';
+import { HttpHeaders } from "@angular/common/http";
+
+export const httpOptions = {
+  headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
+};
+
+export const httpOptionsMultipart = {};
+
+export abstract class ApiAutogeneratedService {
+  constructor(
+    public _http: HttpClient,
+    public _baseUrl: string,
+  ) { }
+
+  protected abstract _momentToString(moment: moment.Moment): string;
+  protected abstract _handleRequest<T>(request: T): T;
+  protected abstract _handleMultipart<T>(request: T): FormData;
+  protected abstract _handleResponse<T>(response: T): T;
+  protected abstract _handleError(error: any, obs: any): Observable<never>;
+`;
+
+export const API_POST =
     `}`;