@asyncapi/cli 1.12.3 → 1.14.0

package/bin/dev

@@ -15,4 +15,3 @@ oclif.settings.debug = true;
 
 // Start the CLI
 oclif.run().then(oclif.flush).catch(oclif.Errors.handle)
-

package/bin/run

@@ -10,4 +10,3 @@ oclif.run()
     const oclifHandler = require('@oclif/core/handle');
     return oclifHandler(err.message);
   });
-

package/bin/run_bin

@@ -11,4 +11,3 @@ oclif.run()
     const oclifHandler = require('@oclif/core/handle');
     return oclifHandler(err.message);
   });
-

package/lib/base.d.ts

@@ -14,6 +14,7 @@ export default abstract class extends Command {
     recordActionFinished(action: string, metadata?: MetricMetadata, rawDocument?: string): Promise<void>;
     recordActionInvoked(action: string, metadata?: MetricMetadata): Promise<void>;
     recordActionMetric(recordFunc: (recorder: Recorder) => Promise<void>): Promise<void>;
+    setSource(): Promise<void>;
     finally(error: Error | undefined): Promise<any>;
     recorderFromEnv(prefix: string): Promise<Recorder>;
 }

package/lib/base.js

@@ -9,7 +9,7 @@ const fs_extra_1 = require("fs-extra");
 const fs_1 = require("fs");
 const uuid_1 = require("uuid");
 const os_1 = require("os");
-const { readFile, writeFile } = fs_1.promises;
+const { readFile, writeFile, stat } = fs_1.promises;
 class DiscardSink {
     send() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -86,6 +86,7 @@ class default_1 extends core_1.Command {
     recordActionMetric(recordFunc) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
+                yield this.setSource();
                 yield recordFunc(yield this.recorder);
                 yield (yield this.recorder).flush();
             }
@@ -96,6 +97,22 @@ class default_1 extends core_1.Command {
             }
         });
     }
+    setSource() {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const specFilePath = (_a = this.specFile) === null || _a === void 0 ? void 0 : _a.getFilePath();
+            if (!specFilePath) {
+                return;
+            }
+            try {
+                const stats = yield stat(specFilePath);
+                this.metricsMetadata['file_creation_timestamp'] = stats.birthtimeMs;
+            }
+            catch (e) {
+                // If there's an error with the file, we don't handle it here because it's expected to be handled and reported in the 'finally' method of the command.
+            }
+        });
+    }
     finally(error) {
         const _super = Object.create(null, {
             finally: { get: () => super.finally }

package/lib/commands/bundle.d.ts

@@ -1,14 +1,13 @@
-import { Example } from '@oclif/core/lib/interfaces';
 import Command from '../base';
 export default class Bundle extends Command {
     static readonly description = "Bundle one or multiple AsyncAPI Documents and their references together.";
     static strict: boolean;
-    static examples: Example[];
+    static examples: string[];
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        base: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        baseDir: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        base: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        baseDir: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         xOrigin: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/lib/commands/bundle.js

@@ -65,6 +65,7 @@ exports.default = Bundle;
 Bundle.description = 'Bundle one or multiple AsyncAPI Documents and their references together.';
 Bundle.strict = false;
 Bundle.examples = [
+    'asyncapi bundle ./asyncapi.yaml > final-asyncapi.yaml',
     'asyncapi bundle ./asyncapi.yaml --output final-asyncapi.yaml',
     'asyncapi bundle ./asyncapi.yaml ./features.yaml',
     'asyncapi bundle ./asyncapi.yaml ./features.yaml --base ./main.yaml',

package/lib/commands/config/context/add.d.ts

@@ -6,9 +6,8 @@ export default class ContextAdd extends Command {
         'set-current': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
+        'context-name': import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        'spec-file-path': import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
     run(): Promise<void>;
 }

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

@@ -41,11 +41,7 @@ ContextAdd.flags = {
         required: false,
     })
 };
-ContextAdd.args = [
-    { name: 'context-name', description: 'context name', required: true },
-    {
-        name: 'spec-file-path',
-        description: 'file path of the spec file',
-        required: true,
-    },
-];
+ContextAdd.args = {
+    'context-name': core_1.Args.string({ description: 'context name', required: true }),
+    'spec-file-path': core_1.Args.string({ description: 'file path of the spec file', required: true }),
+};

package/lib/commands/config/context/edit.d.ts

@@ -5,9 +5,8 @@ export default class ContextEdit extends Command {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
     };
     static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
+        'context-name': import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        'new-spec-file-path': import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
     run(): Promise<void>;
 }

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

@@ -34,11 +34,7 @@ ContextEdit.description = 'Edit a context in the store';
 ContextEdit.flags = {
     help: core_1.Flags.help({ char: 'h' }),
 };
-ContextEdit.args = [
-    { name: 'context-name', description: 'context name', required: true },
-    {
-        name: 'new-spec-file-path',
-        description: 'new file path of the spec file',
-        required: true,
-    },
-];
+ContextEdit.args = {
+    'context-name': core_1.Args.string({ description: 'context name', required: true }),
+    'new-spec-file-path': core_1.Args.string({ description: 'file path of the spec file', required: true }),
+};

package/lib/commands/config/context/init.d.ts

@@ -6,9 +6,7 @@ export default class ContextInit extends Command {
     };
     static contextFilePathMessage: string;
     static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
+        'context-file-path': import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
     run(): Promise<void>;
 }

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

@@ -23,10 +23,6 @@ ContextInit.contextFilePathMessage = `Specify directory in which context file sh
     - current directory          : asyncapi config context init . (default)
     - root of current repository : asyncapi config context init ./
     - user's home directory      : asyncapi config context init ~`;
-ContextInit.args = [
-    {
-        name: 'context-file-path',
-        description: `${ContextInit.contextFilePathMessage}`,
-        required: false,
-    },
-];
+ContextInit.args = {
+    'context-file-path': core_1.Args.string({ description: `${ContextInit.contextFilePathMessage}`, required: false })
+};

package/lib/commands/config/context/remove.d.ts

@@ -5,9 +5,7 @@ export default class ContextRemove extends Command {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
     };
     static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
+        'context-name': import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
     run(): Promise<void>;
 }

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

