Refractor code base

Author: AayushSaini101

src/apps/cli/commands/convert.ts

@@ -9,12 +9,11 @@ import { proxyFlags } from '@cli/internal/flags/proxy.flags';
 import specs from '@asyncapi/specs';
 import { convertFlags } from '@cli/internal/flags/convert.flags';
 import { ConversionService } from '@services/convert.service';
+import { applyProxyToPath } from '@utils/proxy';
 
 const latestVersion = Object.keys(specs.schemas).pop() as string;
 
 export default class Convert extends Command {
-  static specFile: any;
-  static metricsMetadata: any = {};
   static description =
     'Convert asyncapi documents older to newer versions or OpenAPI/postman-collection documents to AsyncAPI';
   private conversionService = new ConversionService();
@@ -32,18 +31,15 @@ export default class Convert extends Command {
 
   async run() {
     const { args, flags } = await this.parse(Convert);
-    let filePath = args['spec-file'];
-    const proxyHost = flags['proxyHost'];
-    const proxyPort = flags['proxyPort'];
-    if (proxyHost && proxyPort) {
-      const proxyUrl = `http://${proxyHost}:${proxyPort}`;
-      filePath = `${filePath}+${proxyUrl}`; // Update filePath with proxyUrl
-    }
+    const filePath = applyProxyToPath(
+      args['spec-file'],
+      flags['proxyHost'],
+      flags['proxyPort']
+    );
 
     try {
       // LOAD FILE
       this.specFile = await load(filePath);
-      // eslint-disable-next-line sonarjs/no-duplicate-string
       this.metricsMetadata.to_version = flags['target-version'];
       const conversionOptions = {
         format: flags.format as 'asyncapi' | 'openapi' | 'postman-collection',
@@ -76,20 +72,20 @@ export default class Convert extends Command {
         this.log(result.data.convertedDocument);
       }
     } catch (err) {
-      this.handleError(err, filePath ?? 'unknown', flags);
+      this.handleError(err, filePath ?? 'unknown', flags['target-version']);
     }
   }
 
   // Helper function to handle errors
-  private handleError(err: any, filePath: string, flags: any) {
+  private handleError(err: unknown, filePath: string, targetVersion: string | undefined) {
     if (err instanceof SpecificationFileNotFound) {
       this.error(
         new ValidationError({
           type: 'invalid-file',
           filepath: filePath,
         }),
       );
-    } else if (this.specFile?.toJson().asyncapi > flags['target-version']) {
+    } else if (this.specFile?.toJson().asyncapi > (targetVersion ?? '')) {
       this.error(
         `The ${cyan(filePath)} file cannot be converted to an older version. Downgrading is not supported.`,
       );

src/apps/cli/commands/format.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
 import { promises as fPromises } from 'fs';
 import { Args } from '@oclif/core';
 import Command from '@cli/internal/base';
@@ -16,9 +15,7 @@ import {
   fileFormat,
 } from '@cli/internal/flags/format.flags';
 
-export default class Convert extends Command {
-  static specFile: any;
-  static metricsMetadata: any = {};
+export default class Format extends Command {
   static description =
     'Convert asyncapi documents from any format to yaml, yml or JSON';
 
@@ -32,14 +29,13 @@ export default class Convert extends Command {
   };
 
   async run() {
-    const { args, flags } = await this.parse(Convert);
+    const { args, flags } = await this.parse(Format);
     const filePath = args['spec-file'];
     const outputFileFormat = flags['format'] as fileFormat;
     let convertedFile;
     try {
       this.specFile = await load(filePath);
-      // eslint-disable-next-line sonarjs/no-duplicate-string
-      this.metricsMetadata.to_version = flags['target-version'];
+      this.metricsMetadata.output_format = outputFileFormat;
 
       const ff = retrieveFileFormat(this.specFile.text());
       const isSpecFileJson = ff === 'json';

src/apps/cli/commands/generate/models.ts

@@ -15,6 +15,7 @@ import {
   ValidationStatus,
 } from '@/domains/services/validation.service';
 import { Diagnostic } from '@asyncapi/parser/cjs';
+import { applyProxyToPath } from '@utils/proxy';
 
 export default class Models extends Command {
   static description = 'Generates typed models';
@@ -44,11 +45,8 @@ export default class Models extends Command {
       output = parsedArgs.output;
     }
 
-    if (proxyHost && proxyPort) {
-      const proxyUrl = `http://${proxyHost}:${proxyPort}`;
-      file = `${file}+${proxyUrl}`;
-    }
-    const inputFile = (await load(file)) || (await load());
+    const fileWithProxy = applyProxyToPath(file, proxyHost, proxyPort);
+    const inputFile = (await load(fileWithProxy)) || (await load());
 
     const result = await this.validationService.parseDocument(
       inputFile,

src/apps/cli/commands/optimize.ts

@@ -9,6 +9,7 @@ import { promises } from 'fs';
 import { Parser } from '@asyncapi/parser';
 import { optimizeFlags } from '@cli/internal/flags/optimize.flags';
 import { proxyFlags } from '@cli/internal/flags/proxy.flags';
+import { applyProxyToPath } from '@utils/proxy';
 
 const { writeFile } = promises;
 
@@ -59,13 +60,11 @@ export default class Optimize extends Command {
 
   async run() {
     const { args, flags } = await this.parse(Optimize); //NOSONAR
-    let filePath = args['spec-file'];
-    const proxyHost = flags['proxyHost'];
-    const proxyPort = flags['proxyPort'];
-    if (proxyHost && proxyPort) {
-      const proxyUrl = `http://${proxyHost}:${proxyPort}`;
-      filePath = `${filePath}+${proxyUrl}`; // Update filePath with proxyUrl
-    }
+    const filePath = applyProxyToPath(
+      args['spec-file'],
+      flags['proxyHost'],
+      flags['proxyPort']
+    );
     try {
       this.specFile = await load(filePath);
     } catch (err: any) {

src/apps/cli/commands/validate.ts

@@ -13,6 +13,7 @@ import {
   ValidationService,
   ValidationStatus,
 } from '@services/validation.service';
+import { applyProxyToPath } from '@utils/proxy';
 
 export default class Validate extends Command {
   static description = 'validate asyncapi file';
@@ -32,14 +33,11 @@ export default class Validate extends Command {
 
   async run() {
     const { args, flags } = await this.parse(Validate); //NOSONAR
-    let filePath = args['spec-file'];
-    const proxyHost = flags['proxyHost'];
-    const proxyPort = flags['proxyPort'];
-
-    if (proxyHost && proxyPort) {
-      const proxyUrl = `http://${proxyHost}:${proxyPort}`;
-      filePath = `${filePath}+${proxyUrl}`; // Update filePath with proxyUrl
-    }
+    const filePath = applyProxyToPath(
+      args['spec-file'],
+      flags['proxyHost'],
+      flags['proxyPort']
+    );
 
     this.specFile = await load(filePath);
     const watchMode = flags.watch;

src/apps/cli/internal/base/BaseGeneratorCommand.ts

@@ -15,6 +15,7 @@ import { getMapBaseUrlToFolderResolver } from '@utils/generate/mapBaseUrl';
 import { promptForAsyncAPIPath, promptForOutputDir } from '@utils/generate/prompts';
 import { ParsedFlags } from '@models/generate/Flags';
 import { GeneratorService } from '@services/generator.service';
+import { applyProxyToPath } from '@utils/proxy';
 
 export interface GeneratorOptions {
   forceWrite: boolean;
@@ -61,11 +62,7 @@ export abstract class BaseGeneratorCommand extends Command {
   }
 
   protected applyProxyConfiguration(asyncapi: string, proxyHost?: string, proxyPort?: string): string {
-    if (proxyHost && proxyPort) {
-      const proxyUrl = `http://${proxyHost}:${proxyPort}`;
-      return `${asyncapi}+${proxyUrl}`;
-    }
-    return asyncapi;
+    return applyProxyToPath(asyncapi, proxyHost, proxyPort) ?? asyncapi;
   }
 
   protected async handleWatchMode(

src/domains/models/Context.ts

@@ -339,7 +339,9 @@ async function getContextFilePath(): Promise<string | null> {
         CONTEXT_FILE_PATH = currentPathString;
         return CONTEXT_FILE_PATH;
       }
-    } catch (e) {} // eslint-disable-line
+    } catch {
+      // Silently continue to parent directory if file doesn't exist or is invalid JSON
+    }
 
     currentPath.pop();
   }