@asyncapi/cli 0.25.0 → 0.25.3

package/lib/base.d.ts

@@ -1,4 +1,6 @@
 import { Command } from '@oclif/core';
 export default abstract class extends Command {
-    catch(e: any): Promise<void>;
+    catch(err: Error & {
+        exitCode?: number;
+    }): Promise<any>;
 }

package/lib/base.js

@@ -1,10 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 class default_1 extends core_1.Command {
-    async catch(e) {
-        console.error(`${e.name}: ${e.message}`);
-        process.exitCode = 1;
+    catch(err) {
+        const _super = Object.create(null, {
+            catch: { get: () => super.catch }
+        });
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield _super.catch.call(this, err);
+            }
+            catch (e) {
+                if (e instanceof Error) {
+                    this.logToStderr(`${e.name}: ${e.message}`);
+                    process.exitCode = 1;
+                }
+            }
+        });
     }
 }
 exports.default = default_1;

package/lib/commands/config/context/add.js

@@ -5,12 +5,14 @@ const core_1 = require("@oclif/core");
 const base_1 = tslib_1.__importDefault(require("../../../base"));
 const Context_1 = require("../../../models/Context");
 class ContextAdd extends base_1.default {
-    async run() {
-        const { args } = await this.parse(ContextAdd);
-        const contextName = args['context-name'];
-        const specFilePath = args['spec-file-path'];
-        await (0, Context_1.addContext)(contextName, specFilePath);
-        this.log(`Added context "${contextName}".\n\nYou can set it as your current context: asyncapi config context use ${contextName}\nYou can use this context when needed by passing ${contextName} as a parameter: asyncapi validate ${contextName}`);
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { args } = yield this.parse(ContextAdd);
+            const contextName = args['context-name'];
+            const specFilePath = args['spec-file-path'];
+            yield (0, Context_1.addContext)(contextName, specFilePath);
+            this.log(`Added context "${contextName}".\n\nYou can set it as your current context: asyncapi config context use ${contextName}\nYou can use this context when needed by passing ${contextName} as a parameter: asyncapi validate ${contextName}`);
+        });
     }
 }
 exports.default = ContextAdd;

package/lib/commands/config/context/current.js

@@ -5,9 +5,11 @@ const core_1 = require("@oclif/core");
 const base_1 = tslib_1.__importDefault(require("../../../base"));
 const Context_1 = require("../../../models/Context");
 class ContextCurrent extends base_1.default {
-    async run() {
-        const { current, context } = await (0, Context_1.getCurrentContext)();
-        this.log(`${current}: ${context}`);
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { current, context } = yield (0, Context_1.getCurrentContext)();
+            this.log(`${current}: ${context}`);
+        });
     }
 }
 exports.default = ContextCurrent;

package/lib/commands/config/context/index.js

@@ -4,10 +4,12 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const base_1 = tslib_1.__importDefault(require("../../../base"));
 class Context extends base_1.default {
-    async run() {
-        const Help = await (0, core_1.loadHelpClass)(this.config);
-        const help = new Help(this.config);
-        help.showHelp(['config', 'context', '--help']);
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const Help = yield (0, core_1.loadHelpClass)(this.config);
+            const help = new Help(this.config);
+            help.showHelp(['config', 'context', '--help']);
+        });
     }
 }
 exports.default = Context;

package/lib/commands/config/context/list.js

@@ -5,11 +5,13 @@ const core_1 = require("@oclif/core");
 const base_1 = tslib_1.__importDefault(require("../../../base"));
 const Context_1 = require("../../../models/Context");
 class ContextList extends base_1.default {
-    async run() {
-        const fileContent = await (0, Context_1.loadContextFile)();
-        for (const [contextName, filePath] of Object.entries(fileContent.store)) {
-            this.log(`${contextName}: ${filePath}`);
-        }
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const fileContent = yield (0, Context_1.loadContextFile)();
+            for (const [contextName, filePath] of Object.entries(fileContent.store)) {
+                this.log(`${contextName}: ${filePath}`);
+            }
+        });
     }
 }
 exports.default = ContextList;

