@asyncapi/cli 4.1.1 → 5.0.1

package/README.md

@@ -13,6 +13,7 @@ CLI to work with your AsyncAPI files. Currently under development, we are workin
 - [Installation](#installation)
 - [Usage](#usage)
 - [Architecture](#architecture)
+- [Debugging & Testing](#debugging--testing)
 - [Github Action](#github-action)
 - [Contributing](#contributing)
   * [Set up development environment](#set-up-development-environment)
@@ -30,6 +31,9 @@ The [usage guide](/docs/usage.md) provides information about different ways to u
 ## Architecture
 The [architecture guide](/docs/architecture.md) provides information about the architecture.
 
+## Debugging & Testing
+The [debugging & testing guide](/docs/debugging-testing.md) provides step-by-step instructions for debugging CLI commands, API endpoints, and services, along with comprehensive testing guidelines.
+
 ## Github Action
 
 The AsyncAPI CLI can be used as a GitHub Action. You can find more information in the [GitHub Action guide](https://www.asyncapi.com/docs/tools/cli/github-action).

package/assets/create-template/templates/default/package-lock.json

@@ -3243,9 +3243,10 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },

package/lib/apps/api/controllers/generate.controller.js

@@ -36,9 +36,7 @@ class GenerateController {
                     forceWrite: true,
                     templateParams: parameters,
                 };
-                const generateFunc = req.body['use-fallback-generator']
-                    ? this.generatorService.generate.bind(this.generatorService)
-                    : this.generatorService.generateUsingNewGenerator.bind(this.generatorService);
+                const generateFunc = this.generatorService.generate.bind(this.generatorService);
                 try {
                     const result = yield generateFunc(new SpecificationFile_1.Specification(typeof asyncapi === 'object' ? JSON.stringify(asyncapi) : asyncapi), template, tmpDir, options, {}, true);
                     if (!result.success) {

package/lib/apps/cli/commands/convert.d.ts

@@ -1,7 +1,5 @@
 import Command from '../internal/base';
 export default class Convert extends Command {
-    static specFile: any;
-    static metricsMetadata: any;
     static description: string;
     private conversionService;
     static flags: {

package/lib/apps/cli/commands/convert.js

@@ -11,7 +11,9 @@ const proxy_flags_1 = require("../internal/flags/proxy.flags");
 const specs_1 = tslib_1.__importDefault(require("@asyncapi/specs"));
 const convert_flags_1 = require("../internal/flags/convert.flags");
 const convert_service_1 = require("../../../domains/services/convert.service");
+const proxy_1 = require("../../../utils/proxy");
 const latestVersion = Object.keys(specs_1.default.schemas).pop();
+const TARGET_VERSION_FLAG = 'target-version';
 class Convert extends base_1.default {
     constructor() {
         super(...arguments);
@@ -20,21 +22,15 @@ class Convert extends base_1.default {
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const { args, flags } = yield this.parse(Convert);
-            let filePath = args['spec-file'];
-            const proxyHost = flags['proxyHost'];
-            const proxyPort = flags['proxyPort'];
-            if (proxyHost && proxyPort) {
-                const proxyUrl = `http://${proxyHost}:${proxyPort}`;
-                filePath = `${filePath}+${proxyUrl}`; // Update filePath with proxyUrl
-            }
+            const filePath = (0, proxy_1.applyProxyToPath)(args['spec-file'], flags['proxyHost'], flags['proxyPort']);
+            const targetVersion = flags[TARGET_VERSION_FLAG];
             try {
                 // LOAD FILE
                 this.specFile = yield (0, SpecificationFile_1.load)(filePath);
-                // eslint-disable-next-line sonarjs/no-duplicate-string
-                this.metricsMetadata.to_version = flags['target-version'];
+                this.metricsMetadata.to_version = targetVersion;
                 const conversionOptions = {
                     format: flags.format,
-                    'target-version': (flags['target-version'] ||
+                    [TARGET_VERSION_FLAG]: (targetVersion ||
                         latestVersion),
                     perspective: flags['perspective'],
                 };
@@ -52,12 +48,12 @@ class Convert extends base_1.default {
                 }
             }
             catch (err) {
-                this.handleError(err, filePath !== null && filePath !== void 0 ? filePath : 'unknown', flags);
+                this.handleError(err, filePath !== null && filePath !== void 0 ? filePath : 'unknown', targetVersion);
             }
         });
     }
     // Helper function to handle errors
-    handleError(err, filePath, flags) {
+    handleError(err, filePath, targetVersion) {
         var _a;
         if (err instanceof specification_file_1.SpecificationFileNotFound) {
             this.error(new validation_error_1.ValidationError({
@@ -65,7 +61,7 @@ class Convert extends base_1.default {
                 filepath: filePath,
             }));
         }
-        else if (((_a = this.specFile) === null || _a === void 0 ? void 0 : _a.toJson().asyncapi) > flags['target-version']) {
+        else if (((_a = this.specFile) === null || _a === void 0 ? void 0 : _a.toJson().asyncapi) > (targetVersion !== null && targetVersion !== void 0 ? targetVersion : '')) {
             this.error(`The ${(0, picocolors_1.cyan)(filePath)} file cannot be converted to an older version. Downgrading is not supported.`);
         }
         else {
@@ -73,7 +69,6 @@ class Convert extends base_1.default {
         }
     }
 }
-Convert.metricsMetadata = {};
 Convert.description = 'Convert asyncapi documents older to newer versions or OpenAPI/postman-collection documents to AsyncAPI';
 Convert.flags = Object.assign(Object.assign({}, (0, convert_flags_1.convertFlags)(latestVersion)), (0, proxy_flags_1.proxyFlags)());
 Convert.args = {

package/lib/apps/cli/commands/format.d.ts

@@ -1,7 +1,5 @@
 import Command from '../internal/base';
-export default class Convert extends Command {
-    static specFile: any;
-    static metricsMetadata: any;
+export default class Format extends Command {
     static description: string;
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;

package/lib/apps/cli/commands/format.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-/* eslint-disable @typescript-eslint/ban-ts-comment */
 const fs_1 = require("fs");
 const core_1 = require("@oclif/core");
 const base_1 = tslib_1.__importDefault(require("../internal/base"));
@@ -9,17 +8,16 @@ const SpecificationFile_1 = require("../../../domains/models/SpecificationFile")
 const specification_file_1 = require("../../../errors/specification-file");
 const picocolors_1 = require("picocolors");
 const format_flags_1 = require("../internal/flags/format.flags");
-class Convert extends base_1.default {
+class Format extends base_1.default {
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const { args, flags } = yield this.parse(Convert);
+            const { args, flags } = yield this.parse(Format);
             const filePath = args['spec-file'];
             const outputFileFormat = flags['format'];
             let convertedFile;
             try {
                 this.specFile = yield (0, SpecificationFile_1.load)(filePath);
-                // eslint-disable-next-line sonarjs/no-duplicate-string
-                this.metricsMetadata.to_version = flags['target-version'];
+                this.metricsMetadata.output_format = outputFileFormat;
                 const ff = (0, SpecificationFile_1.retrieveFileFormat)(this.specFile.text());
                 const isSpecFileJson = ff === 'json';
                 const isSpecFileYaml = ff === 'yaml';
@@ -85,13 +83,12 @@ class Convert extends base_1.default {
         return filename;
     }
 }
-Convert.metricsMetadata = {};
-Convert.description = 'Convert asyncapi documents from any format to yaml, yml or JSON';
-Convert.flags = (0, format_flags_1.convertFormatFlags)();
-Convert.args = {
+Format.description = 'Convert asyncapi documents from any format to yaml, yml or JSON';
+Format.flags = (0, format_flags_1.convertFormatFlags)();
+Format.args = {
     'spec-file': core_1.Args.string({
         description: 'spec path, url, or context-name',
         required: false,
     }),
 };
-exports.default = Convert;
+exports.default = Format;

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

@@ -5,7 +5,7 @@ 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 generator_1 = require("@asyncapi/generator");
 const prompts_1 = require("@clack/prompts");
 const picocolors_1 = require("picocolors");
 const clients_flags_1 = require("../../internal/flags/generate/clients.flags");
@@ -41,10 +41,10 @@ class Client extends BaseGeneratorCommand_1.BaseGeneratorCommand {
             this.metricsMetadata.language = language;
             const watchTemplate = flags['watch'];
             const genOption = this.buildGenOption(flags, parsedFlags);
-            // Use GeneratorService with new generator (v2) for client generation
+            // Use GeneratorService 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);
+            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));
             }
@@ -73,7 +73,7 @@ class Client extends BaseGeneratorCommand_1.BaseGeneratorCommand {
     }
     getTemplateName(language) {
         var _a;
-        const template = (_a = (0, generator_v2_1.listBakedInTemplates)({ type: 'client' }).find((template) => {
+        const template = (_a = (0, generator_1.listBakedInTemplates)({ type: 'client' }).find((template) => {
             return template.target === language;
         })) === null || _a === void 0 ? void 0 : _a.name;
         if (!template) {

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

@@ -5,31 +5,6 @@ export default class Template extends BaseGeneratorCommand {
     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>;

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

@@ -11,12 +11,11 @@ const picocolors_1 = require("picocolors");
 const fromTemplate_flags_1 = require("../../internal/flags/generate/fromTemplate.flags");
 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* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             const { args, flags } = yield this.parse(Template); // NOSONAR
             const interactive = !flags['no-interactive'];
             let asyncapi = (_a = args['asyncapi']) !== null && _a !== void 0 ? _a : '';
@@ -50,22 +49,15 @@ class Template extends BaseGeneratorCommand_1.BaseGeneratorCommand {
                     filepath: asyncapi,
                 }), { exit: 1 });
             }
-            if (flags['use-new-generator']) {
-                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));
-                }
-                else {
-                    this.log((_d = (_c = result.data) === null || _c === void 0 ? void 0 : _c.logs) === null || _d === void 0 ? void 0 : _d.join('\n'));
-                }
+            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));
             }
-            else {
-                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));
+            // Output logs in non-interactive mode
+            if (!interactive && ((_c = result.data) === null || _c === void 0 ? void 0 : _c.logs)) {
+                for (const log of result.data.logs) {
+                    this.log(log);
                 }
             }
             if (watchTemplate) {

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

@@ -9,6 +9,7 @@ const modelina_cli_1 = require("@asyncapi/modelina-cli");
 const models_flags_1 = require("../../internal/flags/generate/models.flags");
 const proxy_flags_1 = require("../../internal/flags/proxy.flags");
 const validation_service_1 = require("../../../../domains/services/validation.service");
+const proxy_1 = require("../../../../utils/proxy");
 class Models extends base_1.default {
     constructor() {
         super(...arguments);
@@ -29,11 +30,8 @@ class Models extends base_1.default {
                 file = parsedArgs.file;
                 output = parsedArgs.output;
             }
-            if (proxyHost && proxyPort) {
-                const proxyUrl = `http://${proxyHost}:${proxyPort}`;
-                file = `${file}+${proxyUrl}`;
-            }
-            const inputFile = (yield (0, SpecificationFile_1.load)(file)) || (yield (0, SpecificationFile_1.load)());
+            const fileWithProxy = (0, proxy_1.applyProxyToPath)(file, proxyHost, proxyPort);
+            const inputFile = (yield (0, SpecificationFile_1.load)(fileWithProxy)) || (yield (0, SpecificationFile_1.load)());
             const result = yield this.validationService.parseDocument(inputFile, {}, flags);
             if (!result.success) {
                 this.error(`Failed to parse the AsyncAPI document: ${result.error}`, {

package/lib/apps/cli/commands/optimize.js

@@ -13,6 +13,7 @@ const fs_1 = require("fs");
 const parser_1 = require("@asyncapi/parser");
 const optimize_flags_1 = require("../internal/flags/optimize.flags");
 const proxy_flags_1 = require("../internal/flags/proxy.flags");
+const proxy_1 = require("../../../utils/proxy");
 const { writeFile } = fs_1.promises;
 var Optimizations;
 (function (Optimizations) {
@@ -41,13 +42,7 @@ class Optimize extends base_1.default {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
             const { args, flags } = yield this.parse(Optimize); //NOSONAR
-            let filePath = args['spec-file'];
-            const proxyHost = flags['proxyHost'];
-            const proxyPort = flags['proxyPort'];
-            if (proxyHost && proxyPort) {
-                const proxyUrl = `http://${proxyHost}:${proxyPort}`;
-                filePath = `${filePath}+${proxyUrl}`; // Update filePath with proxyUrl
-            }
+            const filePath = (0, proxy_1.applyProxyToPath)(args['spec-file'], flags['proxyHost'], flags['proxyPort']);
             try {
                 this.specFile = yield (0, SpecificationFile_1.load)(filePath);
             }
@@ -95,7 +90,8 @@ class Optimize extends base_1.default {
                 yield this.interactiveRun(report);
             }
             try {
-                const optimizedDocument = optimizer.getOptimizedDocument({
+                const fileFormat = (0, SpecificationFile_1.retrieveFileFormat)(this.specFile.text());
+                let optimizedDocument = optimizer.getOptimizedDocument({
                     rules: {
                         moveDuplicatesToComponents: this.selectedOptimizations.includes(Optimizations.MOVE_DUPLICATES_TO_COMPONENTS),
                         moveAllToComponents: this.selectedOptimizations.includes(Optimizations.MOVE_ALL_TO_COMPONENTS),
@@ -105,8 +101,11 @@ class Optimize extends base_1.default {
                     disableOptimizationFor: {
                         schema: this.disableOptimizations.includes(DisableOptimizations.SCHEMA),
                     },
-                    output: optimizer_1.Output.YAML,
+                    output: fileFormat === 'json' ? optimizer_1.Output.JSON : optimizer_1.Output.YAML,
                 });
+                if (fileFormat === 'json') {
+                    optimizedDocument = JSON.stringify((JSON.parse(optimizedDocument)), null, 2);
+                }
                 this.collectMetricsData(report);
                 const specPath = this.specFile.getFilePath();
                 let newPath = '';
@@ -115,7 +114,7 @@ class Optimize extends base_1.default {
                     newPath = `${specPath.substring(0, pos)}_optimized.${specPath.substring(pos + 1)}`;
                 }
                 else {
-                    newPath = 'optimized-asyncapi.yaml';
+                    newPath = `optimized-asyncapi.${fileFormat}`;
                 }
                 switch (this.outputMethod) {
                     case Outputs.TERMINAL:
@@ -124,10 +123,10 @@ class Optimize extends base_1.default {
                         break;
                     case Outputs.NEW_FILE:
                         yield writeFile(newPath, optimizedDocument, { encoding: 'utf8' });
-                        this.log(`✅ Success! Your optimized file has been created at ${chalk_1.default.blue({ newPath })}.`);
+                        this.log(`✅ Success! Your optimized file has been created at ${chalk_1.default.blue(newPath)}.`);
                         break;
                     case Outputs.OVERWRITE:
-                        yield writeFile(specPath !== null && specPath !== void 0 ? specPath : 'asyncapi.yaml', optimizedDocument, {
+                        yield writeFile(specPath !== null && specPath !== void 0 ? specPath : `asyncapi.${fileFormat}`, optimizedDocument, {
                             encoding: 'utf8',
                         });
                         this.log(`✅ Success! Your original file at ${specPath} has been updated.`);

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, flags.noBrowser);
+            (0, Preview_1.startPreview)(filePath, flags.base, flags.baseDir, flags.xOrigin, flags.suppressLogs, previewPort, flags.noBrowser);
         });
     }
 }

package/lib/apps/cli/commands/validate.js

@@ -8,6 +8,7 @@ const globals_1 = require("../internal/globals");
 const validate_flags_1 = require("../internal/flags/validate.flags");
 const proxy_flags_1 = require("../internal/flags/proxy.flags");
 const validation_service_1 = require("../../../domains/services/validation.service");
+const proxy_1 = require("../../../utils/proxy");
 class Validate extends base_1.default {
     constructor() {
         super(...arguments);
@@ -17,13 +18,7 @@ class Validate extends base_1.default {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             const { args, flags } = yield this.parse(Validate); //NOSONAR
-            let filePath = args['spec-file'];
-            const proxyHost = flags['proxyHost'];
-            const proxyPort = flags['proxyPort'];
-            if (proxyHost && proxyPort) {
-                const proxyUrl = `http://${proxyHost}:${proxyPort}`;
-                filePath = `${filePath}+${proxyUrl}`; // Update filePath with proxyUrl
-            }
+            const filePath = (0, proxy_1.applyProxyToPath)(args['spec-file'], flags['proxyHost'], flags['proxyPort']);
             this.specFile = yield (0, SpecificationFile_1.load)(filePath);
             const watchMode = flags.watch;
             if (watchMode) {

package/lib/apps/cli/internal/base/BaseGeneratorCommand.js

@@ -17,6 +17,7 @@ const watcher_1 = require("../../../../utils/generate/watcher");
 const mapBaseUrl_1 = require("../../../../utils/generate/mapBaseUrl");
 const prompts_2 = require("../../../../utils/generate/prompts");
 const generator_service_1 = require("../../../../domains/services/generator.service");
+const proxy_1 = require("../../../../utils/proxy");
 class BaseGeneratorCommand extends base_1.default {
     constructor() {
         super(...arguments);
@@ -42,11 +43,8 @@ class BaseGeneratorCommand extends base_1.default {
         });
     }
     applyProxyConfiguration(asyncapi, proxyHost, proxyPort) {
-        if (proxyHost && proxyPort) {
-            const proxyUrl = `http://${proxyHost}:${proxyPort}`;
-            return `${asyncapi}+${proxyUrl}`;
-        }
-        return asyncapi;
+        var _a;
+        return (_a = (0, proxy_1.applyProxyToPath)(asyncapi, proxyHost, proxyPort)) !== null && _a !== void 0 ? _a : asyncapi;
     }
     handleWatchMode(asyncapi, template, output, options, genOption, interactive) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {

package/lib/apps/cli/internal/base.d.ts

@@ -10,7 +10,7 @@ export default abstract class extends Command {
     init(): Promise<void>;
     catch(err: Error & {
         exitCode?: number;
-    }): Promise<any>;
+    }): Promise<void>;
     recordActionFinished(action: string, metadata?: MetricMetadata, rawDocument?: string): Promise<void>;
     recordActionInvoked(action: string, metadata?: MetricMetadata): Promise<void>;
     recordActionMetric(recordFunc: (recorder: Recorder) => Promise<void>): Promise<void>;

package/lib/apps/cli/internal/base.js

@@ -40,14 +40,14 @@ class default_1 extends core_1.Command {
         });
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
-                return yield _super.catch.call(this, err);
+                yield _super.catch.call(this, err);
             }
             catch (e) {
-                if (e.message.includes('EEXIT: 0')) {
-                    process.exitCode = 0;
-                    return;
-                }
                 if (e instanceof Error) {
+                    if (e.message.includes('EEXIT: 0')) {
+                        process.exitCode = 0;
+                        return;
+                    }
                     this.logToStderr(`${e.name}: ${e.message}`);
                     process.exitCode = 1;
                 }
@@ -114,8 +114,9 @@ class default_1 extends core_1.Command {
                 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.
+            catch (_b) {
+                // 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.
             }
         });
     }

package/lib/apps/cli/internal/flags/generate/fromTemplate.flags.d.ts

@@ -1,29 +1,4 @@
 export declare const fromTemplateFlags: () => {
-    '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>;

package/lib/apps/cli/internal/flags/generate/fromTemplate.flags.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromTemplateFlags = void 0;
 const sharedFlags_1 = require("./sharedFlags");
-const core_1 = require("@oclif/core");
 const fromTemplateFlags = () => {
-    return Object.assign(Object.assign({}, sharedFlags_1.sharedFlags), { 'use-new-generator': Object.assign({ default: false, description: 'Use v2 generator, for generating from newer templates' }, core_1.Flags.boolean()) });
+    return Object.assign({}, sharedFlags_1.sharedFlags);
 };
 exports.fromTemplateFlags = fromTemplateFlags;

package/lib/apps/cli/internal/globals.js

@@ -4,6 +4,7 @@ exports.specWatcher = void 0;
 const tslib_1 = require("tslib");
 const chokidar_1 = tslib_1.__importDefault(require("chokidar"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const error_handler_1 = require("../../../utils/error-handler");
 const GreenLog = chalk_1.default.hex('#00FF00');
 const OrangeLog = chalk_1.default.hex('#FFA500');
 const CHOKIDAR_CONFIG = {
@@ -40,7 +41,7 @@ const specWatcher = (params) => {
         CHOKIDAR_INSTANCE_STORE.set(params.label || '_default', true);
     }
     catch (error) {
-        console.log(error);
+        console.error(chalk_1.default.red(`Watch error: ${(0, error_handler_1.getErrorMessage)(error)}`));
     }
 };
 exports.specWatcher = specWatcher;

package/lib/domains/models/Context.js

@@ -295,7 +295,9 @@ function getContextFilePath() {
                     return exports.CONTEXT_FILE_PATH;
                 }
             }
-            catch (e) { } // eslint-disable-line
+            catch (_a) {
+                // Silently continue to parent directory if file doesn't exist or is invalid JSON
+            }
             currentPath.pop();
         }
         return null;

package/lib/domains/models/Preview.js

@@ -10,7 +10,6 @@ const http_1 = require("http");
 const ws_1 = require("ws");
 const chokidar_1 = tslib_1.__importDefault(require("chokidar"));
 const open_1 = tslib_1.__importDefault(require("open"));
-const next_1 = tslib_1.__importDefault(require("next"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const picocolors_1 = require("picocolors");
@@ -24,6 +23,13 @@ exports.DEFAULT_PORT = 0;
 function isValidFilePath(filePath) {
     return (0, fs_1.existsSync)(filePath);
 }
+function resolveStudioNextInstance(studioPath) {
+    var _a;
+    const resolvedNextPath = require.resolve('next', { paths: [studioPath] });
+    // eslint-disable-next-line @typescript-eslint/no-var-requires,security/detect-non-literal-require
+    const nextModule = require(resolvedNextPath);
+    return (_a = nextModule.default) !== null && _a !== void 0 ? _a : nextModule;
+}
 // eslint-disable-next-line sonarjs/cognitive-complexity
 function startPreview(filePath, base, baseDirectory, xOrigin, suppressLogs, port = exports.DEFAULT_PORT, noBrowser) {
     if (filePath && !isValidFilePath(filePath)) {
@@ -43,7 +49,8 @@ function startPreview(filePath, base, baseDirectory, xOrigin, suppressLogs, port
         }
     });
     const studioPath = path_1.default.dirname(require.resolve('@asyncapi/studio/package.json'));
-    const app = (0, next_1.default)({
+    const nextInstance = resolveStudioNextInstance(studioPath);
+    const app = nextInstance({
         dev: false,
         dir: studioPath,
         conf: {

package/lib/domains/models/SpecificationFile.d.ts

@@ -35,6 +35,18 @@ export declare function nameType(name: string): Promise<string>;
 export declare function isURL(urlpath: string): Promise<boolean>;
 export declare function fileExists(name: string): Promise<boolean>;
 export declare function retrieveFileFormat(content: string): fileFormat | undefined;
+/**
+ * Converts a JSON or YAML specification to YAML format.
+ *
+ * @param spec - The specification content as a string
+ * @returns The YAML formatted string, or undefined if conversion fails
+ */
 export declare function convertToYaml(spec: string): string | undefined;
+/**
+ * Converts a JSON or YAML specification to JSON format.
+ *
+ * @param spec - The specification content as a string
+ * @returns The JSON formatted string, or undefined if conversion fails
+ */
 export declare function convertToJSON(spec: string): string | undefined;
 export {};