@devlearning/swagger-generator 1.1.21 → 1.1.22

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;
 // }

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

@@ -1,18 +1,18 @@
-// import { SwaggerComponentProperty } from "./swagger-component-property.js";
-
-import { SwaggerSchema } from "./swagger-schema.js";
-
-// export interface SwaggerComponent {
-//     type: string;
-//     properties: { [key: string]: SwaggerComponentProperty; };
-//     additionalProperties: boolean;
-//     enum: string[];
-// }
-
-export interface SwaggerComponent {
-    type: string;
-    properties: { [key: string]: SwaggerSchema; };
-    additionalProperties: boolean;
-    enum?: Array<string | number>;
-    required?: string[];
+// import { SwaggerComponentProperty } from "./swagger-component-property.js";
+
+import { SwaggerSchema } from "./swagger-schema.js";
+
+// export interface SwaggerComponent {
+//     type: string;
+//     properties: { [key: string]: SwaggerComponentProperty; };
+//     additionalProperties: boolean;
+//     enum: string[];
+// }
+
+export interface SwaggerComponent {
+    type: string;
+    properties: { [key: string]: SwaggerSchema; };
+    additionalProperties: boolean;
+    enum?: Array<string | number>;
+    required?: string[];
 }

package/src/models/swagger/swagger-content.ts

@@ -1,5 +1,5 @@
-import { SwaggerSchema } from "./swagger-schema.js";
-
-export interface SwaggerContent {
-    schema: SwaggerSchema;
+import { SwaggerSchema } from "./swagger-schema.js";
+
+export interface SwaggerContent {
+    schema: SwaggerSchema;
 }

package/src/models/swagger/swagger-info.ts

@@ -1,4 +1,4 @@
-export interface SwaggerInfo {
-    title: string;
-    version: string;
+export interface SwaggerInfo {
+    title: string;
+    version: string;
 }

package/src/models/swagger/swagger-method.ts

@@ -1,8 +1,8 @@
-import { SwaggerParameter, SwaggerRequestBody, SwaggerResponses } from "./swagger.js";
-
-export interface SwaggerMethod {
-    tags: string[];
-    parameters: SwaggerParameter[];
-    requestBody: SwaggerRequestBody;
-    responses: { [key: string]: SwaggerResponses; };
+import { SwaggerParameter, SwaggerRequestBody, SwaggerResponses } from "./swagger.js";
+
+export interface SwaggerMethod {
+    tags: string[];
+    parameters: SwaggerParameter[];
+    requestBody: SwaggerRequestBody;
+    responses: { [key: string]: SwaggerResponses; };
 }

package/src/models/swagger/swagger-schema.ts

@@ -1,22 +1,22 @@
-// import { SwaggerComponentProperty } from "./swagger-component-property.js";
-
-// export interface SwaggerSchema {
-//     type: string;
-//     $ref: string;
-//     allOf: SwaggerSchema[];
-//     format: string;
-//     items: SwaggerSchema;
-//     properties: { [key: string]: SwaggerComponentProperty; };
-// }
-
-export interface SwaggerSchema {
-    type?: string;
-    $ref?: string;
-    allOf?: SwaggerSchema[];
-    format?: string;
-    items?: SwaggerSchema;
-    properties?: { [key: string]: SwaggerSchema };
-    enum?: Array<string | number>;
-    nullable?: boolean;
-    minLength?: number;
+// import { SwaggerComponentProperty } from "./swagger-component-property.js";
+
+// export interface SwaggerSchema {
+//     type: string;
+//     $ref: string;
+//     allOf: SwaggerSchema[];
+//     format: string;
+//     items: SwaggerSchema;
+//     properties: { [key: string]: SwaggerComponentProperty; };
+// }
+
+export interface SwaggerSchema {
+    type?: string;
+    $ref?: string;
+    allOf?: SwaggerSchema[];
+    format?: string;
+    items?: SwaggerSchema;
+    properties?: { [key: string]: SwaggerSchema };
+    enum?: Array<string | number>;
+    nullable?: boolean;
+    minLength?: number;
 }

package/src/models/swagger/swagger.ts

@@ -1,39 +1,39 @@
-import { SwaggerComponent } from "./swagger-component.js";
-import { SwaggerContent } from "./swagger-content.js";
-import { SwaggerInfo } from "./swagger-info.js";
-import { SwaggerMethod } from "./swagger-method.js";
-import { SwaggerSchema } from "./swagger-schema.js";
-
-export interface Swagger {
-    openApi: string;
-    info: SwaggerInfo;
-    paths: { [key: string]: { [key: string]: SwaggerMethod; }; };
-    components: SwaggerComponents;
-}
-
-export interface SwaggerParameter {
-    name: string;
-    in: string;
-    required: boolean;
-    schema: SwaggerSchema;
-}
-
-export interface SwaggerRequestBody {
-    content: { [key: string]: SwaggerContent; };
-    encoding : SwaggerEncoding;
-    required?: boolean;
-}
-
-export interface SwaggerResponses {
-    description: string;
-    content: { [key: string]: SwaggerContent; };
-}
-
-export interface SwaggerComponents {
-    schemas: { [key: string]: SwaggerComponent; };
-}
-
-export interface SwaggerEncoding{
-    File: {style: 'form'},
-    Id: {style: 'form'},
+import { SwaggerComponent } from "./swagger-component.js";
+import { SwaggerContent } from "./swagger-content.js";
+import { SwaggerInfo } from "./swagger-info.js";
+import { SwaggerMethod } from "./swagger-method.js";
+import { SwaggerSchema } from "./swagger-schema.js";
+
+export interface Swagger {
+    openApi: string;
+    info: SwaggerInfo;
+    paths: { [key: string]: { [key: string]: SwaggerMethod; }; };
+    components: SwaggerComponents;
+}
+
+export interface SwaggerParameter {
+    name: string;
+    in: string;
+    required: boolean;
+    schema: SwaggerSchema;
+}
+
+export interface SwaggerRequestBody {
+    content: { [key: string]: SwaggerContent; };
+    encoding : SwaggerEncoding;
+    required?: boolean;
+}
+
+export interface SwaggerResponses {
+    description: string;
+    content: { [key: string]: SwaggerContent; };
+}
+
+export interface SwaggerComponents {
+    schemas: { [key: string]: SwaggerComponent; };
+}
+
+export interface SwaggerEncoding{
+    File: {style: 'form'},
+    Id: {style: 'form'},
 }

package/src/models/type-dto.ts

@@ -1,8 +1,8 @@
-export interface TypeDto {
-  typeName: string;
-  nullable: boolean;
-  isNativeType: boolean;
-  isTypeReference: boolean;
-  isVoid: boolean;
-  isArray: boolean;
+export interface TypeDto {
+  typeName: string;
+  nullable: boolean;
+  isNativeType: boolean;
+  isTypeReference: boolean;
+  isVoid: boolean;
+  isArray: boolean;
 }

package/src/swagger-downloader.ts

@@ -1,46 +1,46 @@
-import fetch, { RequestInit } from 'node-fetch';
-import { Swagger } from "./models/swagger/swagger.js";
-import { logger } from './utils/logger.js';
-import { SwaggerValidator } from './utils/swagger-validator.js';
-
-const settings: RequestInit = { method: "Get" };
-
-export class SwaggerDownloader {
-    async download(swaggerJsonUrl: URL): Promise<Swagger> {
-        try {
-            logger.progress(`Downloading Swagger from: ${swaggerJsonUrl}`);
-            
-            const response = await fetch(swaggerJsonUrl, settings);
-            
-            if (!response.ok) {
-                throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-            }
-
-            const json = await response.json();
-            
-            // Validate the downloaded swagger document
-            if (!SwaggerValidator.isValidSwaggerDocument(json)) {
-                throw new Error('Downloaded document is not a valid Swagger/OpenAPI specification');
-            }
-
-            // Normalize openapi field to openApi (camelCase) if needed
-            const jsonAny = json as any;
-            if (jsonAny.openapi && !jsonAny.openApi) {
-                jsonAny.openApi = jsonAny.openapi;
-            }
-            if (jsonAny.swagger && !jsonAny.openApi) {
-                jsonAny.openApi = jsonAny.swagger;
-            }
-
-            const swagger = jsonAny as Swagger;
-            SwaggerValidator.validate(swagger);
-            
-            logger.success(`Swagger document downloaded successfully`);
-            return swagger;
-            
-        } catch (error) {
-            logger.error(`Failed to download Swagger from ${swaggerJsonUrl}`, error);
-            throw error;
-        }
-    }
-}
+import fetch, { RequestInit } from 'node-fetch';
+import { Swagger } from "./models/swagger/swagger.js";
+import { logger } from './utils/logger.js';
+import { SwaggerValidator } from './utils/swagger-validator.js';
+
+const settings: RequestInit = { method: "Get" };
+
+export class SwaggerDownloader {
+    async download(swaggerJsonUrl: URL): Promise<Swagger> {
+        try {
+            logger.progress(`Downloading Swagger from: ${swaggerJsonUrl}`);
+            
+            const response = await fetch(swaggerJsonUrl, settings);
+            
+            if (!response.ok) {
+                throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+            }
+
+            const json = await response.json();
+            
+            // Validate the downloaded swagger document
+            if (!SwaggerValidator.isValidSwaggerDocument(json)) {
+                throw new Error('Downloaded document is not a valid Swagger/OpenAPI specification');
+            }
+
+            // Normalize openapi field to openApi (camelCase) if needed
+            const jsonAny = json as any;
+            if (jsonAny.openapi && !jsonAny.openApi) {
+                jsonAny.openApi = jsonAny.openapi;
+            }
+            if (jsonAny.swagger && !jsonAny.openApi) {
+                jsonAny.openApi = jsonAny.swagger;
+            }
+
+            const swagger = jsonAny as Swagger;
+            SwaggerValidator.validate(swagger);
+            
+            logger.success(`Swagger document downloaded successfully`);
+            return swagger;
+            
+        } catch (error) {
+            logger.error(`Failed to download Swagger from ${swaggerJsonUrl}`, error);
+            throw error;
+        }
+    }
+}