@devlearning/swagger-generator 0.0.37 → 1.0.0

package/src/generator.ts

@@ -1,11 +1,20 @@
 import fs from 'fs';
-import { SwaggerComponent } from './models/swagger-component.js';
-import { Swagger, SwaggerParameter } from './models/swagger.js';
-import { SwaggerMethod } from './models/swagger-method.js';
-import { SwaggerComponentProperty } from './models/swagger-component-property.js';
-import { SwaggerSchema } from './models/swagger-schema.js';
-import { API_PRE, API_POST } from './api.constants.js';
-import { MODEL_POST, MODEL_PRE } from './model.constants.js';
+import { SwaggerComponent } from './models/swagger/swagger-component.js';
+import { Swagger } from './models/swagger/swagger.js';
+import { SwaggerMethod } from './models/swagger/swagger-method.js';
+import { SwaggerComponentProperty } from './models/swagger/swagger-component-property.js';
+import { SwaggerSchema } from './models/swagger/swagger-schema.js';
+import { ApiDto } from './models/api-dto.js';
+import { TypeDto } from './models/type-dto.js';
+import { ParameterDto } from './models/parameter-dto.js';
+import { ApiNextJsWriter } from './generators-writers/nextjs/api-nextjs-writer.js';
+import { ApiAngularWriter } from './generators-writers/angular/api-angular-writer.js';
+import { ModelDto } from './models/model-dto.js';
+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 { PropertyDto } from './models/property-dto.js';
+import { EnumValueDto } from './models/enum-value-dto.js';
 
 const contentTypeApplicationJson = 'application/json';
 const contentTypeMultipartFormData = 'multipart/form-data';
