@asyncapi/cli 3.4.1 → 3.5.0

package/lib/apps/api/middlewares/validation.middleware.js

@@ -169,6 +169,15 @@ function validationMiddleware(options) {
                     if (Array.isArray(body)) {
                         const results = yield validateListDocuments(body, resolveURL, validationService);
                         const parsedDocuments = results.map((result) => result.document);
+                        if (!parsedDocuments.every(doc => doc !== undefined)) {
+                            throw new problem_exception_1.ProblemException({
+                                type: 'invalid-asyncapi-document-parse',
+                                title: 'Invalid AsyncAPI Document (Parse Error)',
+                                status: 422,
+                                detail: 'One or more provided AsyncAPI documents are invalid.',
+                                diagnostics: results.flatMap(result => result.diagnostics || []),
+                            });
+                        }
                         req.asyncapi.parsedDocuments = parsedDocuments;
                         req.asyncapi.validationResults = results;
                     }

package/lib/apps/cli/commands/generate/client.d.ts

@@ -0,0 +1,30 @@
+import { BaseGeneratorCommand } from '../../internal/base/BaseGeneratorCommand';
+export default class Client extends BaseGeneratorCommand {
+    static description: string;
+    static examples: string[];
+    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>;
+        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, 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, 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: {
+        asyncapi: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        language: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+    private parseArgs;
+    private getTemplateName;
+}

package/lib/apps/cli/commands/generate/client.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const BaseGeneratorCommand_1 = require("../../internal/base/BaseGeneratorCommand");
+// eslint-disable-next-line
+// @ts-ignore
+const generator_v2_1 = require("generator-v2");
+const prompts_1 = require("@clack/prompts");
+const picocolors_1 = require("picocolors");
+const clients_flags_1 = require("../../internal/flags/generate/clients.flags");
+const flags_1 = require("../../../../utils/generate/flags");
+const prompts_2 = require("../../../../utils/generate/prompts");
+const ClientLanguages_1 = require("../../../../domains/models/generate/ClientLanguages");
+const generator_error_1 = require("../../../../errors/generator-error");
+class Client extends BaseGeneratorCommand_1.BaseGeneratorCommand {
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            const { args, flags } = yield this.parse(Client); // NOSONAR
+            const interactive = !flags['no-interactive'];
+            let asyncapi = (_a = args['asyncapi']) !== null && _a !== void 0 ? _a : '';
+            let language = args['language'];
+            let output = flags.output;
+            const { proxyPort, proxyHost } = flags;
+            if (interactive) {
+                (0, prompts_1.intro)((0, picocolors_1.inverse)('Client generation with AsyncAPI Generator'));
+                (0, prompts_1.note)((0, picocolors_1.yellow)('This feature is in the experimental phase. Please provide feedback at: https://github.com/asyncapi/generator/issues'));
+                const parsedArgs = yield this.parseArgs(args, output);
+                asyncapi = parsedArgs.asyncapi;
+                language = parsedArgs.language;
+                output = parsedArgs.output;
+            }
+            const template = this.getTemplateName(language);
+            const parsedFlags = (0, flags_1.parseGeneratorFlags)(flags['disable-hook'], flags['param'], flags['map-base-url'], flags['registry-url'], flags['registry-auth'], flags['registry-token']);
+            const options = yield this.buildGeneratorOptions(flags, parsedFlags);
+            // Apply proxy configuration using base class method
+            asyncapi = this.applyProxyConfiguration(asyncapi, proxyHost, proxyPort);
+            const asyncapiInput = yield this.loadAsyncAPIInput(asyncapi);
+            this.specFile = asyncapiInput;
+            this.metricsMetadata.language = language;
+            const watchTemplate = flags['watch'];
+            const genOption = this.buildGenOption(flags, parsedFlags);
+            // Use GeneratorService with new generator (v2) for client generation
+            const specification = yield this.loadSpecificationSafely(asyncapi);
+            const result = yield this.generatorService.generateUsingNewGenerator(specification, template, output, options, // GeneratorService expects different options interface
+            genOption);
+            if (!result.success) {
+                throw new generator_error_1.GeneratorError(new Error(result.error));
+            }
+            this.log((_c = (_b = result.data) === null || _b === void 0 ? void 0 : _b.logs) === null || _c === void 0 ? void 0 : _c.join('\n'));
+            if (watchTemplate) {
+                yield this.handleWatchMode(asyncapi, template, output, options, genOption, interactive);
+            }
+        });
+    }
+    parseArgs(args, output) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            // Use base class method for common args
+            const commonArgs = yield this.parseCommonArgs(args, output);
+            let language = args['language'];
+            if (!language) {
+                const defaultLanguage = (0, ClientLanguages_1.getDefaultLanguage)();
+                language = (yield (0, prompts_2.promptForLanguage)(defaultLanguage));
+            }
+            this.handleCancellation(language);
+            return {
+                asyncapi: commonArgs.asyncapi,
+                language,
+                output: commonArgs.output
+            };
+        });
+    }
+    getTemplateName(language) {
+        var _a;
+        const template = (_a = (0, generator_v2_1.listBakedInTemplates)({ type: 'client' }).find((template) => {
+            return template.target === language;
+        })) === null || _a === void 0 ? void 0 : _a.name;
+        if (!template) {
+            this.log(`❌ Client generation for "${language}" is not yet available.`);
+            this.log(`✅ Available languages: ${ClientLanguages_1.availableLanguages.join(', ')}`);
+            this.log('🙏 Help us create the missing one. Start discussion at: https://github.com/asyncapi/generator/issues.');
+            this.exit(1);
+        }
+        return template;
+    }
+}
+Client.description = `Generates clients baked-in AsyncAPI Generator. Available for: ${ClientLanguages_1.availableLanguages.join(', ')}. If some language is not supported or you want to improve existing client, join us at https://github.com/asyncapi/generator`;
+Client.examples = [
+    'asyncapi generate client javascript asyncapi.yaml --param version=1.0.0 singleFile=true --output ./docs --force-write'
+];
+Client.flags = Object.assign(Object.assign({}, (0, clients_flags_1.clientsFlags)()), BaseGeneratorCommand_1.BaseGeneratorCommand.flags);
+Client.args = Object.assign({ language: core_1.Args.string({ description: `The language you want the client generated for. Available target languages: ${ClientLanguages_1.availableLanguages.join(', ')}`, required: true }) }, BaseGeneratorCommand_1.BaseGeneratorCommand.args);
+exports.default = Client;

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

