@devlearning/swagger-generator 1.1.21 → 1.1.22

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

@@ -1,188 +1,188 @@
-import fs from 'fs';
-import { API_POST, API_PRE } from './constants.js';
-import { ApiDto } from '../../models/api-dto.js';
-import { Utils } from '../utils.js';
-import { ParameterDto } from '../../models/parameter-dto.js';
-import { Normalizator } from './normalizator.js';
-import { CommandLineArgs } from '@src/index.js';
-
-export class ApiAngularWriter {
-  private _commandLineArgs: CommandLineArgs;
-
-  constructor(commandLineArgs: CommandLineArgs) {
-    this._commandLineArgs = commandLineArgs;
-  }
-
-  write(apis: ApiDto[]) {
-    let apiString = '';
-
-    apis.forEach(api => {
-      apiString += this._apiString(api);
-    });
-
-
-    this._writeFile(apiString);
-  }
-
-  private _apiString(api: ApiDto) {
-
-    let apiNameNormalized = Utils.getNormalizedApiPathAngular(api.name);
-
-    let parametersString = this._parameters(api);
-    let queryParametersPreparation = this._queryParametersPreparation(api);
-    let requestPreparation = this._requestPreparation(api);
-    let queryParameters = this._queryParameters(api);
-    let returnTypeString = this._returnType(api);
-    let haveRequest = api.haveRequest;
-    let method = api.method.toLowerCase();
-    let httpOptions = api.isMultiPart ? 'httpOptionsMultipart' : 'httpOptions';
-
-    if (apiNameNormalized.includes('TicketFile')) {
-      debugger
-    }
-
-    let apiString = `
-  public ${apiNameNormalized}(${parametersString}): Observable<${returnTypeString}> {
-    ${queryParametersPreparation}${requestPreparation}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${api.url}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''}, ${httpOptions})
-      .pipe(
-        map(x => this._handleResponse(x)),
-        catchError((err, obs) => this._handleError(err, obs, skipErrorHandling))
-      );
-  }
-`;
-
-    return apiString;
-  }
-
-  private _parameters(api: ApiDto) {
-    let parametersString = '';
-
-    api.parameters.forEach(parameter => {
-      const libraryDate = 'moment.Moment';
-      const prefixType = parameter.isEnum || !parameter.isNativeType ? 'Models.' : '';
-      const typeName = parameter.typeName === 'dateTime' ? libraryDate : `${prefixType}${Normalizator.mapTsTypeToAngular(parameter.typeName)}`;
-
-      parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${typeName}, `;
-    });
-
-    parametersString += 'skipErrorHandling: boolean = false, ';
-
-    if (api.parameters.length > 0)
-      parametersString = parametersString.substring(0, parametersString.length - 2);
-
-    return parametersString;
-  }
-
-  private _returnType(api: ApiDto) {
-    const prefixType = !api.returnType?.isNativeType ? 'Models.' : '';
-    const isArray = api.returnType?.isArray ? '[]' : '';
-    return api.returnType ? `${prefixType}${Normalizator.mapTsTypeToAngular(api.returnType.typeName)}${isArray}` : 'any';
-  }
-
-  private _queryParametersPreparation(api: ApiDto) {
-    let queryParametersPreparation = '';
-
-    api.parameters.forEach(parameter => {
-      if (parameter.isQuery) {
-        queryParametersPreparation += this._queryParametersPreparationStatement(parameter);
-      }
-    });
-
-    return queryParametersPreparation
-  }
-
-  private _queryParametersPreparationStatement(parameter: ParameterDto) {
-    if (parameter.nullable) {
-      if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-        return `let ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined && ${parameter.name}.isValid() ? encodeURIComponent(this._momentToString(${parameter.name})) : '';
-      `;
-      } else {
-        return `let ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined ? encodeURIComponent('' + ${parameter.name}) : '';
-      `;
-      }
-    } else {
-      if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-        return `let ${parameter.name}Param: string = encodeURIComponent(this._momentToString(${parameter.name}));
-      `;
-      } else {
-        return `let ${parameter.name}Param: string = encodeURIComponent('' + ${parameter.name});
-      `;
-      }
-    }
-  }
-
-  private _queryParameters(api: ApiDto) {
-    let queryParameters = '';
-
-    api.parameters.forEach(parameter => {
-      if (parameter.isQuery) {
-        queryParameters += this._queryParametersStatement(parameter);
-      }
-    });
-
-    if (queryParameters.length > 0) {
-      queryParameters = '?' + queryParameters.substring(0, queryParameters.length - 1);
-    }
-
-    return queryParameters;
-  }
-
-  private _queryParametersStatement(parameter: ParameterDto) {
-    if (parameter.swaggerParameter == null) return '';
-
-    if (!parameter.isQuery) return '';
-
-    return `${parameter.name}=\${${parameter.name}Param}&`;
-  }
-
-  private _requestPreparation(api: ApiDto) {
-    if (!api.haveRequest) {
-      return '';
-    }
-
-    if (api.isMultiPart) {
-      return `let wrappedRequest = this._handleMultipart(request);
-    `;
-    } else {
-      return `let wrappedRequest = this._handleRequest(request);
-    `;
-    }
-  }
-
-  private _writeFile(apis: string) {
-    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>;
-`;
-  }
+import fs from 'fs';
+import { API_POST, API_PRE } from './constants.js';
+import { ApiDto } from '../../models/api-dto.js';
+import { Utils } from '../utils.js';
+import { ParameterDto } from '../../models/parameter-dto.js';
+import { Normalizator } from './normalizator.js';
+import { CommandLineArgs } from '@src/index.js';
+
+export class ApiAngularWriter {
+  private _commandLineArgs: CommandLineArgs;
+
+  constructor(commandLineArgs: CommandLineArgs) {
+    this._commandLineArgs = commandLineArgs;
+  }
+
+  write(apis: ApiDto[]) {
+    let apiString = '';
+
+    apis.forEach(api => {
+      apiString += this._apiString(api);
+    });
+
+
+    this._writeFile(apiString);
+  }
+
+  private _apiString(api: ApiDto) {
+
+    let apiNameNormalized = Utils.getNormalizedApiPathAngular(api.name);
+
+    let parametersString = this._parameters(api);
+    let queryParametersPreparation = this._queryParametersPreparation(api);
+    let requestPreparation = this._requestPreparation(api);
+    let queryParameters = this._queryParameters(api);
+    let returnTypeString = this._returnType(api);
+    let haveRequest = api.haveRequest;
+    let method = api.method.toLowerCase();
+    let httpOptions = api.isMultiPart ? 'httpOptionsMultipart' : 'httpOptions';
+
+    if (apiNameNormalized.includes('TicketFile')) {
+      debugger
+    }
+
+    let apiString = `
+  public ${apiNameNormalized}(${parametersString}): Observable<${returnTypeString}> {
+    ${queryParametersPreparation}${requestPreparation}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${api.url}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''}, ${httpOptions})
+      .pipe(
+        map(x => this._handleResponse(x)),
+        catchError((err, obs) => this._handleError(err, obs, skipErrorHandling))
+      );
+  }
+`;
+
+    return apiString;
+  }
+
+  private _parameters(api: ApiDto) {
+    let parametersString = '';
+
+    api.parameters.forEach(parameter => {
+      const libraryDate = 'moment.Moment';
+      const prefixType = parameter.isEnum || !parameter.isNativeType ? 'Models.' : '';
+      const typeName = parameter.typeName === 'dateTime' ? libraryDate : `${prefixType}${Normalizator.mapTsTypeToAngular(parameter.typeName)}`;
+
+      parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${typeName}, `;
+    });
+
+    parametersString += 'skipErrorHandling: boolean = false, ';
+
+    if (api.parameters.length > 0)
+      parametersString = parametersString.substring(0, parametersString.length - 2);
+
+    return parametersString;
+  }
+
+  private _returnType(api: ApiDto) {
+    const prefixType = !api.returnType?.isNativeType ? 'Models.' : '';
+    const isArray = api.returnType?.isArray ? '[]' : '';
+    return api.returnType ? `${prefixType}${Normalizator.mapTsTypeToAngular(api.returnType.typeName)}${isArray}` : 'any';
+  }
+
+  private _queryParametersPreparation(api: ApiDto) {
+    let queryParametersPreparation = '';
+
+    api.parameters.forEach(parameter => {
+      if (parameter.isQuery) {
+        queryParametersPreparation += this._queryParametersPreparationStatement(parameter);
+      }
+    });
+
+    return queryParametersPreparation
+  }
+
+  private _queryParametersPreparationStatement(parameter: ParameterDto) {
+    if (parameter.nullable) {
+      if (Utils.isDate(parameter.swaggerParameter?.schema)) {
+        return `let ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined && ${parameter.name}.isValid() ? encodeURIComponent(this._momentToString(${parameter.name})) : '';
+      `;
+      } else {
+        return `let ${parameter.name}Param: string = ${parameter.name} != null && ${parameter.name} != undefined ? encodeURIComponent('' + ${parameter.name}) : '';
+      `;
+      }
+    } else {
+      if (Utils.isDate(parameter.swaggerParameter?.schema)) {
+        return `let ${parameter.name}Param: string = encodeURIComponent(this._momentToString(${parameter.name}));
+      `;
+      } else {
+        return `let ${parameter.name}Param: string = encodeURIComponent('' + ${parameter.name});
+      `;
+      }
+    }
+  }
+
+  private _queryParameters(api: ApiDto) {
+    let queryParameters = '';
+
+    api.parameters.forEach(parameter => {
+      if (parameter.isQuery) {
+        queryParameters += this._queryParametersStatement(parameter);
+      }
+    });
+
+    if (queryParameters.length > 0) {
+      queryParameters = '?' + queryParameters.substring(0, queryParameters.length - 1);
+    }
+
+    return queryParameters;
+  }
+
+  private _queryParametersStatement(parameter: ParameterDto) {
+    if (parameter.swaggerParameter == null) return '';
+
+    if (!parameter.isQuery) return '';
+
+    return `${parameter.name}=\${${parameter.name}Param}&`;
+  }
+
+  private _requestPreparation(api: ApiDto) {
+    if (!api.haveRequest) {
+      return '';
+    }
+
+    if (api.isMultiPart) {
+      return `let wrappedRequest = this._handleMultipart(request);
+    `;
+    } else {
+      return `let wrappedRequest = this._handleRequest(request);
+    `;
+    }
+  }
+
+  private _writeFile(apis: string) {
+    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/constants.ts

@@ -1,36 +1,36 @@
-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<T>(error: any, obs: Observable<T>, skipErrorHandling: boolean): Observable<never>;
-`;
-
-export const API_POST =
-  `}`;
-
-
-export const MODEL_PRE =
-  `import * as moment from 'moment';
-  `;
-
-export const MODEL_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<T>(error: any, obs: Observable<T>, skipErrorHandling: boolean): Observable<never>;
+`;
+
+export const API_POST =
+  `}`;
+
+
+export const MODEL_PRE =
+  `import * as moment from 'moment';
+  `;
+
+export const MODEL_POST =
+  `
+`;

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

@@ -1,66 +1,66 @@
-import fs from 'fs';
-import { MODEL_POST, MODEL_PRE } from './constants.js';
-import { ModelDto } from '../../models/model-dto.js';
-import { Normalizator } from './normalizator.js';
-import { Utils } from '../utils.js';
-
-export class ModelAngularWriter {
-  private _outputDirectory: string;
-
-  constructor(_outputDirectory: string) {
-    this._outputDirectory = _outputDirectory;
-  }
-
-  write(models: ModelDto[]) {
-    let modelString = '';
-
-    models.forEach(model => {
-      modelString += this._modelString(model);
-    });
-
-
-    this._writeFile(modelString);
-  }
-
-  private _modelString(model: ModelDto) {
-    let modelString = `
-export ${model.modelType} ${Utils.toPascalCase(model.name)} {
-${this._properties(model)}${this._enumValues(model)}
-}
-`;
-
-    return modelString;
-  }
-
-  private _properties(model: ModelDto) {
-    let propertiesString = '';
-
-    model.properties.forEach(property => {
-      //const libraryDate = this._commandLineArgs.dateTimeLibrary == DateTimeLibrary.Moment ? 'moment.Moment' : 'Date'
-      const libraryDate = 'moment.Moment';
-      const isArray = property.isArray ? '[]' : '';
-      const typeName = property.typeName === 'dateTime' ? libraryDate : Normalizator.mapTsTypeToAngular(property.typeName);
-      propertiesString += `  ${Utils.toFirstLetterLowercase(property.name)}${property.nullable ? '?' : ''}: ${typeName}${isArray};\n`;
-    });
-
-    return propertiesString.trimEnd();
-  }
-
-  private _enumValues(model: ModelDto) {
-    let enumValuesString = '';
-
-    model.enumValues.forEach(enumValue => {
-      enumValuesString += `  ${enumValue.name} = ${enumValue.value},\n`;
-    });
-
-    return enumValuesString.trimEnd();
-  }
-
-  private _writeFile(models: string) {
-    fs.writeFileSync(this._outputDirectory + "/model.autogenerated.ts",
-      `${MODEL_PRE}
-  ${models}
-  ${MODEL_POST}`,
-      { flag: 'w' });
-  }
+import fs from 'fs';
+import { MODEL_POST, MODEL_PRE } from './constants.js';
+import { ModelDto } from '../../models/model-dto.js';
+import { Normalizator } from './normalizator.js';
+import { Utils } from '../utils.js';
+
+export class ModelAngularWriter {
+  private _outputDirectory: string;
+
+  constructor(_outputDirectory: string) {
+    this._outputDirectory = _outputDirectory;
+  }
+
+  write(models: ModelDto[]) {
+    let modelString = '';
+
+    models.forEach(model => {
+      modelString += this._modelString(model);
+    });
+
+
+    this._writeFile(modelString);
+  }
+
+  private _modelString(model: ModelDto) {
+    let modelString = `
+export ${model.modelType} ${Utils.toPascalCase(model.name)} {
+${this._properties(model)}${this._enumValues(model)}
+}
+`;
+
+    return modelString;
+  }
+
+  private _properties(model: ModelDto) {
+    let propertiesString = '';
+
+    model.properties.forEach(property => {
+      //const libraryDate = this._commandLineArgs.dateTimeLibrary == DateTimeLibrary.Moment ? 'moment.Moment' : 'Date'
+      const libraryDate = 'moment.Moment';
+      const isArray = property.isArray ? '[]' : '';
+      const typeName = property.typeName === 'dateTime' ? libraryDate : Normalizator.mapTsTypeToAngular(property.typeName);
+      propertiesString += `  ${Utils.toFirstLetterLowercase(property.name)}${property.nullable ? '?' : ''}: ${typeName}${isArray};\n`;
+    });
+
+    return propertiesString.trimEnd();
+  }
+
+  private _enumValues(model: ModelDto) {
+    let enumValuesString = '';
+
+    model.enumValues.forEach(enumValue => {
+      enumValuesString += `  ${enumValue.name} = ${enumValue.value},\n`;
+    });
+
+    return enumValuesString.trimEnd();
+  }
+
+  private _writeFile(models: string) {
+    fs.writeFileSync(this._outputDirectory + "/model.autogenerated.ts",
+      `${MODEL_PRE}
+  ${models}
+  ${MODEL_POST}`,
+      { flag: 'w' });
+  }
 }

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

@@ -1,42 +1,42 @@
-import { Utils } from "../utils.js";
-
-export class Normalizator {
-
-  public static mapTsTypeToAngular(type: string): string {
-    const normalized: string = type.trim().toLowerCase();
-
-    if (normalized.endsWith("[]")) {
-      const inner: string = normalized.slice(0, -2).trim();
-      return `${Normalizator.mapTsTypeToAngular(inner)}[]`;
-    }
-
-    switch (normalized) {
-      case "string":
-      case "uuid":
-        return "string";
-      case "date":
-      case "datetime":
-        return "datetime";
-      case "number":
-      case "float":
-      case "double":
-      case "integer":
-      case "int":
-      case "long":
-        return "number";
-      case "boolean":
-      case "bool":
-        return "boolean";
-      case "any":
-      case "object":
-        return "any";
-      case "null":
-        return "null";
-      case "undefined":
-        return "undefined";
-      default:
-        return Utils.toPascalCase(type);
-    }
-  }
-
+import { Utils } from "../utils.js";
+
+export class Normalizator {
+
+  public static mapTsTypeToAngular(type: string): string {
+    const normalized: string = type.trim().toLowerCase();
+
+    if (normalized.endsWith("[]")) {
+      const inner: string = normalized.slice(0, -2).trim();
+      return `${Normalizator.mapTsTypeToAngular(inner)}[]`;
+    }
+
+    switch (normalized) {
+      case "string":
+      case "uuid":
+        return "string";
+      case "date":
+      case "datetime":
+        return "datetime";
+      case "number":
+      case "float":
+      case "double":
+      case "integer":
+      case "int":
+      case "long":
+        return "number";
+      case "boolean":
+      case "bool":
+        return "boolean";
+      case "any":
+      case "object":
+        return "any";
+      case "null":
+        return "null";
+      case "undefined":
+        return "undefined";
+      default:
+        return Utils.toPascalCase(type);
+    }
+  }
+
 }