@@ -13,88 +22,103 @@ const contentTypeMultipartFormData = 'multipart/form-data';
 export class Generator {
   private _swagger: Swagger;
   private _outputDirectory: string;
-
-  constructor(swagger: Swagger, outputDirectory: string) {
+  private _outputFormat: 'angular' | 'next';
+  private _dateLibrary: 'moment' | 'date-fns';
+
+  private _apis: ApiDto[] = [];
+  private _models: ModelDto[] = [];
+
+  private _barApis = new SingleBar({
+    format: '{bar} {percentage}% | {message} {value}/{total} Elapsed: {duration_formatted}', // Formato della barra
+    barCompleteChar: '\u2588', // Carattere pieno per la barra
+    barIncompleteChar: '\u2591', // Carattere vuoto per la parte non completata
+    hideCursor: true, // Nascondi il cursore durante l'esecuzione
+    barsize: 20,
+  }, Presets.shades_classic);
+
+  private _barModels = new SingleBar({
+    format: '{bar} {percentage}% | {message} {value}/{total} Elapsed: {duration_formatted}', // Formato della barra
+    barCompleteChar: '\u2588', // Carattere pieno per la barra
+    barIncompleteChar: '\u2591', // Carattere vuoto per la parte non completata
+    hideCursor: true, // Nascondi il cursore durante l'esecuzione
+    barsize: 20,
+  }, Presets.shades_classic);
+
+  constructor(swagger: Swagger, outputDirectory: string, outputFormat: 'angular' | 'next', dateLibrary: 'moment' | 'date-fns') {
     this._swagger = swagger;
     this._outputDirectory = outputDirectory;
+    this._outputFormat = outputFormat;
+    this._dateLibrary = dateLibrary;
   }
 
-  generateApi() {
-    console.debug(`Start autogeneration Apis`);
+  generate() {
+    console.info('%c[Swagger API Generator] %cStarting to parse Swagger JSON file...', 'color: #4CAF50; font-weight: bold;', 'color: #2196F3;');
 
-    let apiMethods = ``;
-    for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
-      const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
-      const swaggerMethod = this._swagger.paths[apiName];
-      const method = Object.getOwnPropertyNames(swaggerMethod)[0];
-      const swaggerMethodInfo = swaggerMethod[method];
-      console.debug(`\tAPI - ${apiName} - ${method}`);
-
-      let parametersString = this.retrieveParameters(swaggerMethodInfo, apiName);
-      let queryParametersDeclaration = this.retrieveQueryParametersDeclaration(swaggerMethodInfo);
-      let queryParameters = this.retrieveQueryParameters(swaggerMethodInfo);
-      let returnTypeString = this.retrieveReturnType(swaggerMethodInfo);
-      if (returnTypeString == null) returnTypeString = 'void';
-      let prepareRequestString = ``; //request = this._handleRequest(request);
-      let haveRequest = swaggerMethodInfo.requestBody != null;
-      let isMultiPart = haveRequest && swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData] != null;
-      let httpOptions = 'httpOptions';
-
-      if (haveRequest && !isMultiPart) {
-        prepareRequestString = `const wrappedRequest = this._handleRequest(request);
-	  `;
-      } else if (isMultiPart) {
-        prepareRequestString = `const wrappedRequest = this._handleMultipart(request);
-	  `;
-        httpOptions = `httpOptionsMultipart`;
-      }
+    this.computeApi();
+    this.generateApi();
 
-      apiMethods +=
-        `
-  public ${apiName.replace('/api/v{version}/', '').replaceAll('/', '_')}(${parametersString}): Observable<${returnTypeString}> {
-    ${queryParametersDeclaration}${prepareRequestString}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${apiName.replace('{version}', '1')}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''}, ${httpOptions})
-      .pipe(
-        map(x => this._handleResponse(x)),
-        catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
-      );
+    this.computeModel();
+    this.generateModel();
+
+    console.info('%c[Swagger Generator] %cSwagger file generated successfully!', 'color: #4CAF50; font-weight: bold;', 'color: #00C853;');
   }
-`;
-    }
 
-    fs.writeFileSync(this._outputDirectory + "/api.autogenerated.ts",
-      `${API_PRE}
-${apiMethods}
-${API_POST}`,
-      { flag: 'w' });
+  computeApi() {
+    this._barApis.start(Object.getOwnPropertyNames(this._swagger.paths).length, 0);
+    for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
+      const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
+      this._barApis.update(index, { message: `Elaborando api... ${apiName}` });
+      const apiSwaggerMethodKey = this._swagger.paths[apiName];
+      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'),
+        method: apiMethod,
+        parameters: this.computeParameters(apiName, apiSwaggerMethod),
+        returnType: this.computeReturnType(apiSwaggerMethod),
+        swaggerMethodKey: apiSwaggerMethodKey,
+        swaggerMethod: apiSwaggerMethod,
+        haveRequest: apiSwaggerMethod.requestBody != null,
+        isMultiPart: apiSwaggerMethod.requestBody != null && apiSwaggerMethod.requestBody.content[contentTypeMultipartFormData] != null,
+      };
+      this._apis.push(apiDto);
+    }
   }
 
