@devlearning/swagger-generator 1.1.15 → 1.1.17

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

package/src/index.ts

@@ -1,104 +1,104 @@
-#!/usr/bin/env node
-
-import yargs from 'yargs';
-import { hideBin } from 'yargs/helpers';
-import { Generator } from './generator.js';
-import { SwaggerDownloader } from './swagger-downloader.js';
-
-export enum DateTimeLibrary {
-	Moment = 'moment',
-	DateFns = 'date-fn',
-}
-
-export enum TargetGeneration {
-	Angular = 'angular',
-	Next = 'next',
-	Flutter = 'flutter',
-}
-
-export interface CommandLineArgs {
-	swaggerJsonUrl: string;
-	outputDirectory: string;
-	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>] [--api-client-name <className>]')
-	.option('url', {
-		alias: 'u',
-		type: 'string',
-		demandOption: true,
-		describe: 'URL of swagger.json file',
-	})
-	.option('output', {
-		alias: 'o',
-		type: 'string',
-		demandOption: true,
-		describe: 'Output directory for generated code',
-	})
-	.option('target', {
-		alias: 't',
-		type: 'string',
-		choices: ['angular', 'next', 'flutter'],
-		demandOption: true,
-		describe: 'Target format for the generated code',
-	})
-	.option('dateTimeLibrary', {
-		alias: 'd',
-		type: 'string',
-		choices: ['moment', 'date-fns'],
-		default: 'date-fns',
-		describe: 'Date library to use for date handling',
-	})
-	.option('package', {
-		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();
-
-const commandLineArgs: CommandLineArgs = {
-	swaggerJsonUrl: argv.url,
-	outputDirectory: argv.output,
-	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))
-	.then(swaggerDoc => {
-		return new Generator(swaggerDoc, commandLineArgs);
-	})
-	.then(generator => { generator.generate(); });
-
-
-// require('./index.js')({swaggerDownloader});
-
-function parseDateTimeLibrary(value: string): DateTimeLibrary | undefined {
-	const values = Object.values(DateTimeLibrary);
-	if (values.includes(value as DateTimeLibrary)) {
-		return value as DateTimeLibrary;
-	}
-	return undefined;
-}
-
-function parseTargetGeneration(value: string): TargetGeneration {
-	const values = Object.values(TargetGeneration);
-	if (values.includes(value as TargetGeneration)) {
-		return value as TargetGeneration;
-	}
-	throw new Error(`Invalid OutputFormat: ${value}`);
+#!/usr/bin/env node
+
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+import { Generator } from './generator.js';
+import { SwaggerDownloader } from './swagger-downloader.js';
+
+export enum DateTimeLibrary {
+	Moment = 'moment',
+	DateFns = 'date-fn',
+}
+
+export enum TargetGeneration {
+	Angular = 'angular',
+	Next = 'next',
+	Flutter = 'flutter',
+}
+
+export interface CommandLineArgs {
+	swaggerJsonUrl: string;
+	outputDirectory: string;
+	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>] [--api-client-name <className>]')
+	.option('url', {
+		alias: 'u',
+		type: 'string',
+		demandOption: true,
+		describe: 'URL of swagger.json file',
+	})
+	.option('output', {
+		alias: 'o',
+		type: 'string',
+		demandOption: true,
+		describe: 'Output directory for generated code',
+	})
+	.option('target', {
+		alias: 't',
+		type: 'string',
+		choices: ['angular', 'next', 'flutter'],
+		demandOption: true,
+		describe: 'Target format for the generated code',
+	})
+	.option('dateTimeLibrary', {
+		alias: 'd',
+		type: 'string',
+		choices: ['moment', 'date-fns'],
+		default: 'date-fns',
+		describe: 'Date library to use for date handling',
+	})
+	.option('package', {
+		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();
+
+const commandLineArgs: CommandLineArgs = {
+	swaggerJsonUrl: argv.url,
+	outputDirectory: argv.output,
+	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))
+	.then(swaggerDoc => {
+		return new Generator(swaggerDoc, commandLineArgs);
+	})
+	.then(generator => { generator.generate(); });
+
+
+// require('./index.js')({swaggerDownloader});
+
+function parseDateTimeLibrary(value: string): DateTimeLibrary | undefined {
+	const values = Object.values(DateTimeLibrary);
+	if (values.includes(value as DateTimeLibrary)) {
+		return value as DateTimeLibrary;
+	}
+	return undefined;
+}
+
+function parseTargetGeneration(value: string): TargetGeneration {
+	const values = Object.values(TargetGeneration);
+	if (values.includes(value as TargetGeneration)) {
+		return value as TargetGeneration;
+	}
+	throw new Error(`Invalid OutputFormat: ${value}`);
 }

package/src/models/api-dto.ts

@@ -1,18 +1,18 @@
-import { ParameterDto } from "./parameter-dto.js";
-import { SwaggerMethod } from "./swagger/swagger-method.js";
-import { TypeDto } from "./type-dto.js";
-
-export interface ApiDto {
-  name: string;
-  method: string;
-  url: string;
-  description?: string;
-  parameters: ParameterDto[];
-  returnType: TypeDto | undefined;
-  haveRequest: boolean;
-  isMultiPart: boolean;
-  tag: string;
-
-  swaggerMethodKey: { [key: string]: SwaggerMethod; };
-  swaggerMethod: SwaggerMethod;
+import { ParameterDto } from "./parameter-dto.js";
+import { SwaggerMethod } from "./swagger/swagger-method.js";
+import { TypeDto } from "./type-dto.js";
+
+export interface ApiDto {
+  name: string;
+  method: string;
+  url: string;
+  description?: string;
+  parameters: ParameterDto[];
+  returnType: TypeDto | undefined;
+  haveRequest: boolean;
+  isMultiPart: boolean;
+  tag: string;
+
+  swaggerMethodKey: { [key: string]: SwaggerMethod; };
+  swaggerMethod: SwaggerMethod;
 }

package/src/models/enum-value-dto.ts

@@ -1,4 +1,4 @@
-export interface EnumValueDto {
-  name: string;
-  value: string;
+export interface EnumValueDto {
+  name: string;
+  value: string;
 }

package/src/models/model-dto.ts

@@ -1,10 +1,10 @@
-import { EnumValueDto } from "./enum-value-dto.js";
-import { PropertyDto } from "./property-dto.js";
-
-export interface ModelDto {
-  typeName: string;
-  modelType: 'enum' | 'interface' | 'class';
-  name: string;
-  properties: PropertyDto[];
-  enumValues: EnumValueDto[];
+import { EnumValueDto } from "./enum-value-dto.js";
+import { PropertyDto } from "./property-dto.js";
+
+export interface ModelDto {
+  typeName: string;
+  modelType: 'enum' | 'interface' | 'class';
+  name: string;
+  properties: PropertyDto[];
+  enumValues: EnumValueDto[];
 }

package/src/models/parameter-dto.ts

@@ -1,8 +1,8 @@
-import { PropertyDto } from "./property-dto.js";
-import { SwaggerParameter } from "./swagger/swagger.js";
-
-export interface ParameterDto extends PropertyDto {
-  isQuery: boolean;
-  isEnum: boolean;
-  swaggerParameter?: SwaggerParameter;
+import { PropertyDto } from "./property-dto.js";
+import { SwaggerParameter } from "./swagger/swagger.js";
+
+export interface ParameterDto extends PropertyDto {
+  isQuery: boolean;
+  isEnum: boolean;
+  swaggerParameter?: SwaggerParameter;
 }

package/src/models/property-dto.ts

@@ -1,5 +1,5 @@
-import { TypeDto } from "./type-dto.js";
-
-export interface PropertyDto extends TypeDto {
-  name: string;
+import { TypeDto } from "./type-dto.js";
+
+export interface PropertyDto extends TypeDto {
+  name: string;
 }

package/src/models/swagger/swagger-component-property.ts

@@ -1,12 +1,12 @@
-import { SwaggerSchema } from "./swagger-schema.js";
-
-// export interface SwaggerComponentProperty {
-//     type: string;
-//     $ref: string;
-//     allOf: SwaggerComponentProperty[];
-//     format: string;
-//     items: SwaggerSchema;
-//     properties: { [key: string]: SwaggerComponentProperty; };
-//     nullable: boolean;
-//     minLength: number;
+import { SwaggerSchema } from "./swagger-schema.js";
+
+// export interface SwaggerComponentProperty {
+//     type: string;
+//     $ref: string;
+//     allOf: SwaggerComponentProperty[];
+//     format: string;
+//     items: SwaggerSchema;
+//     properties: { [key: string]: SwaggerComponentProperty; };
+//     nullable: boolean;
+//     minLength: number;
 // }