@asyncapi/cli 2.16.2 → 2.16.4

package/lib/commands/convert.d.ts

@@ -14,8 +14,6 @@ export default class Convert extends Command {
     };
     static args: {
         'spec-file': import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
-        proxyHost: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
-        proxyPort: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
     private handleConversion;

package/lib/commands/convert.js

@@ -129,6 +129,4 @@ Convert.description = 'Convert asyncapi documents older to newer versions or Ope
 Convert.flags = Object.assign(Object.assign({}, (0, convert_flags_1.convertFlags)(latestVersion)), (0, proxy_flags_1.proxyFlags)());
 Convert.args = {
     'spec-file': core_1.Args.string({ description: 'spec path, url, or context-name', required: false }),
-    proxyHost: core_1.Args.string({ description: 'Name of the Proxy Host', required: false }),
-    proxyPort: core_1.Args.string({ description: 'Name of the Port of the ProxyHost', required: false }),
 };

package/lib/commands/generate/fromTemplate.d.ts

@@ -3,7 +3,9 @@ import { Parser } from '@asyncapi/parser';
 export default class Template extends Command {
     static description: string;
     static examples: string[];
-    static flags: {
+    static readonly flags: {
+        proxyHost: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        proxyPort: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         'disable-hook': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'no-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;

package/lib/commands/generate/fromTemplate.js

@@ -19,6 +19,7 @@ const prompts_1 = require("@clack/prompts");
 const picocolors_1 = require("picocolors");
 const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const fromTemplate_flags_1 = require("../../core/flags/generate/fromTemplate.flags");
+const proxy_flags_1 = require("../../core/flags/proxy.flags");
 const templatesNotSupportingV3 = {
     '@asyncapi/minimaltemplate': 'some link',
     '@asyncapi/dotnet-nats-template': 'https://github.com/asyncapi/dotnet-nats-template/issues/384',
@@ -79,6 +80,7 @@ class Template extends base_1.default {
             const interactive = !flags['no-interactive'];
             let { asyncapi, template } = args;
             let output = flags.output;
+            const { proxyPort, proxyHost } = flags;
             if (interactive) {
                 (0, prompts_1.intro)((0, picocolors_1.inverse)('AsyncAPI Generator'));
                 const parsedArgs = yield this.parseArgs(args, output);
@@ -101,6 +103,10 @@ class Template extends base_1.default {
                     token: flags['registry-token']
                 }
             };
+            if (proxyHost && proxyPort) {
+                const proxyUrl = `http://${proxyHost}:${proxyPort}`;
+                asyncapi = `${asyncapi}+${proxyUrl}`;
+            }
             const asyncapiInput = (yield (0, SpecificationFile_1.load)(asyncapi)) || (yield (0, SpecificationFile_1.load)());
             this.specFile = asyncapiInput;
             this.metricsMetadata.template = template;
@@ -384,7 +390,7 @@ Template.description = 'Generates whatever you want using templates compatible w
 Template.examples = [
     'asyncapi generate fromTemplate asyncapi.yaml @asyncapi/html-template --param version=1.0.0 singleFile=true --output ./docs --force-write'
 ];
-Template.flags = (0, fromTemplate_flags_1.fromTemplateFlags)();
+Template.flags = Object.assign(Object.assign({}, (0, fromTemplate_flags_1.fromTemplateFlags)()), (0, proxy_flags_1.proxyFlags)());
 Template.args = {
     asyncapi: core_1.Args.string({ description: '- Local path, url or context-name pointing to AsyncAPI file', required: true }),
     template: core_1.Args.string({ description: '- Name of the generator template like for example @asyncapi/html-template or https://github.com/asyncapi/html-template', required: true }),

package/lib/commands/generate/models.d.ts

@@ -2,7 +2,10 @@ import Command from '../../core/base';
 export default class Models extends Command {
     static description: string;
     static readonly args: any;
-    static flags: Record<string, any>;
+    static readonly flags: {
+        proxyHost: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        proxyPort: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+    };
     run(): Promise<void>;
     private parseArgs;
 }

package/lib/commands/generate/models.js

@@ -8,12 +8,14 @@ const prompts_1 = require("@clack/prompts");
 const picocolors_1 = require("picocolors");
 const modelina_cli_1 = require("@asyncapi/modelina-cli");
 const models_flags_1 = require("../../core/flags/generate/models.flags");
+const proxy_flags_1 = require("../../core/flags/proxy.flags");
 class Models extends base_1.default {
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const { args, flags } = yield this.parse(Models);
             let { language, file } = args;
             let { output } = flags;
+            const { proxyPort, proxyHost } = flags;
             const interactive = !flags['no-interactive'];
             if (!interactive) {
                 (0, prompts_1.intro)((0, picocolors_1.inverse)('AsyncAPI Generate Models'));
@@ -22,6 +24,10 @@ class Models extends base_1.default {
                 file = parsedArgs.file;
                 output = parsedArgs.output;
             }
+            if (proxyHost && proxyPort) {
+                const proxyUrl = `http://${proxyHost}:${proxyPort}`;
+                file = `${file}+${proxyUrl}`;
+            }
             const inputFile = (yield (0, SpecificationFile_1.load)(file)) || (yield (0, SpecificationFile_1.load)());
             const { document, diagnostics, status } = yield (0, parser_1.parse)(this, inputFile, flags);
             if (!document || status === 'invalid') {
@@ -117,4 +123,4 @@ class Models extends base_1.default {
 exports.default = Models;
 Models.description = 'Generates typed models';
 Models.args = modelina_cli_1.ModelinaArgs;
-Models.flags = (0, models_flags_1.modelsFlags)();
+Models.flags = Object.assign(Object.assign({}, (0, models_flags_1.modelsFlags)()), (0, proxy_flags_1.proxyFlags)());

package/lib/commands/optimize.d.ts

@@ -32,8 +32,6 @@ export default class Optimize extends Command {
     };
     static args: {
         'spec-file': import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
-        proxyHost: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
-        proxyPort: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     parser: Parser;
     run(): Promise<void>;

package/lib/commands/optimize.js

@@ -236,6 +236,4 @@ Optimize.examples = [
 Optimize.flags = Object.assign(Object.assign({}, (0, optimize_flags_1.optimizeFlags)()), (0, proxy_flags_1.proxyFlags)());
 Optimize.args = {
     'spec-file': core_1.Args.string({ description: 'spec path, url, or context-name', required: false }),
-    proxyHost: core_1.Args.string({ description: 'Name of the Proxy Host', required: false }),
-    proxyPort: core_1.Args.string({ description: 'Name of the Port of the ProxyHost', required: false }),
 };

package/lib/commands/validate.d.ts

@@ -14,8 +14,6 @@ export default class Validate extends Command {
     };
     static args: {
         'spec-file': import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
-        proxyHost: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
-        proxyPort: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
 }

package/lib/commands/validate.js

@@ -42,6 +42,4 @@ Validate.description = 'validate asyncapi file';
 Validate.flags = Object.assign(Object.assign({}, (0, validate_flags_1.validateFlags)()), (0, proxy_flags_1.proxyFlags)());
 Validate.args = {
     'spec-file': core_1.Args.string({ description: 'spec path, url, or context-name', required: false }),
-    proxyHost: core_1.Args.string({ description: 'Name of the Proxy Host', required: false }),
-    proxyPort: core_1.Args.string({ description: 'Name of the Port of the ProxyHost', required: false }),
 };

package/oclif.manifest.json

@@ -73,16 +73,6 @@
           "description": "spec path, url, or context-name",
           "name": "spec-file",
           "required": false
-        },
-        "proxyHost": {
-          "description": "Name of the Proxy Host",
-          "name": "proxyHost",
-          "required": false
-        },
-        "proxyPort": {
-          "description": "Name of the Port of the ProxyHost",
-          "name": "proxyPort",
-          "required": false
         }
       },
       "description": "Convert asyncapi documents older to newer versions or OpenAPI/postman-collection documents to AsyncAPI",
@@ -381,16 +371,6 @@
           "description": "spec path, url, or context-name",
           "name": "spec-file",
           "required": false
-        },
-        "proxyHost": {
-          "description": "Name of the Proxy Host",
-          "name": "proxyHost",
-          "required": false
-        },
-        "proxyPort": {
-          "description": "Name of the Port of the ProxyHost",
-          "name": "proxyPort",
-          "required": false
         }
       },
       "description": "optimize asyncapi specification file",
@@ -537,16 +517,6 @@
           "description": "spec path, url, or context-name",
           "name": "spec-file",
           "required": false
-        },
-        "proxyHost": {
-          "description": "Name of the Proxy Host",
-          "name": "proxyHost",
-          "required": false
-        },
-        "proxyPort": {
-          "description": "Name of the Port of the ProxyHost",
-          "name": "proxyPort",
-          "required": false
         }
       },
       "description": "validate asyncapi file",
@@ -870,6 +840,22 @@
           "name": "use-new-generator",
           "allowNo": false,
           "type": "boolean"
+        },
+        "proxyHost": {
+          "description": "Name of the ProxyHost",
+          "name": "proxyHost",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "proxyPort": {
+          "description": "Port number number for the proxyHost.",
+          "name": "proxyPort",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -1187,6 +1173,22 @@
             "hint"
           ],
           "type": "option"
+        },
+        "proxyHost": {
+          "description": "Name of the ProxyHost",
+          "name": "proxyHost",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "proxyPort": {
+          "description": "Port number number for the proxyHost.",
+          "name": "proxyPort",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -1769,5 +1771,5 @@
       ]
     }
   },
-  "version": "2.16.2"
+  "version": "2.16.4"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "2.16.2",
+  "version": "2.16.4",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"