-  generateModel() {
+  computeModel() {
+    this._barModels.start(Object.getOwnPropertyNames(this._swagger.paths).length, 0);
+
     let usedTypes: string[] = [];
     let usedMultiPart: string[] = [];
 
     for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
       const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
-      const swaggerMethod = this._swagger.paths[apiName];
-      const method = Object.getOwnPropertyNames(swaggerMethod)[0];
-      const swaggerMethodInfo = swaggerMethod[method];
+      const apiSwaggerMethodKey = this._swagger.paths[apiName];
+      const apiMethod = Object.getOwnPropertyNames(apiSwaggerMethodKey)[0];
+      const apiSwaggerMethod = apiSwaggerMethodKey[apiMethod];
 
-      if (apiName == "/api/v{version}/TicketFile/Create") {
-        debugger
-      }
+      // if (apiName == "/api/v{version}/TicketFile/Create") {
+      //   debugger
+      // }
 
-      let parametersRefType = swaggerMethodInfo.parameters?.filter(x => x.in == 'query' && x.schema?.$ref != null).map(x => x.schema.$ref.replace('#/components/schemas/', ''))
+      let parametersRefType = apiSwaggerMethod.parameters?.filter(x => x.in == 'query' && x.schema?.$ref != null).map(x => x.schema.$ref.replace('#/components/schemas/', ''))
       if (parametersRefType) {
         usedTypes = usedTypes.concat(parametersRefType);
+        this._barModels.update(index, { message: `Elaborando model... ${usedTypes}` });
 
-        if (swaggerMethodInfo.responses[200].content[contentTypeApplicationJson]?.schema.$ref != null) {
-          usedTypes.push(swaggerMethodInfo.responses[200].content[contentTypeApplicationJson].schema.$ref.replace('#/components/schemas/', ''));
+        if (apiSwaggerMethod.responses[200].content[contentTypeApplicationJson]?.schema.$ref != null) {
+          usedTypes.push(apiSwaggerMethod.responses[200].content[contentTypeApplicationJson].schema.$ref.replace('#/components/schemas/', ''));
         }
 
-        if (swaggerMethodInfo.requestBody?.content[contentTypeApplicationJson]?.schema?.$ref) {
-          usedTypes.push(swaggerMethodInfo.requestBody?.content[contentTypeApplicationJson]?.schema?.$ref.replace('#/components/schemas/', ''));
+        if (apiSwaggerMethod.requestBody?.content[contentTypeApplicationJson]?.schema?.$ref) {
+          usedTypes.push(apiSwaggerMethod.requestBody?.content[contentTypeApplicationJson]?.schema?.$ref.replace('#/components/schemas/', ''));
         }
 
-        if (swaggerMethodInfo.requestBody?.content[contentTypeMultipartFormData]?.schema != null) {
+        if (apiSwaggerMethod.requestBody?.content[contentTypeMultipartFormData]?.schema != null) {
           usedMultiPart.push(apiName);
         }
       }
@@ -104,14 +128,6 @@ ${API_POST}`,
 
     usedTypes = [...new Set(usedTypes.map(item => item))]; // [ 'A', 'B']
 
-    // usedTypes = usedTypes.filter((value, index, array) => {
-    // 	array.indexOf(value) === index;
-    // });
-    // usedTypes.forEach(element => {
-    // 	console.debug(element);
-    // });
-
-    console.debug(`Start autogeneration Models`);
     let models = ``;
     if (this._swagger.components != null
       && this._swagger.components != undefined
@@ -121,29 +137,22 @@ ${API_POST}`,
       for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.components.schemas).length; index++) {
         const modelName = Object.getOwnPropertyNames(this._swagger.components.schemas)[index];
 
-        if (modelName == 'ActivatedVoucherSnackListResponse') {
-          console.debug("ActivatedVoucherSnackListResponse");
-        }
-
         if (usedTypes.indexOf(modelName) < 0) {
-          console.debug(`\tModel SKIP - ${modelName}`);
+          // console.debug(`\tModel SKIP - ${modelName}`);
           continue
         };
 
-        const swaggerCopmponent = this._swagger.components.schemas[modelName];
-
-        console.debug(`\tModel - ${modelName}`);
+        const swaggerComponent = this._swagger.components.schemas[modelName];
 
-        let type = swaggerCopmponent.type == 'integer' ? 'enum' : 'class';
-        let content = this.retrieveObjectContent(modelName, swaggerCopmponent);
-
-        models +=
-          `
-export ${type} ${modelName} {${content}
-}
-`;
+        // console.debug(`\tModel - ${modelName}`);
+        this._models.push({
+          modelType: swaggerComponent.type == 'integer' ? 'enum' : 'class',
+          name: modelName,
+          properties: (swaggerComponent.type == 'object') ? this.retrieveComponentProperties(swaggerComponent) : [],
+          enumValues: (swaggerComponent.type == 'integer') ? this.retrieveEnumValues(modelName, swaggerComponent) : [],
+        });
       }
-      
+
     }
 
     usedMultiPart.forEach(apiName => {
@@ -151,139 +160,144 @@ export ${type} ${modelName} {${content}
       const method = Object.getOwnPropertyNames(swaggerMethod)[0];
       const swaggerMethodInfo = swaggerMethod[method];
 
-      let type = 'class';
-      let modelName = this.getModelNameByApi(apiName);
-      let content = this.retrieveSchemaProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema);
-      models +=
-        `
-export ${type} ${modelName} {${content}
-}
-`;
+      this._models.push({
+        modelType: 'class',
+        name: this.getApiNameNormalized(apiName),
+        properties: this.retrieveComponentProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema),
+        enumValues: [],
+      });
     });
-
-    fs.writeFileSync(this._outputDirectory + "/model.autogenerated.ts",
-      `${MODEL_PRE}
-${models}
-${MODEL_POST}`,
-      { flag: 'w' });
   }
 