package/lib/commands/config/context/remove.js

@@ -5,16 +5,18 @@ const core_1 = require("@oclif/core");
 const base_1 = tslib_1.__importDefault(require("../../../base"));
 const Context_1 = require("../../../models/Context");
 class ContextRemove extends base_1.default {
-    async run() {
-        const { args } = await this.parse(ContextRemove);
-        const contextName = args['context-name'];
-        try {
-            await (0, Context_1.removeContext)(contextName);
-            this.log(`${contextName} successfully deleted`);
-        }
-        catch (err) {
-            this.error(err);
-        }
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { args } = yield this.parse(ContextRemove);
+            const contextName = args['context-name'];
+            try {
+                yield (0, Context_1.removeContext)(contextName);
+                this.log(`${contextName} successfully deleted`);
+            }
+            catch (err) {
+                this.error(err);
+            }
+        });
     }
 }
 exports.default = ContextRemove;

package/lib/commands/config/context/use.js

@@ -5,11 +5,13 @@ const core_1 = require("@oclif/core");
 const base_1 = tslib_1.__importDefault(require("../../../base"));
 const Context_1 = require("../../../models/Context");
 class ContextUse extends base_1.default {
-    async run() {
-        const { args } = await this.parse(ContextUse);
-        const contextName = args['context-name'];
-        await (0, Context_1.setCurrentContext)(contextName);
-        this.log(`${contextName} is set as current`);
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { args } = yield this.parse(ContextUse);
+            const contextName = args['context-name'];
+            yield (0, Context_1.setCurrentContext)(contextName);
+            this.log(`${contextName} is set as current`);
+        });
     }
 }
 exports.default = ContextUse;

package/lib/commands/config/index.js

@@ -4,10 +4,12 @@ const tslib_1 = require("tslib");
 const base_1 = tslib_1.__importDefault(require("../../base"));
 const core_1 = require("@oclif/core");
 class Config extends base_1.default {
-    async run() {
-        const Help = await (0, core_1.loadHelpClass)(this.config);
-        const help = new Help(this.config);
-        help.showHelp(['config', '--help']);
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const Help = yield (0, core_1.loadHelpClass)(this.config);
+            const help = new Help(this.config);
+            help.showHelp(['config', '--help']);
+        });
     }
 }
 exports.default = Config;

package/lib/commands/convert.js

