@devlearning/swagger-generator 1.1.16 → 1.1.17

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

@@ -1,158 +1,158 @@
-import fs from 'fs';
-import { 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 { CommandLineArgs } from '../../index.js';
-
-export class ApiNextJsWriter {
-  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.toCamelCase(Utils.getNormalizedApiPathDart(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';
-    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;
-}
-`;
-
-    return apiString;
-  }
-
-  private _parameters(api: ApiDto) {
-    let parametersString = '';
-
-    api.parameters.forEach(parameter => {
-      parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${!parameter.isNativeType ? 'Models.' : ''}${parameter.typeName}, `;
-    });
-
-    if (api.parameters.length > 0)
-      parametersString = parametersString.substring(0, parametersString.length - 2);
-
-    return parametersString;
-  }
-
-  private _returnType(api: ApiDto) {
-    return api.returnType ? `${!api.returnType.isNativeType ? 'Models.' : ''}${api.returnType.typeName}` : '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 `  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}) : '';
-`;
-      }
-    } else {
-      if (Utils.isDate(parameter.swaggerParameter?.schema)) {
-        return `  const ${parameter.name}Param: string = encodeURIComponent(dateToZulu(${parameter.name}));
-`;
-      } else {
-        return `  const ${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}&`;
-    // if (parameter.isEnum) {
-    //   return `${parameter.name}=\${` + parameter.name + `Param}&`;
-    // } else {
-    //   return `${parameter.name}=\${` + parameter.name + `}&`;
-    // }
-    // if (parameter.swaggerParameter.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");
-    //   }
-    // } else {
-    //   parameters += `${this.toFirstLetterLowercase(parameter.name)}=\${` + this.toFirstLetterLowercase(parameter.name) + `Param}&`;
-    // }
-    // let paramName = Utils.toFirstLetterLowercase(parameter.name);
-    // return `${parameter.swaggerParameter?.name}=\${${paramName}Param}&`;
-  }
-
-  private _requestPreparation(api: ApiDto) {
-    if (!api.haveRequest) {
-      return ``;
-    }
-
-    return `  const wrappedRequest = handleRequest(request);
-`;
-  }
-
-
-
-  private _writeFile(apis: string) {
-    fs.writeFileSync(this._commandLineArgs.outputDirectory + "/api.autogenerated.ts",
-      `${API_PRE}
-${apis}`,
-      { flag: 'w' });
-  }
+import fs from 'fs';
+import { 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 { CommandLineArgs } from '../../index.js';
+
+export class ApiNextJsWriter {
+  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.toCamelCase(Utils.getNormalizedApiPathDart(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';
+    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;
+}
+`;
+
+    return apiString;
+  }
+
+  private _parameters(api: ApiDto) {
+    let parametersString = '';
+
+    api.parameters.forEach(parameter => {
+      parametersString += `${parameter.name}${parameter.nullable ? '?' : ''}: ${!parameter.isNativeType ? 'Models.' : ''}${parameter.typeName}, `;
+    });
+
+    if (api.parameters.length > 0)
+      parametersString = parametersString.substring(0, parametersString.length - 2);
+
+    return parametersString;
+  }
+
+  private _returnType(api: ApiDto) {
+    return api.returnType ? `${!api.returnType.isNativeType ? 'Models.' : ''}${api.returnType.typeName}` : '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 `  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}) : '';
+`;
+      }
+    } else {
+      if (Utils.isDate(parameter.swaggerParameter?.schema)) {
+        return `  const ${parameter.name}Param: string = encodeURIComponent(dateToZulu(${parameter.name}));
+`;
+      } else {
+        return `  const ${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}&`;
+    // if (parameter.isEnum) {
+    //   return `${parameter.name}=\${` + parameter.name + `Param}&`;
+    // } else {
+    //   return `${parameter.name}=\${` + parameter.name + `}&`;
+    // }
+    // if (parameter.swaggerParameter.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");
+    //   }
+    // } else {
+    //   parameters += `${this.toFirstLetterLowercase(parameter.name)}=\${` + this.toFirstLetterLowercase(parameter.name) + `Param}&`;
+    // }
+    // let paramName = Utils.toFirstLetterLowercase(parameter.name);
+    // return `${parameter.swaggerParameter?.name}=\${${paramName}Param}&`;
+  }
+
+  private _requestPreparation(api: ApiDto) {
+    if (!api.haveRequest) {
+      return ``;
+    }
+
+    return `  const wrappedRequest = handleRequest(request);
+`;
+  }
+
+
+
+  private _writeFile(apis: string) {
+    fs.writeFileSync(this._commandLineArgs.outputDirectory + "/api.autogenerated.ts",
+      `${API_PRE}
+${apis}`,
+      { flag: 'w' });
+  }
 }

package/src/generators-writers/nextjs/constants.ts

@@ -1,6 +1,6 @@
-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/src/generators-writers/nextjs/model-nextjs-writer.ts

@@ -1,62 +1,62 @@
-import fs from 'fs';
-import { ModelDto } from '../../models/model-dto.js';
-
-export class ModelNextJsWriter {
-  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} ${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 = 'Date';
-      const typeName = property.typeName === 'dateTime' ? libraryDate : property.typeName;
-      propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${typeName};\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",
-      `
-  ${models}
-`,
-      { flag: 'w' });
-  }
+import fs from 'fs';
+import { ModelDto } from '../../models/model-dto.js';
+
+export class ModelNextJsWriter {
+  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} ${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 = 'Date';
+      const typeName = property.typeName === 'dateTime' ? libraryDate : property.typeName;
+      propertiesString += `  ${property.name}${property.nullable ? '?' : ''}: ${typeName};\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",
+      `
+  ${models}
+`,
+      { flag: 'w' });
+  }
 }