@@ -33,10 +33,6 @@ ContextRemove.description = 'Delete a context from the store';
 ContextRemove.flags = {
     help: core_1.Flags.help({ char: 'h' }),
 };
-ContextRemove.args = [
-    {
-        name: 'context-name',
-        description: 'Name of the context to delete',
-        required: true,
-    },
-];
+ContextRemove.args = {
+    'context-name': core_1.Args.string({ description: 'Name of the context to delete', required: true }),
+};

package/lib/commands/config/context/use.d.ts

@@ -5,9 +5,7 @@ export default class ContextUse extends Command {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
     };
     static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
+        'context-name': import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
     run(): Promise<void>;
 }

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

@@ -33,10 +33,6 @@ ContextUse.description = 'Set a context as current';
 ContextUse.flags = {
     help: core_1.Flags.help({ char: 'h' }),
 };
-ContextUse.args = [
-    {
-        name: 'context-name',
-        description: 'name of the saved context',
-        required: true,
-    },
-];
+ContextUse.args = {
+    'context-name': core_1.Args.string({ description: 'name of the saved context', required: true }),
+};

package/lib/commands/convert.d.ts

@@ -3,13 +3,11 @@ export default class Convert extends Command {
     static description: string;
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        'target-version': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'target-version': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
+        'spec-file': import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
     run(): Promise<void>;
 }

package/lib/commands/convert.js

@@ -73,6 +73,6 @@ Convert.flags = {
     output: core_1.Flags.string({ char: 'o', description: 'path to the file where the result is saved' }),
     'target-version': core_1.Flags.string({ char: 't', description: 'asyncapi version to convert to', default: latestVersion })
 };
-Convert.args = [
-    { name: 'spec-file', description: 'spec path, url, or context-name', required: false },
-];
+Convert.args = {
+    'spec-file': core_1.Args.string({ description: 'spec path, url, or context-name', required: false }),
+};

package/lib/commands/diff.d.ts