-  retrieveParameters(swaggerMethodInfo: SwaggerMethod, apiName: string) {
-    if (swaggerMethodInfo.requestBody != null && swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData] != null) {
-      var modelName = this.getModelNameByApi(apiName);
-      return `request: Models.${modelName}`;
-    } else {
-      if (swaggerMethodInfo.requestBody != null) {
-        return `request: Models.${swaggerMethodInfo.requestBody.content[contentTypeApplicationJson].schema.$ref.replace('#/components/schemas/', '')}`
-      }
-
-      let parameters = ``;
-      swaggerMethodInfo.parameters?.filter(x => x.in == 'query').forEach(parameter => {
-        if (parameter.schema.$ref != null) {
-          parameters += `${this.toFirstLetterLowercase(parameter.name)}: Models.${parameter.schema.$ref.replace('#/components/schemas/', '')}, `;
-        } else {
-          const nativeType = this.getNativeType(parameter.schema);
-          const nullable = !parameter.required ? '?' : '';
-          parameters += `${this.toFirstLetterLowercase(parameter.name)}${nullable}: ${nativeType}, `;
-        }
-      });
+  generateApi() {
+    this._barApis.update(this._apis.length, { message: `Inizio scrittura api...` });
+
+    if (this._outputFormat == 'angular') {
+      const apiWriter = new ApiAngularWriter(this._outputDirectory);
+      apiWriter.write(this._apis);
+    } else if (this._outputFormat == 'next') {
+      const apiWriter = new ApiNextJsWriter(this._outputDirectory);
+      apiWriter.write(this._apis);
+    }
 
-      if (parameters.length > 2)
-        parameters = parameters.substring(0, parameters.length - 2);
+    this._barApis.update(this._apis.length, { message: `Scrittura api completata` });
 
-      return parameters;
-    }
+    this._barApis.stop();
   }
 