@@ -13,42 +13,44 @@ const converter_1 = require("@asyncapi/converter");
 const specs_1 = tslib_1.__importDefault(require("@asyncapi/specs"));
 const latestVersion = Object.keys(specs_1.default).pop();
 class Convert extends base_1.default {
-    async run() {
-        const { args, flags } = await this.parse(Convert);
-        const filePath = args['spec-file'];
-        let specFile;
-        let convertedFile;
-        try {
-            // LOAD FILE
-            specFile = await (0, SpecificationFile_1.load)(filePath);
-            // CONVERSION
-            convertedFile = (0, converter_1.convert)(specFile.text(), flags['target-version']);
-            if (convertedFile) {
-                if (specFile.getFilePath()) {
-                    this.log(`File ${specFile.getFilePath()} successfully converted!`);
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { args, flags } = yield this.parse(Convert);
+            const filePath = args['spec-file'];
+            let specFile;
+            let convertedFile;
+            try {
+                // LOAD FILE
+                specFile = yield (0, SpecificationFile_1.load)(filePath);
+                // CONVERSION
+                convertedFile = (0, converter_1.convert)(specFile.text(), flags['target-version']);
+                if (convertedFile) {
+                    if (specFile.getFilePath()) {
+                        this.log(`File ${specFile.getFilePath()} successfully converted!`);
+                    }
+                    else if (specFile.getFileURL()) {
+                        this.log(`URL ${specFile.getFileURL()} successfully converted!`);
+                    }
                 }
-                else if (specFile.getFileURL()) {
-                    this.log(`URL ${specFile.getFileURL()} successfully converted!`);
+                if (flags.output) {
+                    yield fs_1.promises.writeFile(`${flags.output}`, convertedFile, { encoding: 'utf8' });
+                }
+                else {
+                    this.log(convertedFile);
                 }
             }
-            if (flags.output) {
-                await fs_1.promises.writeFile(`${flags.output}`, convertedFile, { encoding: 'utf8' });
-            }
-            else {
-                this.log(convertedFile);
-            }
-        }
-        catch (err) {
-            if (err instanceof specification_file_1.SpecificationFileNotFound) {
-                this.error(new validation_error_1.ValidationError({
-                    type: 'invalid-file',
-                    filepath: filePath
-                }));
-            }
-            else {
-                this.error(err);
+            catch (err) {
+                if (err instanceof specification_file_1.SpecificationFileNotFound) {
+                    this.error(new validation_error_1.ValidationError({
+                        type: 'invalid-file',
+                        filepath: filePath
+                    }));
+                }
+                else {
+                    this.error(err);
+                }
             }
-        }
+        });
     }
 }
 exports.default = Convert;

package/lib/commands/diff.js

@@ -15,85 +15,87 @@ const globals_1 = require("../globals");
 const flags_1 = require("../flags");
 const { readFile } = fs_1.promises;
 class Diff extends base_1.default {
-    async run() {
-        const { args, flags } = await this.parse(Diff); // NOSONAR
-        const firstDocumentPath = args['old'];
-        const secondDocumentPath = args['new'];
-        const outputFormat = flags['format'];
-        const outputType = flags['type'];
-        const overrideFilePath = flags['overrides'];
-        const watchMode = flags['watch'];
-        let firstDocument, secondDocument;
-        try {
-            firstDocument = await (0, SpecificationFile_1.load)(firstDocumentPath);
-            enableWatch(watchMode, {
-                spec: firstDocument,
-                handler: this,
-                handlerName: 'diff',
-                docVersion: 'old',
-                label: 'DIFF_OLD',
-            });
-        }
-        catch (err) {
-            if (err instanceof specification_file_1.SpecificationFileNotFound) {
-                this.error(new validation_error_1.ValidationError({
-                    type: 'invalid-file',
-                    filepath: firstDocumentPath,
-                }));
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { args, flags } = yield this.parse(Diff); // NOSONAR
+            const firstDocumentPath = args['old'];
+            const secondDocumentPath = args['new'];
+            const outputFormat = flags['format'];
+            const outputType = flags['type'];
+            const overrideFilePath = flags['overrides'];
+            const watchMode = flags['watch'];
+            let firstDocument, secondDocument;
+            try {
+                firstDocument = yield (0, SpecificationFile_1.load)(firstDocumentPath);
+                enableWatch(watchMode, {
+                    spec: firstDocument,
+                    handler: this,
+                    handlerName: 'diff',
+                    docVersion: 'old',
+                    label: 'DIFF_OLD',
+                });
             }
-            this.error(err);
-        }
-        try {
-            secondDocument = await (0, SpecificationFile_1.load)(secondDocumentPath);
-            enableWatch(watchMode, {
-                spec: secondDocument,
-                handler: this,
-                handlerName: 'diff',
-                docVersion: 'new',
-                label: 'DIFF_NEW',
-            });
-        }
-        catch (err) {
-            if (err instanceof specification_file_1.SpecificationFileNotFound) {
-                this.error(new validation_error_1.ValidationError({
-                    type: 'invalid-file',
-                    filepath: secondDocumentPath,
-                }));
+            catch (err) {
+                if (err instanceof specification_file_1.SpecificationFileNotFound) {
+                    this.error(new validation_error_1.ValidationError({
+                        type: 'invalid-file',
+                        filepath: firstDocumentPath,
+                    }));
+                }
+                this.error(err);
             }
-            this.error(err);
-        }
-        let overrides = {};
-        if (overrideFilePath) {
             try {
-                overrides = await readOverrideFile(overrideFilePath);
+                secondDocument = yield (0, SpecificationFile_1.load)(secondDocumentPath);
+                enableWatch(watchMode, {
+                    spec: secondDocument,
+                    handler: this,
+                    handlerName: 'diff',
+                    docVersion: 'new',
+                    label: 'DIFF_NEW',
+                });
             }
             catch (err) {
+                if (err instanceof specification_file_1.SpecificationFileNotFound) {
+                    this.error(new validation_error_1.ValidationError({
+                        type: 'invalid-file',
+                        filepath: secondDocumentPath,
+                    }));
+                }
                 this.error(err);
             }
-        }
-        try {
-            const firstDocumentParsed = await parser.parse(firstDocument.text());
-            const secondDocumentParsed = await parser.parse(secondDocument.text());
-            const diffOutput = diff.diff(firstDocumentParsed.json(), secondDocumentParsed.json(), {
-                override: overrides,
-                outputType: outputFormat, // NOSONAR
-            });
-            if (outputFormat === 'json') {
-                this.outputJSON(diffOutput, outputType);
+            let overrides = {};
+            if (overrideFilePath) {
+                try {
+                    overrides = yield readOverrideFile(overrideFilePath);
+                }
+                catch (err) {
+                    this.error(err);
+                }
             }
-            else if (outputFormat === 'yaml' || outputFormat === 'yml') {
-                this.outputYAML(diffOutput, outputType);
+            try {
+                const firstDocumentParsed = yield parser.parse(firstDocument.text());
+                const secondDocumentParsed = yield parser.parse(secondDocument.text());
+                const diffOutput = diff.diff(firstDocumentParsed.json(), secondDocumentParsed.json(), {
+                    override: overrides,
+                    outputType: outputFormat, // NOSONAR
+                });
+                if (outputFormat === 'json') {
+                    this.outputJSON(diffOutput, outputType);
+                }
+                else if (outputFormat === 'yaml' || outputFormat === 'yml') {
+                    this.outputYAML(diffOutput, outputType);
+                }
+                else {
+                    this.log(`The output format ${outputFormat} is not supported at the moment.`);
+                }
             }
-            else {
-                this.log(`The output format ${outputFormat} is not supported at the moment.`);
+            catch (error) {
+                throw new validation_error_1.ValidationError({
+                    type: 'parser-error',
+                    err: error,
+                });
             }
-        }
-        catch (error) {
-            throw new validation_error_1.ValidationError({
-                type: 'parser-error',
-                err: error,
-            });
-        }
+        });
     }
     outputJSON(diffOutput, outputType) {
         if (outputType === 'breaking') {
@@ -169,20 +171,22 @@ Diff.args = [
  * @param path The path to override file
  * @returns The override object
  */
-async function readOverrideFile(path) {
-    let overrideStringData;
-    try {
-        overrideStringData = await readFile(path, { encoding: 'utf8' });
-    }
-    catch (err) {
-        throw new diff_error_1.DiffOverrideFileError();
-    }
-    try {
-        return JSON.parse(overrideStringData);
-    }
-    catch (err) {
-        throw new diff_error_1.DiffOverrideJSONError();
-    }
+function readOverrideFile(path) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let overrideStringData;
+        try {
+            overrideStringData = yield readFile(path, { encoding: 'utf8' });
+        }
+        catch (err) {
+            throw new diff_error_1.DiffOverrideFileError();
+        }
+        try {
+            return JSON.parse(overrideStringData);
+        }
+        catch (err) {
+            throw new diff_error_1.DiffOverrideJSONError();
+        }
+    });
 }
 /**
  * function to enable watchmode.

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

@@ -5,14 +5,14 @@ export default class Template extends Command {
     static examples: Example[];
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        'disable-hook': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
+        'disable-hook': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
         install: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         debug: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'no-overwrite': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
+        'no-overwrite': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
         output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         'force-write': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         watch: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        param: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
+        param: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
         'map-base-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static args: {