@@ -4,21 +4,20 @@ export default class Diff extends Command {
     static description: string;
     static flags: {
         'log-diagnostics': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<import("@stoplight/spectral-cli/dist/services/config").OutputFormat>;
-        'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<import("../parser").SeverityKind>;
+        'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<import("@stoplight/spectral-cli/dist/services/config").OutputFormat, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        format: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        type: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        markdownSubtype: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        overrides: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        format: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        type: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        markdownSubtype: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        overrides: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'no-error': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         watch: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
+        old: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        new: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
     run(): Promise<void>;
     outputJSON(diffOutput: AsyncAPIDiff, outputType: string): void;
     outputYAML(diffOutput: AsyncAPIDiff, outputType: string): void;

package/lib/commands/diff.js

@@ -167,18 +167,10 @@ Diff.flags = Object.assign({ help: core_1.Flags.help({ char: 'h' }), format: cor
     }), 'no-error': core_1.Flags.boolean({
         description: 'don\'t show error on breaking changes',
     }), watch: (0, flags_1.watchFlag)() }, (0, parser_1.validationFlags)({ logDiagnostics: false }));
-Diff.args = [
-    {
-        name: 'old',
-        description: 'old spec path, URL or context-name',
-        required: true,
-    },
-    {
-        name: 'new',
-        description: 'new spec path, URL or context-name',
-        required: true,
-    },
-];
+Diff.args = {
+    old: core_1.Args.string({ description: 'old spec path, URL or context-name', required: true }),
+    new: core_1.Args.string({ description: 'new spec path, URL or context-name', required: true }),
+};
 /**
  * A generic output function for diff output
  * @param diffOutput The diff output data

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

@@ -1,30 +1,34 @@
 import Command from '../../base';
 import { Parser } from '@asyncapi/parser';
-import type { Example } from '@oclif/core/lib/interfaces';
 export default class Template extends Command {
     static description: string;
-    static examples: Example[];
+    static examples: string[];
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        'disable-hook': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
+        '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>;
         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[] | undefined>;
-        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'no-overwrite': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         '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[] | undefined>;
-        'map-base-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        param: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'map-base-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'registry-url': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'registry-auth': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'registry-token': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     static args: {
-        name: string;
-        description: string;
-    }[];
+        asyncapi: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        template: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
     parser: Parser;
     run(): Promise<void>;
     private parseArgs;
     private parseFlags;
+    private registryURLParser;
+    private registryValidation;
     private paramParser;
     private disableHooksParser;
     private mapBaseURLParser;

package/lib/commands/generate/fromTemplate.js

@@ -17,6 +17,7 @@ const generator_error_1 = require("../../errors/generator-error");
 const parser_1 = require("@asyncapi/parser");
 const prompts_1 = require("@clack/prompts");
 const picocolors_1 = require("picocolors");
+const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const templatesNotSupportingV3 = {
     '@asyncapi/minimaltemplate': 'some link',
     '@asyncapi/dotnet-nats-template': 'https://github.com/asyncapi/dotnet-nats-template/issues/384',
@@ -84,7 +85,7 @@ class Template extends base_1.default {
                 template = parsedArgs.template;
                 output = parsedArgs.output;
             }
-            const parsedFlags = this.parseFlags(flags['disable-hook'], flags['param'], flags['map-base-url']);
+            const parsedFlags = this.parseFlags(flags['disable-hook'], flags['param'], flags['map-base-url'], flags['registry.url'], flags['registry.auth'], flags['registry.token']);
             const options = {
                 forceWrite: flags['force-write'],
                 install: flags.install,
@@ -93,6 +94,11 @@ class Template extends base_1.default {
                 noOverwriteGlobs: flags['no-overwrite'],
                 mapBaseUrlToFolder: parsedFlags.mapBaseUrlToFolder,
                 disabledHooks: parsedFlags.disableHooks,
+                registry: {
+                    url: flags['registry-url'],
+                    auth: flags['registry-auth'],
+                    token: flags['registry-token']
+                }
             };
             const asyncapiInput = (yield (0, SpecificationFile_1.load)(asyncapi)) || (yield (0, SpecificationFile_1.load)());
             this.specFile = asyncapiInput;
@@ -165,13 +171,32 @@ class Template extends base_1.default {
             return { asyncapi, template, output };
         });
     }
-    parseFlags(disableHooks, params, mapBaseUrl) {
+    parseFlags(disableHooks, params, mapBaseUrl, registryUrl, registryAuth, registryToken) {
         return {
             params: this.paramParser(params),
             disableHooks: this.disableHooksParser(disableHooks),
             mapBaseUrlToFolder: this.mapBaseURLParser(mapBaseUrl),
+            registryURLValidation: this.registryURLParser(registryUrl),
+            registryAuthentication: this.registryValidation(registryUrl, registryAuth, registryToken)
         };
     }
+    registryURLParser(input) {
+        if (!input) {
+            return;
+        }
+        const isURL = /^https?:/;
+        if (!isURL.test(input.toLowerCase())) {
+            throw new Error('Invalid --registry-url flag. The param requires a valid http/https url.');
+        }
+    }
+    registryValidation(registryUrl, registryAuth, registryToken) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const response = yield (0, node_fetch_1.default)(registryUrl);
+            if (response.status === 401 && !registryAuth && !registryToken) {
+                throw new Error('Need to pass either registryAuth in username:password encoded in Base64 or need to pass registryToken');
+            }
+        });
+    }
     paramParser(inputs) {
         if (!inputs) {
             return {};
@@ -363,8 +388,18 @@ Template.flags = {
     'map-base-url': core_1.Flags.string({
         description: 'Maps all schema references from base url to local folder'
     }),
+    'registry-url': core_1.Flags.string({
+        default: 'https://registry.npmjs.org',
+        description: 'Specifies the URL of the private registry for fetching templates and dependencies'
+    }),
+    'registry-auth': core_1.Flags.string({
+        description: 'The registry username and password encoded with base64, formatted as username:password'
+    }),
+    'registry-token': core_1.Flags.string({
+        description: 'The npm registry authentication token, that can be passed instead of base64 encoded username and password'
+    })
+};
+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 }),
 };
-Template.args = [
-    { name: 'asyncapi', description: '- Local path, url or context-name pointing to AsyncAPI file' },
-    { name: 'template', description: '- Name of the generator template like for example @asyncapi/html-template or https://github.com/asyncapi/html-template' },
-];

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

@@ -1,37 +1,32 @@
 import Command from '../../base';
 export default class Models extends Command {
     static description: string;
-    static args: ({
-        name: string;
-        description: string;
-        options: string[];
-    } | {
-        name: string;
-        description: string;
-        options?: undefined;
-    })[];
+    static args: {
+        language: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        file: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
     static flags: {
         'log-diagnostics': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<import("@stoplight/spectral-cli/dist/services/config").OutputFormat>;
-        'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<import("../../parser").SeverityKind>;
+        'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<import("@stoplight/spectral-cli/dist/services/config").OutputFormat, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         'no-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         /**
          * TypeScript specific options
          */