@@ -1,12 +1,35 @@
-import Command from '../../internal/base';
-import { Parser } from '@asyncapi/parser';
-export default class Template extends Command {
+import { BaseGeneratorCommand } from '../../internal/base/BaseGeneratorCommand';
+export default class Template extends BaseGeneratorCommand {
     static description: string;
-    private generatorService;
     static examples: string[];
     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>;
+        'use-new-generator': {
+            name: string;
+            char?: import("@oclif/core/lib/interfaces").AlphabetLowercase | import("@oclif/core/lib/interfaces").AlphabetUppercase;
+            summary?: string;
+            description: string;
+            helpLabel?: string;
+            helpGroup?: string;
+            env?: string;
+            hidden?: boolean;
+            required?: boolean;
+            dependsOn?: string[];
+            exclusive?: string[];
+            exactlyOne?: string[];
+            relationships?: import("@oclif/core/lib/interfaces/parser").Relationship[];
+            deprecated?: true | import("@oclif/core/lib/interfaces").Deprecation;
+            aliases?: string[];
+            charAliases?: (import("@oclif/core/lib/interfaces").AlphabetLowercase | import("@oclif/core/lib/interfaces").AlphabetUppercase)[];
+            deprecateAliases?: boolean;
+            noCacheDefault?: boolean;
+            atLeastOne?: string[];
+            type: "boolean";
+            allowNo: boolean;
+            default: import("@oclif/core/lib/interfaces/parser").FlagDefault<boolean>;
+            parse: (input: boolean, context: import("@oclif/core/lib/interfaces/parser").FlagParserContext, opts: import("@oclif/core/lib/interfaces/parser").FlagProps & import("@oclif/core/lib/interfaces/parser").BooleanFlagProps) => Promise<boolean>;
+        };
         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>;
@@ -21,22 +44,11 @@ export default class Template extends Command {
         '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>;
-        'use-new-generator': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        asyncapi: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
         template: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        asyncapi: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
-    parser: Parser;
     run(): Promise<undefined>;
     private parseArgs;
-    private disableHooksParser;
-    private parseFlags;
-    private registryURLParser;
-    private registryValidation;
-    private paramParser;
-    private mapBaseURLParser;
-    private runWatchMode;
-    private watcherHandler;
-    private getMapBaseUrlToFolderResolver;
 }

package/lib/apps/cli/commands/generate/fromTemplate.js

@@ -2,57 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const base_1 = tslib_1.__importDefault(require("../../internal/base"));
-// eslint-disable-next-line
-// @ts-ignore
-const generator_1 = tslib_1.__importDefault(require("@asyncapi/generator"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
+const BaseGeneratorCommand_1 = require("../../internal/base/BaseGeneratorCommand");
 const SpecificationFile_1 = require("../../../../domains/models/SpecificationFile");
-const fileWatcher_1 = require("../../../../utils/fileWatcher");
 const validation_error_1 = require("../../../../errors/validation-error");
 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 fromTemplate_flags_1 = require("../../internal/flags/generate/fromTemplate.flags");
-const proxy_flags_1 = require("../../internal/flags/proxy.flags");
-const generator_service_1 = require("../../../../domains/services/generator.service");
-class Template extends base_1.default {
-    constructor() {
-        super(...arguments);
-        this.generatorService = new generator_service_1.GeneratorService(true);
-        this.parser = new parser_1.Parser();
-        this.getMapBaseUrlToFolderResolver = (urlToFolder) => {
-            return {
-                order: 1,
-                canRead() {
-                    return true;
-                },
-                read(file) {
-                    const baseUrl = urlToFolder.url;
-                    const baseDir = urlToFolder.folder;
-                    return new Promise((resolve, reject) => {
-                        let localpath = file.url;
-                        localpath = localpath.replace(baseUrl, baseDir);
-                        try {
-                            fs_1.default.readFile(localpath, (err, data) => {
-                                if (err) {
-                                    reject(`Error opening file "${localpath}"`);
-                                }
-                                else {
-                                    resolve(data);
-                                }
-                            });
-                        }
-                        catch (err) {
-                            reject(`Error opening file "${localpath}"`);
-                        }
-                    });
-                },
-            };
-        };
-    }
+const flags_1 = require("../../../../utils/generate/flags");
+const prompts_2 = require("../../../../utils/generate/prompts");
+const inProgressMsg = 'Generation in progress. Keep calm and wait a bit';
+class Template extends BaseGeneratorCommand_1.BaseGeneratorCommand {
     // eslint-disable-next-line sonarjs/cognitive-complexity
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -70,48 +30,30 @@ 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'], flags['registry.url'], flags['registry.auth'], flags['registry.token']);
-            const options = {
-                forceWrite: flags['force-write'],
-                install: flags.install,
-                debug: flags.debug,
-                templateParams: parsedFlags.params,
-                noOverwriteGlobs: flags['no-overwrite'],
-                mapBaseUrlToFolder: parsedFlags.mapBaseUrlToFolder,
-                disabledHooks: parsedFlags.disableHooks,
-                registry: {
-                    url: flags['registry-url'],
-                    auth: flags['registry-auth'],
-                    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)());
+            const parsedFlags = (0, flags_1.parseGeneratorFlags)(flags['disable-hook'], flags['param'], flags['map-base-url'], flags['registry-url'], flags['registry-auth'], flags['registry-token']);
+            const options = yield this.buildGeneratorOptions(flags, parsedFlags);
+            // Apply proxy configuration using base class method
+            asyncapi = this.applyProxyConfiguration(asyncapi, proxyHost, proxyPort);
+            const asyncapiInput = yield this.loadAsyncAPIInput(asyncapi);
             this.specFile = asyncapiInput;
             this.metricsMetadata.template = template;
             const watchTemplate = flags['watch'];
-            const genOption = {};
-            if (flags['map-base-url']) {
-                genOption.resolve = {
-                    resolve: this.getMapBaseUrlToFolderResolver(parsedFlags.mapBaseUrlToFolder),
-                };
-            }
+            const genOption = this.buildGenOption(flags, parsedFlags);
             let specification;
             try {
                 specification = yield (0, SpecificationFile_1.load)(asyncapi);
             }
             catch (err) {
                 return this.error(new validation_error_1.ValidationError({
+                    // eslint-disable-next-line sonarjs/no-duplicate-string
                     type: 'invalid-file',
                     filepath: asyncapi,
                 }), { exit: 1 });
             }
             if (flags['use-new-generator']) {
-                this.log('Generation in progress. Keep calm and wait a bit');
-                const result = yield this.generatorService.generateUsingNewGenerator(specification, template, output, options, genOption);
+                this.log(inProgressMsg);
+                const result = yield this.generatorService.generateUsingNewGenerator(specification, template, output, options, // GeneratorService expects different options interface
+                genOption);
                 if (!result.success) {
                     throw new generator_error_1.GeneratorError(new Error(result.error));
                 }
@@ -120,231 +62,31 @@ class Template extends base_1.default {
                 }
             }
             else {
-                const result = yield this.generatorService.generate(specification, template, output, options, genOption, interactive);
+                const result = yield this.generatorService.generate(specification, template, output, options, // GeneratorService expects different options interface
+                genOption, interactive);
                 if (!result.success) {
                     throw new generator_error_1.GeneratorError(new Error(result.error));
                 }
             }
             if (watchTemplate) {
-                const watcherHandler = this.watcherHandler(asyncapi, template, output, options, genOption, interactive);
-                yield this.runWatchMode(asyncapi, template, output, watcherHandler);
+                yield this.handleWatchMode(asyncapi, template, output, options, genOption, interactive);
             }
         });
     }
     parseArgs(args, output) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let asyncapi = args['asyncapi'];
+            // Use base class method for common args
+            const commonArgs = yield this.parseCommonArgs(args, output);
             let template = args['template'];
-            const cancellationMessage = 'Operation cancelled';
-            if (!asyncapi) {
-                asyncapi = yield (0, prompts_1.text)({
-                    message: 'Please provide the path to the AsyncAPI document',
-                    placeholder: 'asyncapi.yaml',
-                    defaultValue: 'asyncapi.yaml',
-                    validate(value) {
-                        if (!value) {
-                            return 'The path to the AsyncAPI document is required';
-                        }
-                        else if (!fs_1.default.existsSync(value)) {
-                            return 'The file does not exist';
-                        }
-                    },
-                });
-            }
-            if ((0, prompts_1.isCancel)(asyncapi)) {
-                this.error(cancellationMessage, { exit: 1 });
-            }
             if (!template) {
-                template = yield (0, prompts_1.text)({
-                    message: 'Please provide the name of the generator template',
-                    placeholder: '@asyncapi/html-template',
-                    defaultValue: '@asyncapi/html-template',
-                });
-            }
-            if (!output) {
-                output = (yield (0, prompts_1.text)({
-                    message: 'Please provide the output directory',
-                    placeholder: './docs',
-                    validate(value) {
-                        if (!value) {
-                            return 'The output directory is required';
-                        }
-                        else if (typeof value !== 'string') {
-                            return 'The output directory must be a string';
-                        }
-                    },
-                }));
-            }
-            if ((0, prompts_1.isCancel)(output) || (0, prompts_1.isCancel)(template)) {
-                this.error(cancellationMessage, { exit: 1 });
-            }
-            return { asyncapi, template, output };
-        });
-    }
-    disableHooksParser(inputs) {
-        if (!inputs) {
-            return {};
-        }
-        const disableHooks = {};
-        for (const input of inputs) {
-            const [hookType, hookNames] = input.split(/=/);
-            if (!hookType) {
-                throw new Error('Invalid --disable-hook flag. It must be in the format of: --disable-hook <hookType> or --disable-hook <hookType>=<hookName1>,<hookName2>,...');
-            }
-            if (hookNames) {
-                disableHooks[String(hookType)] = hookNames.split(',');
-            }
-            else {
-                disableHooks[String(hookType)] = true;
-            }
-        }
-        return disableHooks;
-    }
-    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* () {
-            if (!registryUrl) {
-                return;
-            }
-            try {
-                const response = yield fetch(registryUrl);
-                if (response.status === 401 && !registryAuth && !registryToken) {
-                    this.error('You Need to pass either registryAuth in username:password encoded in Base64 or need to pass registryToken', { exit: 1 });
-                }
-            }
-            catch (error) {
-                this.error(`Can't fetch registryURL: ${registryUrl}`, { exit: 1 });
-            }
-        });
-    }
-    paramParser(inputs) {
-        if (!inputs) {
-            return {};
-        }
-        const params = {};
-        for (const input of inputs) {
-            if (!input.includes('=')) {
-                throw new Error(`Invalid param ${input}. It must be in the format of --param name1=value1 name2=value2 `);
-            }
-            const [paramName, paramValue] = input.split(/=(.+)/, 2);
-            params[String(paramName)] = paramValue;
-        }
-        return params;
-    }
-    mapBaseURLParser(input) {
-        if (!input) {
-            return;
-        }
-        const mapBaseURLToFolder = {};
-        const re = /(.*):(.*)/g; // NOSONAR
-        let mapping = [];
-        if ((mapping = re.exec(input)) === null || mapping.length !== 3) {
-            throw new Error('Invalid --map-base-url flag. A mapping <url>:<folder> with delimiter : expected.');
-        }
-        mapBaseURLToFolder.url = mapping[1].replace(/\/$/, '');
-        mapBaseURLToFolder.folder = path_1.default.resolve(mapping[2]);
-        const isURL = /^https?:/;
-        if (!isURL.test(mapBaseURLToFolder.url.toLowerCase())) {
-            throw new Error('Invalid --map-base-url flag. The mapping <url>:<folder> requires a valid http/https url and valid folder with delimiter `:`.');
-        }
-        return mapBaseURLToFolder;
-    }
-    runWatchMode(asyncapi, template, output, watchHandler) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const specification = yield (0, SpecificationFile_1.load)(asyncapi);
-            const watchDir = path_1.default.resolve(template);
-            const outputPath = path_1.default.resolve(watchDir, output);
-            const transpiledTemplatePath = path_1.default.resolve(watchDir, generator_1.default.TRANSPILED_TEMPLATE_LOCATION);
-            const ignorePaths = [outputPath, transpiledTemplatePath];
-            const specificationFile = specification.getFilePath();
-            // Template name is needed as it is not always a part of the cli commad
-            // There is a use case that you run generator from a root of the template with `./` path
-            let templateName = '';
-            try {
-                // eslint-disable-next-line
-                templateName = require(path_1.default.resolve(watchDir, 'package.json')).name;
-            }
-            catch (err) {
-                // intentional
-            }
-            let watcher;
-            if (specificationFile) {
-                // is local AsyncAPI file
-                this.log(`[WATCHER] Watching for changes in the template directory ${(0, picocolors_1.magenta)(watchDir)} and in the AsyncAPI file ${(0, picocolors_1.magenta)(specificationFile)}`);
-                watcher = new fileWatcher_1.Watcher([specificationFile, watchDir], ignorePaths);
-            }
-            else {
-                this.log(`[WATCHER] Watching for changes in the template directory ${(0, picocolors_1.magenta)(watchDir)}`);
-                watcher = new fileWatcher_1.Watcher(watchDir, ignorePaths);
-            }
-            // Must check template in its installation path in generator to use isLocalTemplate function
-            if (!(yield (0, fileWatcher_1.isLocalTemplate)(path_1.default.resolve(generator_1.default.DEFAULT_TEMPLATES_DIR, templateName)))) {
-                this.warn(`WARNING: ${template} is a remote template. Changes may be lost on subsequent installations.`);
-            }
-            yield watcher.watch(watchHandler, (paths) => {
-                this.error(`[WATCHER] Could not find the file path ${paths}, are you sure it still exists? If it has been deleted or moved please rerun the generator.`, {
-                    exit: 1,
-                });
-            });
-        });
-    }
-    watcherHandler(asyncapi, template, output, options, genOption, interactive) {
-        return (changedFiles) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            console.clear();
-            console.log('[WATCHER] Change detected');
-            for (const [, value] of Object.entries(changedFiles)) {
-                let eventText;
-                switch (value.eventType) {
-                    case 'changed':
-                        eventText = (0, picocolors_1.green)(value.eventType);
-                        break;
-                    case 'removed':
-                        eventText = (0, picocolors_1.red)(value.eventType);
-                        break;
-                    case 'renamed':
-                        eventText = (0, picocolors_1.yellow)(value.eventType);
-                        break;
-                    default:
-                        eventText = (0, picocolors_1.yellow)(value.eventType);
-                }
-                this.log(`\t${(0, picocolors_1.magenta)(value.path)} was ${eventText}`);
-            }
-            let specification;
-            try {
-                specification = yield (0, SpecificationFile_1.load)(asyncapi);
-            }
-            catch (err) {
-                return this.error(new validation_error_1.ValidationError({
-                    type: 'invalid-file',
-                    filepath: asyncapi,
-                }), { exit: 1 });
-            }
-            try {
-                const result = yield this.generatorService.generate(specification, template, output, options, genOption, interactive);
-                if (!result.success) {
-                    throw new generator_error_1.GeneratorError(new Error(result.error));
-                }
-            }
-            catch (err) {
-                throw new generator_error_1.GeneratorError(err);
+                template = yield (0, prompts_2.promptForTemplate)();
             }
+            this.handleCancellation(template);
+            return {
+                asyncapi: commonArgs.asyncapi,
+                template,
+                output: commonArgs.output
+            };
         });
     }
 }