package/src/generators-writers/utils.ts

@@ -1,94 +1,94 @@
-import { SwaggerSchema } from "../models/swagger/swagger-schema.js";
-import fs from 'fs';
-import path from 'path';
-
-export class Utils {
-
-  public static getNormalizedApiPathAngular(apiName: string) {
-    let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
-
-    if (normalizedApiName.charAt(0) == '_') {
-      normalizedApiName = normalizedApiName.slice(1);
-    }
-
-    normalizedApiName = normalizedApiName.replaceAll('/', '_');
-
-    return normalizedApiName;
-  }
-
-  public static getNormalizedApiPathDart(apiName: string) {
-    // Remove path params like {id} from the method name.
-    apiName = apiName.replace(/\{[^}]+\}/g, '');
-
-    let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
-
-    if (normalizedApiName.charAt(0) == '_') {
-      normalizedApiName = normalizedApiName.slice(1);
-    }
-
-    normalizedApiName = normalizedApiName.replace(/-([a-zA-Z])/g, (_, char) => char.toUpperCase());
-
-    normalizedApiName = this.toCamelCase(normalizedApiName);
-
-    normalizedApiName = this.toFirstLetterLowercase(normalizedApiName);
-
-    normalizedApiName = normalizedApiName.replaceAll('_', '');
-
-    return normalizedApiName;
-  }
-
-  public static toFirstLetterLowercase(value: string) {
-    return value.charAt(0).toLowerCase() + value.slice(1);
-  }
-
-  public static toCamelCase(input: string): string {
-    return input.replace(/_([a-zA-Z])/g, (_, letter) => letter.toUpperCase());
-  }
-
-  public static toPascalCase(input: string): string {
-    return input
-      .replace(/[_\-\s]+(.)?/g, (_, c) => (c ? c.toUpperCase() : ""))
-      .replace(/^(.)/, (_, c) => c.toUpperCase());
-  }
-
-  public static isDate(schema?: SwaggerSchema) {
-    if (!schema) return false;
-
-    return schema.type == 'string' && schema.format == 'date-time';
-  }
-
-  public static toDartFileName(name: string): string {
-    return name
-      .replace(/\./g, '_')                     // sostituisce i punti con underscore
-      .replace(/([a-z0-9])([A-Z])/g, '$1_$2')  // aggiunge _ tra camelCase
-      .toLowerCase();
-  }
-
-  public static toDartClassName(name: string): string | undefined {
-    if (!name) return undefined;
-
-    return name.replace(/\./g, ''); // rimuove i punti per ottenere PascalCase
-  }
-
-  public static ensureDirectorySync(dirPath: string) {
-    if (!fs.existsSync(dirPath)) {
-      fs.mkdirSync(dirPath, { recursive: true });
-    }
-  }
-
-  public static clearDirectory(dirPath: string) {
-    if (!fs.existsSync(dirPath)) return;
-
-    for (const file of fs.readdirSync(dirPath)) {
-      const fullPath = path.join(dirPath, file);
-      const stat = fs.statSync(fullPath);
-
-      if (stat.isDirectory()) {
-        fs.rmSync(fullPath, { recursive: true, force: true });
-      } else {
-        fs.unlinkSync(fullPath);
-      }
-    }
-  }
-
+import { SwaggerSchema } from "../models/swagger/swagger-schema.js";
+import fs from 'fs';
+import path from 'path';
+
+export class Utils {
+
+  public static getNormalizedApiPathAngular(apiName: string) {
+    let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+
+    if (normalizedApiName.charAt(0) == '_') {
+      normalizedApiName = normalizedApiName.slice(1);
+    }
+
+    normalizedApiName = normalizedApiName.replaceAll('/', '_');
+
+    return normalizedApiName;
+  }
+
+  public static getNormalizedApiPathDart(apiName: string) {
+    // Remove path params like {id} from the method name.
+    apiName = apiName.replace(/\{[^}]+\}/g, '');
+
+    let normalizedApiName = apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+
+    if (normalizedApiName.charAt(0) == '_') {
+      normalizedApiName = normalizedApiName.slice(1);
+    }
+
+    normalizedApiName = normalizedApiName.replace(/-([a-zA-Z])/g, (_, char) => char.toUpperCase());
+
+    normalizedApiName = this.toCamelCase(normalizedApiName);
+
+    normalizedApiName = this.toFirstLetterLowercase(normalizedApiName);
+
+    normalizedApiName = normalizedApiName.replaceAll('_', '');
+
+    return normalizedApiName;
+  }
+
+  public static toFirstLetterLowercase(value: string) {
+    return value.charAt(0).toLowerCase() + value.slice(1);
+  }
+
+  public static toCamelCase(input: string): string {
+    return input.replace(/_([a-zA-Z])/g, (_, letter) => letter.toUpperCase());
+  }
+
+  public static toPascalCase(input: string): string {
+    return input
+      .replace(/[_\-\s]+(.)?/g, (_, c) => (c ? c.toUpperCase() : ""))
+      .replace(/^(.)/, (_, c) => c.toUpperCase());
+  }
+
+  public static isDate(schema?: SwaggerSchema) {
+    if (!schema) return false;
+
+    return schema.type == 'string' && schema.format == 'date-time';
+  }
+
+  public static toDartFileName(name: string): string {
+    return name
+      .replace(/\./g, '_')                     // sostituisce i punti con underscore
+      .replace(/([a-z0-9])([A-Z])/g, '$1_$2')  // aggiunge _ tra camelCase
+      .toLowerCase();
+  }
+
+  public static toDartClassName(name: string): string | undefined {
+    if (!name) return undefined;
+
+    return name.replace(/\./g, ''); // rimuove i punti per ottenere PascalCase
+  }
+
+  public static ensureDirectorySync(dirPath: string) {
+    if (!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath, { recursive: true });
+    }
+  }
+
+  public static clearDirectory(dirPath: string) {
+    if (!fs.existsSync(dirPath)) return;
+
+    for (const file of fs.readdirSync(dirPath)) {
+      const fullPath = path.join(dirPath, file);
+      const stat = fs.statSync(fullPath);
+
+      if (stat.isDirectory()) {
+        fs.rmSync(fullPath, { recursive: true, force: true });
+      } else {
+        fs.unlinkSync(fullPath);
+      }
+    }
+  }
+
 }