-        tsModelType: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        tsEnumType: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        tsModuleSystem: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        tsModelType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        tsEnumType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        tsModuleSystem: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         tsIncludeComments: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        tsExportType: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        tsExportType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         tsJsonBinPack: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         tsMarshalling: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         tsExampleInstance: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         /**
          * Go and Java specific package name to use for the generated models
          */
-        packageName: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        packageName: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         /**
          * Java specific options
          */
@@ -41,13 +36,13 @@ export default class Models extends Command {
         /**
          * C++ and C# and PHP specific namespace to use for the generated models
          */
-        namespace: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        namespace: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         /**
          * C# specific options
          */
         csharpAutoImplement: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         csharpNewtonsoft: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        csharpArrayType: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        csharpArrayType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         csharpHashcode: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         csharpEqual: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         csharpSystemJson: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;

package/lib/commands/generate/models.js

@@ -50,7 +50,7 @@ class Models extends base_1.default {
                 this.log(`Input is not a correct AsyncAPI document so it cannot be processed.${(0, parser_1.formatOutput)(severityErrors, 'stylish', 'error')}`);
                 return;
             }
-            // Modelina, atm, is not using @asyncapi/parser@v3.x but @asyncapi/parser@v2.x, so it still uses Parser-API v1.0.0. 
+            // Modelina, atm, is not using @asyncapi/parser@v3.x but @asyncapi/parser@v2.x, so it still uses Parser-API v1.0.0.
             // This call converts the parsed document object using @asyncapi/parser@v3.x (Parser-API v2) to a document compatible with the Parser-API version in use in @asyncapi/parser@v2.x  (v1)
             // This is needed until https://github.com/asyncapi/modelina/issues/1493 gets fixed.
             const convertedDoc = (0, multi_parser_1.ConvertDocumentParserAPIVersion)(document.json(), 1);
@@ -276,14 +276,10 @@ class Models extends base_1.default {
 }
 exports.default = Models;
 Models.description = 'Generates typed models';
-Models.args = [
-    {
-        name: 'language',
-        description: 'The language you want the typed models generated for.',
-        options: Object.keys(Languages),
-    },
-    { name: 'file', description: 'Path or URL to the AsyncAPI document, or context-name' },
-];
+Models.args = {
+    language: core_1.Args.string({ description: 'The language you want the typed models generated for.', options: Object.keys(Languages), required: true }),
+    file: core_1.Args.string({ description: 'Path or URL to the AsyncAPI document, or context-name', required: true }),
+};
 Models.flags = Object.assign({ help: core_1.Flags.help({ char: 'h' }), 'no-interactive': core_1.Flags.boolean({
         description: 'Disable interactive mode and run with the provided flags.',
         required: false,

package/lib/commands/new/file.d.ts

@@ -3,10 +3,10 @@ export default class NewFile extends Command {
     static description: string;
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        'file-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        example: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'file-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        example: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         studio: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        port: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
+        port: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'no-tty': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static examples: string[];

package/lib/commands/new/glee.d.ts

@@ -10,9 +10,9 @@ export default class NewGlee extends Command {
     };
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        name: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        template: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        file: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        name: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        template: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        file: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'force-write': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     getFilteredServers(serversObject: any): Promise<string[]>;

package/lib/commands/optimize.d.ts

@@ -1,5 +1,4 @@
 import Command from '../base';
-import { Example } from '@oclif/core/lib/interfaces';
 import { Parser } from '@asyncapi/parser';
 export declare enum Optimizations {
     REMOVE_COMPONENTS = "remove-components",
@@ -17,18 +16,16 @@ export default class Optimize extends Command {
     isInteractive: boolean;
     selectedOptimizations?: Optimizations[];
     outputMethod?: Outputs;
-    static examples: Example[];
+    static examples: string[];
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        optimization: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
-        output: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        optimization: import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         'no-tty': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
+        'spec-file': import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
     parser: Parser;
     run(): Promise<void>;
     private showOptimizations;

package/lib/commands/optimize.js

@@ -201,6 +201,6 @@ Optimize.flags = {
     output: core_1.Flags.string({ char: 'o', default: Outputs.TERMINAL, options: Object.values(Outputs), description: 'select where you want the output.' }),
     'no-tty': core_1.Flags.boolean({ description: 'do not use an interactive terminal', default: false }),
 };
-Optimize.args = [
-    { name: 'spec-file', description: 'spec path, url, or context-name', required: false },
-];
+Optimize.args = {
+    'spec-file': core_1.Args.string({ description: 'spec path, url, or context-name', required: false }),
+};

package/lib/commands/start/studio.d.ts

@@ -3,9 +3,8 @@ export default class StartStudio extends Command {
     static description: string;
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        file: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        port: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
+        file: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        port: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
-    static args: never[];
     run(): Promise<void>;
 }

package/lib/commands/start/studio.js

@@ -22,4 +22,3 @@ StartStudio.flags = {
     file: core_1.Flags.string({ char: 'f', description: 'path to the AsyncAPI file to link with Studio' }),
     port: core_1.Flags.integer({ char: 'p', description: 'port in which to start Studio' }),
 };
-StartStudio.args = [];

package/lib/commands/validate.d.ts

@@ -3,15 +3,13 @@ export default class Validate extends Command {
     static description: string;
     static flags: {
         'log-diagnostics': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<import("@stoplight/spectral-cli/dist/services/config").OutputFormat>;
-        'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<import("../parser").SeverityKind>;
+        'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<import("@stoplight/spectral-cli/dist/services/config").OutputFormat, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         watch: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
+        'spec-file': import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
     run(): Promise<void>;
 }

package/lib/commands/validate.js

@@ -28,6 +28,6 @@ class Validate extends base_1.default {
 exports.default = Validate;
 Validate.description = 'validate asyncapi file';
 Validate.flags = Object.assign({ help: core_1.Flags.help({ char: 'h' }), watch: (0, flags_1.watchFlag)() }, (0, parser_1.validationFlags)());
-Validate.args = [
-    { name: 'spec-file', description: 'spec path, url, or context-name', required: false },
-];
+Validate.args = {
+    'spec-file': core_1.Args.string({ description: 'spec path, url, or context-name', required: false }),
+};

package/lib/hooks/command_not_found/myhook.js

@@ -32,7 +32,7 @@ const hook = function (opts) {
             // if valid topic, update binHelp with topic
             binHelp = `${binHelp} ${idSplit[0]}`;
         }
-        //if there is a topic in the opts we just upgrade the our commnad like 
+        //if there is a topic in the opts we just upgrade the our commnad like
         // alter the suggestion in the help scenario so that help is the first command
         // otherwise the user will be presented 'did you mean 'help'?' instead of 'did you mean "help <command>"?'
         let suggestion = (/:?help:?/).test(opts.id)
@@ -46,7 +46,7 @@ const hook = function (opts) {
             if (opts.id === 'help') {
                 readableSuggestion = '--help';
             }
-            response = yield core_1.CliUx.ux.prompt(`Did you mean ${chalk_1.default.blueBright(readableSuggestion)}? [y/n]`, { timeout: 10000 });
+            response = yield core_1.ux.prompt(`Did you mean ${chalk_1.default.blueBright(readableSuggestion)}? [y/n]`, { timeout: 10000 });
         }
         catch (error) {
             this.log('');

package/lib/parser.d.ts

@@ -14,10 +14,10 @@ export declare enum ValidationStatus {
 }
 export declare function validationFlags({ logDiagnostics }?: ValidationFlagsOptions): {
     'log-diagnostics': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<OutputFormat>;
-    'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<SeverityKind>;
+    'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<OutputFormat, import("@oclif/core/lib/interfaces").CustomOptions>;
+    'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
 };
-interface ValidateOptions {
+export interface ValidateOptions {
     'log-diagnostics'?: boolean;
     'diagnostics-format'?: `${OutputFormat}`;
     'fail-severity'?: SeverityKind;

package/lib/parser.js

@@ -36,16 +36,16 @@ function validationFlags({ logDiagnostics = true } = {}) {
             default: logDiagnostics,
             allowNo: true,
         }),
-        'diagnostics-format': core_1.Flags.enum({
+        'diagnostics-format': core_1.Flags.option({
             description: 'format to use for validation diagnostics',
             options: Object.values(config_1.OutputFormat),
             default: config_1.OutputFormat.STYLISH,
-        }),
-        'fail-severity': core_1.Flags.enum({
+        })(),
+        'fail-severity': core_1.Flags.option({
             description: 'diagnostics of this level or above will trigger a failure exit code',
             options: ['error', 'warn', 'info', 'hint'],
             default: 'error',
-        }),
+        })(),
     };
 }
 exports.validationFlags = validationFlags;

package/oclif.manifest.json

@@ -5,6 +5,7 @@
       "args": {},
       "description": "Bundle one or multiple AsyncAPI Documents and their references together.",
       "examples": [
+        "asyncapi bundle ./asyncapi.yaml > final-asyncapi.yaml",
         "asyncapi bundle ./asyncapi.yaml --output final-asyncapi.yaml",
         "asyncapi bundle ./asyncapi.yaml ./features.yaml",
         "asyncapi bundle ./asyncapi.yaml ./features.yaml --base ./main.yaml",
@@ -212,7 +213,6 @@
           "name": "diagnostics-format",
           "default": "stylish",
           "hasDynamicHelp": false,
-          "helpValue": "(json|stylish|junit|html|text|teamcity|pretty)",
           "multiple": false,
           "options": [
             "json",
@@ -230,7 +230,6 @@
           "name": "fail-severity",
           "default": "error",
           "hasDynamicHelp": false,
-          "helpValue": "(error|warn|info|hint)",
           "multiple": false,
           "options": [
             "error",
@@ -370,7 +369,6 @@
           "name": "diagnostics-format",
           "default": "stylish",
           "hasDynamicHelp": false,
-          "helpValue": "(json|stylish|junit|html|text|teamcity|pretty)",
           "multiple": false,
           "options": [
             "json",
@@ -388,7 +386,6 @@
           "name": "fail-severity",
           "default": "error",
           "hasDynamicHelp": false,
-          "helpValue": "(error|warn|info|hint)",
           "multiple": false,
           "options": [
             "error",
@@ -515,11 +512,13 @@
       "args": {
         "asyncapi": {
           "description": "- Local path, url or context-name pointing to AsyncAPI file",
-          "name": "asyncapi"
+          "name": "asyncapi",
+          "required": true
         },
         "template": {
           "description": "- Name of the generator template like for example @asyncapi/html-template or https://github.com/asyncapi/html-template",
-          "name": "template"
+          "name": "template",
+          "required": true
         }
       },
       "description": "Generates whatever you want using templates compatible with AsyncAPI Generator.",
@@ -605,6 +604,28 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "registry-url": {
+          "description": "Specifies the URL of the private registry for fetching templates and dependencies",
+          "name": "registry-url",
+          "default": "https://registry.npmjs.org",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "registry-auth": {
+          "description": "The registry username and password encoded with base64, formatted as username:password",
+          "name": "registry-auth",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "registry-token": {
+          "description": "The npm registry authentication token, that can be passed instead of base64 encoded username and password",
+          "name": "registry-token",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -660,11 +681,13 @@
             "kotlin",
             "php",
             "cplusplus"
-          ]
+          ],
+          "required": true
         },
         "file": {
           "description": "Path or URL to the AsyncAPI document, or context-name",
-          "name": "file"
+          "name": "file",
+          "required": true
         }
       },
       "description": "Generates typed models",
@@ -868,7 +891,6 @@
           "name": "diagnostics-format",
           "default": "stylish",
           "hasDynamicHelp": false,
-          "helpValue": "(json|stylish|junit|html|text|teamcity|pretty)",
           "multiple": false,
           "options": [
             "json",
@@ -886,7 +908,6 @@
           "name": "fail-severity",
           "default": "error",
           "hasDynamicHelp": false,
-          "helpValue": "(error|warn|info|hint)",
           "multiple": false,
           "options": [
             "error",
@@ -1260,7 +1281,7 @@
           "required": true
         },
         "new-spec-file-path": {
-          "description": "new file path of the spec file",
+          "description": "file path of the spec file",
           "name": "new-spec-file-path",
           "required": true
         }
@@ -1448,5 +1469,5 @@
       ]
     }
   },
-  "version": "1.12.3"
+  "version": "1.14.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "1.12.3",
+  "version": "1.14.0",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -21,7 +21,7 @@
     "@asyncapi/raml-dt-schema-parser": "^4.0.22",
     "@asyncapi/studio": "^0.20.0",
     "@clack/prompts": "^0.7.0",
-    "@oclif/core": "^1.26.2",
+    "@oclif/core": "^3",
     "@oclif/errors": "^1.3.6",
     "@oclif/plugin-not-found": "^2.3.22",
     "@smoya/asyncapi-adoption-metrics": "^2.4.7",
@@ -169,6 +169,7 @@
     "release": "semantic-release",
     "test": "npm run test:unit",
     "test:unit": "cross-env NODE_ENV=development TEST=1 CUSTOM_CONTEXT_FILENAME=\"test.asyncapi-cli\" CUSTOM_CONTEXT_FILE_LOCATION=\"\" nyc --extension .ts mocha --require ts-node/register --require test/helpers/init.js --reporter spec --timeout 100000 \"test/**/*.test.ts\"",
+    "test:one": "cross-env NODE_ENV=development TEST=1 CUSTOM_CONTEXT_FILENAME=\"test.asyncapi-cli\" CUSTOM_CONTEXT_FILE_LOCATION=\"\" nyc --extension .ts mocha --require ts-node/register --require test/helpers/init.js --reporter spec --timeout 100000",
     "get-version": "echo $npm_package_version",
     "createhook": "oclif generate hook myhook --event=command_not_found",
     "createhookinit": "oclif generate hook inithook --event=init"