@@ -352,15 +94,6 @@ 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 = 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: false,
-    }),
-    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: false,
-    }),
-};
+Template.flags = Object.assign(Object.assign({}, (0, fromTemplate_flags_1.fromTemplateFlags)()), BaseGeneratorCommand_1.BaseGeneratorCommand.flags);
+Template.args = Object.assign(Object.assign({}, BaseGeneratorCommand_1.BaseGeneratorCommand.args), { 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: false }) });
 exports.default = Template;

package/lib/apps/cli/commands/start/preview.d.ts

@@ -8,6 +8,7 @@ export default class PreviewStudio extends Command {
         baseDir: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         xOrigin: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         suppressLogs: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        noBrowser: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static readonly args: {
         'spec-file': import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;

package/lib/apps/cli/commands/start/preview.js

@@ -26,7 +26,7 @@ class PreviewStudio extends base_1.default {
                 }
             }
             this.metricsMetadata.port = previewPort;
-            yield (0, Preview_1.startPreview)(filePath, flags.base, flags.baseDir, flags.xOrigin, flags.suppressLogs, previewPort);
+            yield (0, Preview_1.startPreview)(filePath, flags.base, flags.baseDir, flags.xOrigin, flags.suppressLogs, previewPort, flags.noBrowser);
         });
     }
 }

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

@@ -6,6 +6,7 @@ export default class StartStudio extends Command {
         file: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         port: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'no-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        noBrowser: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static readonly args: {
         'spec-file': import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;

package/lib/apps/cli/commands/start/studio.js

@@ -42,7 +42,7 @@ class StartStudio extends base_1.default {
                 }
             }
             this.metricsMetadata.port = port;
-            yield (0, Studio_1.start)(filePath, port);
+            (0, Studio_1.start)(filePath, port, flags.noBrowser);
         });
     }
     parseArgs(args, port) {

package/lib/apps/cli/internal/args/generate.args.d.ts

@@ -0,0 +1,3 @@
+export declare const generateArgs: {
+    asyncapi: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+};

package/lib/apps/cli/internal/args/generate.args.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateArgs = void 0;
+const core_1 = require("@oclif/core");
+exports.generateArgs = {
+    asyncapi: core_1.Args.string({
+        description: '- Local path, url or context-name pointing to AsyncAPI file',
+        required: false
+    })
+};