-  retrieveQueryParametersDeclaration(swaggerMethodInfo: SwaggerMethod) {
-    if (swaggerMethodInfo.requestBody != null) return ``;
 
-    let filteredParameters = swaggerMethodInfo.parameters?.filter(x => x.in == 'query');
-    if (filteredParameters == null || filteredParameters == undefined || filteredParameters.length == 0) return ``;
-
-    let parameters = ``;
-    filteredParameters.forEach(parameter => {
-      if (parameter.schema.$ref != null) {
-        if (this.isEnum(parameter.schema.$ref) != null) {
-          parameters += this.retrieveQueryParametersDeclarationStatement(parameter);
-        } else {
-          throw new Error("retrieveQueryParameters unmanaged parameter.schema.$ref");
-        }
-      } else {
-        parameters += this.retrieveQueryParametersDeclarationStatement(parameter);
-      }
-    });
-
-    // if (parameters.length > 2)
-    //   parameters = parameters.substring(0, parameters.length - 1);
+  generateModel() {
+    this._barModels.update(this._apis.length, { message: `Inizio scrittura model...` });
+
+    if (this._outputFormat == 'angular') {
+      const apiWriter = new ModelAngularWriter(this._outputDirectory);
+      apiWriter.write(this._models);
+    } else if (this._outputFormat == 'next') {
+      const apiWriter = new ModelNextJsWriter(this._outputDirectory);
+      apiWriter.write(this._models);
+    }
 
-    return parameters;
-  }
+    this._barModels.update(this._apis.length, { message: `Scrittura model completata` });
 
-  retrieveQueryParametersDeclarationStatement(parameter: SwaggerParameter) {
-    let paramName = this.toFirstLetterLowercase(parameter.name);
-    if (!parameter.required) {
-      if (this.isDate(parameter.schema)) {
-        return `let ${paramName}Param: string = ${paramName} != null && ${paramName} != undefined && ${paramName}.isValid() ? encodeURIComponent(this._momentToString(${paramName})) : '';
-    `;
-      } else {
-        return `let ${paramName}Param: string = ${paramName} != null && ${paramName} != undefined ? encodeURIComponent('' + ${paramName}) : '';
-    `;
-      }
-    } else {
-      if (this.isDate(parameter.schema)) {
-        return `let ${paramName}Param: string = encodeURIComponent(this._momentToString(${paramName}));
-    `;
-      } else {
-        return `let ${paramName}Param: string = encodeURIComponent('' + ${paramName});
-    `;
-      }
-    }
+    this._barModels.stop();
   }
 
-  retrieveQueryParameters(swaggerMethodInfo: SwaggerMethod) {
-    if (swaggerMethodInfo.requestBody != null) return ``;
+  computeParameters(apiName: string, swaggerMethod: SwaggerMethod | undefined) {
+    if (!apiName) return [];
+    if (!swaggerMethod || swaggerMethod == null) return [];
 
-    let filteredParameters = swaggerMethodInfo.parameters?.filter(x => x.in == 'query');
-    if (filteredParameters == null || filteredParameters == undefined || filteredParameters.length == 0) return ``;
+    let parameters: ParameterDto[] = [];
 
-    let parameters = `?`;
-    filteredParameters.forEach(parameter => {
-      if (parameter.schema.$ref != null) {
-        if (this.isEnum(parameter.schema.$ref) != null) {
-          parameters += `${this.toFirstLetterLowercase(parameter.name)}=\${` + this.toFirstLetterLowercase(parameter.name) + `Param}&`;;
-        } else {
-          throw new Error("retrieveQueryParameters unmanaged parameter.schema.$ref");
-        }
+    if (swaggerMethod.requestBody != null && swaggerMethod.requestBody.content[contentTypeMultipartFormData] != null) {
+      var modelName = this.getApiNameNormalized(apiName);
+      parameters.push({
+        name: 'request',
+        typeName: modelName,
+        nullable: false,
+        isQuery: false,
+        isEnum: false,
+      });
+    } else {
+      if (swaggerMethod.requestBody != null) {
+        parameters.push({
+          name: 'request',
+          typeName: swaggerMethod.requestBody.content[contentTypeApplicationJson].schema.$ref.replace('#/components/schemas/', ''),
+          nullable: false,
+          isQuery: false,
+          isEnum: false,
+        });
       } else {
-        parameters += `${this.toFirstLetterLowercase(parameter.name)}=\${` + this.toFirstLetterLowercase(parameter.name) + `Param}&`;
+        swaggerMethod.parameters?.filter(x => x.in == 'query').forEach(parameter => {
+          if (parameter.schema.$ref != null) {
+            parameters.push({
+              name: this.toFirstLetterLowercase(parameter.name),
+              typeName: parameter.schema.$ref.replace('#/components/schemas/', ''),
+              nullable: !parameter.required,
+              swaggerParameter: parameter,
+              isQuery: true,
+              isEnum: this.isEnum(parameter.schema.$ref),
+            });
+          } else {
+            parameters.push({
+              name: this.toFirstLetterLowercase(parameter.name),
+              typeName: this.getNativeType(parameter.schema),
+              nullable: !parameter.required,
+              swaggerParameter: parameter,
+              isQuery: true,
+              isEnum: false,
+            });
+          }
+        });
       }
-    });
-
-    if (parameters.length > 1)
-      parameters = parameters.substring(0, parameters.length - 1);
-
+    }
     return parameters;
   }
 
-  retrieveReturnType(swaggerMethodInfo: SwaggerMethod) {
-    if (swaggerMethodInfo.responses[200] == null)
-      return 'void';
+  computeReturnType(swaggerMethod: SwaggerMethod) {
+    if (swaggerMethod.responses[200] == null) {
+      return <TypeDto>{
+        typeName: 'void',
+        nullable: false,
+      }
+    }
 
     try {
-      if (swaggerMethodInfo.responses[200].content[contentTypeApplicationJson].schema.$ref != null)
-        return `Models.${this.getObjectName(swaggerMethodInfo.responses[200]?.content[contentTypeApplicationJson].schema.$ref)}`;
+      if (swaggerMethod.responses[200].content[contentTypeApplicationJson].schema.$ref != null)
+        return <TypeDto>{
+          typeName: this.getObjectName(swaggerMethod.responses[200]?.content[contentTypeApplicationJson].schema.$ref),
+          nullable: false,
+        };
     } catch (error) {
       const errorMessage = "\t\tAttenzione forse hai dimenticato IActionResult e non hai tipizzato il tipo restituito dal servizio";
       console.error(`%c${errorMessage}`, 'color: red');
       throw new Error(errorMessage);
     }
 
-    if (swaggerMethodInfo.responses[200]?.content[contentTypeApplicationJson].schema.type != null)
-      return this.getNativeType(swaggerMethodInfo.responses[200]?.content[contentTypeApplicationJson].schema);
+    if (swaggerMethod.responses[200]?.content[contentTypeApplicationJson].schema.type != null) {
+      let schema = swaggerMethod.responses[200]?.content[contentTypeApplicationJson].schema;
+      if (schema.type == 'array') {
+        if (schema.items.$ref != null) {
+          return <TypeDto>{
+            typeName: `${this.getObjectName(schema.items.$ref)}[]`,
+            nullable: false,
+          };
+        }
+      } else {
+        return <TypeDto>{
+          typeName: this.getNativeType(swaggerMethod.responses[200]?.content[contentTypeApplicationJson].schema),
+          nullable: false,
+        };
+      }
+      // if (swaggerComponentProperty.items.$ref != null)
+      //   return `${this.getObjectName(swaggerComponentProperty.items.$ref)}[]`;
+
 
-    console.error("unmanaged swaggerMethodInfo", swaggerMethodInfo);
-    throw new Error("unmanaged swaggerMethodInfo");
+    } else {
+      return <TypeDto>{
+        typeName: this.getNativeType(swaggerMethod.responses[200]?.content[contentTypeApplicationJson].schema),
+        nullable: false,
+      };
+    }
   }
 
   retrieveType(swaggerComponentProperty: SwaggerComponentProperty) {
@@ -329,54 +343,48 @@ ${MODEL_POST}`,
     return ref.replace('#/components/schemas/', '');
   }
 
-  retrieveObjectContent(name: string, swaggerComponent: SwaggerComponent) {
-    if (swaggerComponent.type == 'object')
-      return this.retrieveComponentProperties(swaggerComponent);
-    else if (swaggerComponent.type == 'integer')
-      return this.retrieveEnumValues(name, swaggerComponent);
-  }
+  retrieveComponentProperties(swaggerCopmponent: SwaggerComponent | SwaggerSchema) {
+    if (swaggerCopmponent.properties == null) return [];
 
-  retrieveComponentProperties(swaggerCopmponent: SwaggerComponent) {
-    if (swaggerCopmponent.properties == null) return ``;
-
-    let properties = ``;
+    let properties: PropertyDto[] = [];
     for (let index = 0; index < Object.getOwnPropertyNames(swaggerCopmponent.properties).length; index++) {
       const propertyName = Object.getOwnPropertyNames(swaggerCopmponent.properties)[index];
-      properties +=
-        `
-  ${propertyName}: ${this.retrieveType(swaggerCopmponent.properties[propertyName])} | undefined;`
+      properties.push({
+        name: propertyName,
+        typeName: this.retrieveType(swaggerCopmponent.properties[propertyName]),
+        nullable: true,
+      });
     }
 
     return properties;
   }
 
-  retrieveSchemaProperties(schema: SwaggerSchema) {
-    if (schema.properties == null) return ``;
+  // retrieveSchemaProperties(schema: SwaggerSchema) {
+  //   if (schema.properties == null) return [];
 
-    let properties = ``;
-    for (let j = 0; j < Object.getOwnPropertyNames(schema.properties).length; j++) {
-      let propertyName = Object.getOwnPropertyNames(schema.properties)[j];
-      properties +=
-        `
-  ${this.toFirstLetterLowercase(propertyName)}: ${this.retrieveType(schema.properties[propertyName])} | undefined;`
-    }
+  //   let properties: PropertyDto[] = [];
+  //   for (let j = 0; j < Object.getOwnPropertyNames(schema.properties).length; j++) {
+  //     let propertyName = Object.getOwnPropertyNames(schema.properties)[j];
+  //     properties +=
+  //       `
+  // ${this.toFirstLetterLowercase(propertyName)}: ${this.retrieveType(schema.properties[propertyName])} | undefined;`
+  //   }
 
-    return properties;
-  }
+  //   return properties;
+  // }
 
   retrieveEnumValues(name: string, swaggerCopmponent: SwaggerComponent) {
-    if (swaggerCopmponent.enum == null) return ``;
+    if (swaggerCopmponent.enum == null) return [];
 
-    let properties = ``;
+    let values: EnumValueDto[] = [];
     for (let index = 0; index < swaggerCopmponent.enum.length; index++) {
-      const name = swaggerCopmponent.enum[index].split('-')[0].trim();
-      const value = swaggerCopmponent.enum[index].split('-')[1].trim();
-      properties +=
-        `
-  ${name} = ${value},`;
+      values.push({
+        name: swaggerCopmponent.enum[index].split('-')[0].trim(),
+        value: swaggerCopmponent.enum[index].split('-')[1].trim(),
+      });
     }
 
-    return properties;
+    return values;
   }
 
   retrieveNestedObjects(usedTypes: string[]) {
@@ -411,13 +419,15 @@ ${MODEL_POST}`,
   getNativeType(schema: SwaggerSchema): string {
     let nativeType = 'n.d.';
 
-    if (schema.type == 'array') {
+    if (schema.$ref != null) {
+      debugger
+    } else if (schema.type == 'array') {
       nativeType = this.getNativeType(schema.items);
       nativeType += '[]';
     } else {
       if (schema.type == 'integer') nativeType = 'number';
       if (schema.type == 'string' && schema.format == null) nativeType = 'string';
-      if (schema.type == 'string' && schema.format == 'date-time') nativeType = 'moment.Moment';
+      if (schema.type == 'string' && schema.format == 'date-time') nativeType = this._dateLibrary == 'moment' ? 'moment.Moment' : 'Date';
       if (schema.type == 'string' && schema.format == 'uuid') nativeType = 'string';
       if (schema.type == 'string' && schema.format == 'binary') nativeType = 'File';
       if (schema.type == 'number') nativeType = 'number';
@@ -433,8 +443,13 @@ ${MODEL_POST}`,
     }
   }
 
-  getModelNameByApi(apiName: string) {
-    return apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+  getApiNameNormalized(apiName: string) {
+    let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+
+    if (normalizedApiName.charAt(0) == '_') {
+      normalizedApiName = normalizedApiName.slice(1);
+    }
+    return this.toFirstLetterLowercase(normalizedApiName);
   }
 
   toFirstLetterLowercase(value: string) {