@asyncapi/cli 1.17.0 → 2.0.0

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

@@ -1,20 +1,21 @@
-import Command from '../../base';
+import Command from '../../core/base';
 export default class Models extends Command {
     static description: string;
-    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 readonly args: any;
     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, 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, import("@oclif/core/lib/interfaces").CustomOptions>;
-        /**
-         * TypeScript specific options
-         */
+        javaIncludeComments: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        javaJackson: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        javaConstraints: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        csharpAutoImplement: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        csharpNewtonsoft: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        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>;
         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>;
@@ -24,29 +25,10 @@ export default class Models extends Command {
         tsMarshalling: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         tsExampleInstance: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         tsRawPropertyNames: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        /**
-         * Go and Java specific package name to use for the generated models
-         */
+        help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         packageName: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        /**
-         * Java specific options
-         */
-        javaIncludeComments: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        javaJackson: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        javaConstraints: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        /**
-         * C++ and C# and PHP specific namespace to use for the generated models
-         */
         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, 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>;
     };
     run(): Promise<void>;
     private parseArgs;

package/lib/commands/generate/models.js

@@ -1,37 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const modelina_1 = require("@asyncapi/modelina");
-const core_1 = require("@oclif/core");
-const multi_parser_1 = require("@smoya/multi-parser");
-const base_1 = tslib_1.__importDefault(require("../../base"));
-const SpecificationFile_1 = require("../../models/SpecificationFile");
-const parser_1 = require("../../parser");
+const base_1 = tslib_1.__importDefault(require("../../core/base"));
+const SpecificationFile_1 = require("../../core/models/SpecificationFile");
+const parser_1 = require("../../core/parser");
 const prompts_1 = require("@clack/prompts");
 const picocolors_1 = require("picocolors");
-var Languages;
-(function (Languages) {
-    Languages["typescript"] = "typescript";
-    Languages["csharp"] = "csharp";
-    Languages["golang"] = "golang";
-    Languages["java"] = "java";
-    Languages["javascript"] = "javascript";
-    Languages["dart"] = "dart";
-    Languages["python"] = "python";
-    Languages["rust"] = "rust";
-    Languages["kotlin"] = "kotlin";
-    Languages["php"] = "php";
-    Languages["cplusplus"] = "cplusplus";
-})(Languages || (Languages = {}));
-const possibleLanguageValues = Object.values(Languages).join(', ');
+const modelina_cli_1 = require("@asyncapi/modelina-cli");
+const models_flags_1 = require("../../core/flags/generate/models.flags");
 class Models extends base_1.default {
-    /* eslint-disable sonarjs/cognitive-complexity */
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const { args, flags } = yield this.parse(Models);
-            const { tsModelType, tsEnumType, tsIncludeComments, tsModuleSystem, tsExportType, tsJsonBinPack, tsMarshalling, tsExampleInstance, tsRawPropertyNames, namespace, csharpAutoImplement, csharpArrayType, csharpNewtonsoft, csharpHashcode, csharpEqual, csharpSystemJson, packageName, javaIncludeComments, javaJackson, javaConstraints } = flags;
             let { language, file } = args;
-            let output = flags.output || 'stdout';
+            let { output } = flags;
             const interactive = !flags['no-interactive'];
             if (!interactive) {
                 (0, prompts_1.intro)((0, picocolors_1.inverse)('AsyncAPI Generate Models'));
@@ -50,11 +32,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.
-            // 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);
-            modelina_1.Logger.setLogger({
+            const logger = {
                 info: (message) => {
                     this.log(message);
                 },
@@ -67,169 +45,22 @@ class Models extends base_1.default {
                 error: (message) => {
                     this.error(message);
                 },
-            });
-            let fileGenerator;
-            let fileOptions = {};
-            const presets = [];
-            const options = {
-                marshalling: tsMarshalling,
-                example: tsExampleInstance,
             };
-            switch (language) {
-                case Languages.typescript:
-                    presets.push({
-                        preset: modelina_1.TS_COMMON_PRESET,
-                        options
-                    });
-                    if (tsIncludeComments) {
-                        presets.push(modelina_1.TS_DESCRIPTION_PRESET);
-                    }
-                    if (tsJsonBinPack) {
-                        presets.push({
-                            preset: modelina_1.TS_COMMON_PRESET,
-                            options
-                        }, modelina_1.TS_JSONBINPACK_PRESET);
-                    }
-                    fileGenerator = new modelina_1.TypeScriptFileGenerator({
-                        modelType: tsModelType,
-                        enumType: tsEnumType,
-                        rawPropertyNames: tsRawPropertyNames,
-                        presets
-                    });
-                    fileOptions = {
-                        moduleSystem: tsModuleSystem,
-                        exportType: tsExportType
-                    };
-                    break;
-                case Languages.python:
-                    fileGenerator = new modelina_1.PythonFileGenerator();
-                    break;
-                case Languages.rust:
-                    fileGenerator = new modelina_1.RustFileGenerator();
-                    break;
-                case Languages.csharp:
-                    if (namespace === undefined) {
-                        throw new Error('In order to generate models to C#, we need to know which namespace they are under. Add `--namespace=NAMESPACE` to set the desired namespace.');
-                    }
-                    if (csharpAutoImplement) {
-                        presets.push({
-                            preset: modelina_1.CSHARP_DEFAULT_PRESET,
-                            options: {
-                                autoImplementedProperties: true
-                            }
-                        });
-                    }
-                    if (csharpNewtonsoft) {
-                        presets.push(modelina_1.CSHARP_NEWTONSOFT_SERIALIZER_PRESET);
-                    }
-                    if (csharpSystemJson) {
-                        presets.push(modelina_1.CSHARP_JSON_SERIALIZER_PRESET);
-                    }
-                    if (csharpHashcode || csharpEqual) {
-                        presets.push({
-                            preset: modelina_1.CSHARP_COMMON_PRESET,
-                            options: {
-                                hashCode: csharpHashcode,
-                                equals: csharpEqual
-                            }
-                        });
-                    }
-                    fileGenerator = new modelina_1.CSharpFileGenerator({
-                        presets,
-                        collectionType: csharpArrayType
-                    });
-                    fileOptions = {
-                        namespace
-                    };
-                    break;
-                case Languages.cplusplus:
-                    if (namespace === undefined) {
-                        throw new Error('In order to generate models to C++, we need to know which namespace they are under. Add `--namespace=NAMESPACE` to set the desired namespace.');
-                    }
-                    fileGenerator = new modelina_1.CplusplusFileGenerator({
-                        namespace
-                    });
-                    break;
-                case Languages.golang:
-                    if (packageName === undefined) {
-                        throw new Error('In order to generate models to Go, we need to know which package they are under. Add `--packageName=PACKAGENAME` to set the desired package name.');
-                    }
-                    fileGenerator = new modelina_1.GoFileGenerator();
-                    fileOptions = {
-                        packageName
-                    };
-                    break;
-                case Languages.java:
-                    if (packageName === undefined) {
-                        throw new Error('In order to generate models to Java, we need to know which package they are under. Add `--packageName=PACKAGENAME` to set the desired package name.');
-                    }
-                    presets.push({
-                        preset: modelina_1.JAVA_COMMON_PRESET,
-                        options
-                    });
-                    if (javaIncludeComments) {
-                        presets.push(modelina_1.JAVA_DESCRIPTION_PRESET);
-                    }
-                    if (javaJackson) {
-                        presets.push(modelina_1.JAVA_JACKSON_PRESET);
-                    }
-                    if (javaConstraints) {
-                        presets.push(modelina_1.JAVA_CONSTRAINTS_PRESET);
-                    }
-                    fileGenerator = new modelina_1.JavaFileGenerator({ presets });
-                    fileOptions = {
-                        packageName
-                    };
-                    break;
-                case Languages.javascript:
-                    fileGenerator = new modelina_1.JavaScriptFileGenerator();
-                    break;
-                case Languages.dart:
-                    if (packageName === undefined) {
-                        throw new Error('In order to generate models to Dart, we need to know which package they are under. Add `--packageName=PACKAGENAME` to set the desired package name.');
-                    }
-                    fileGenerator = new modelina_1.DartFileGenerator();
-                    fileOptions = {
-                        packageName
-                    };
-                    break;
-                case Languages.kotlin:
-                    if (packageName === undefined) {
-                        throw new Error('In order to generate models to Kotlin, we need to know which package they are under. Add `--packageName=PACKAGENAME` to set the desired package name.');
-                    }
-                    fileGenerator = new modelina_1.KotlinFileGenerator();
-                    fileOptions = {
-                        packageName
-                    };
-                    break;
-                case Languages.php:
-                    if (namespace === undefined) {
-                        throw new Error('In order to generate models to PHP, we need to know which namespace they are under. Add `--namespace=NAMESPACE` to set the desired namespace.');
-                    }
-                    fileGenerator = new modelina_1.PhpFileGenerator();
-                    fileOptions = {
-                        namespace
-                    };
-                    break;
-                default:
-                    throw new Error(`Could not determine generator for language ${language}, are you using one of the following values ${possibleLanguageValues}?`);
-            }
             const s = (0, prompts_1.spinner)();
             s.start('Generating models...');
+            const generatedModels = yield (0, modelina_cli_1.generateModels)(Object.assign(Object.assign({}, flags), { output }), document, logger, language);
             if (output !== 'stdout') {
-                const models = yield fileGenerator.generateToFiles(convertedDoc, output, Object.assign({}, fileOptions));
-                const generatedModels = models.map((model) => { return model.modelName; });
-                s.stop((0, picocolors_1.green)(`Successfully generated the following models: ${generatedModels.join(', ')}`));
+                const generatedModelStrings = generatedModels.map((model) => { return model.modelName; });
+                s.stop((0, picocolors_1.green)(`Successfully generated the following models: ${generatedModelStrings.join(', ')}`));
                 return;
             }
-            const models = yield fileGenerator.generateCompleteModels(convertedDoc, Object.assign({}, fileOptions));
-            const generatedModels = models.map((model) => {
+            const generatedModelStrings = generatedModels.map((model) => {
                 return `
-        ## Model name: ${model.modelName}
-        ${model.result}
+## Model name: ${model.modelName}
+${model.result}
       `;
             });
-            s.stop((0, picocolors_1.green)(`Successfully generated the following models: ${generatedModels.join('\n')}`));
+            s.stop((0, picocolors_1.green)(`Successfully generated the following models: ${generatedModelStrings.join('\n')}`));
         });
     }
     parseArgs(args, output) {
@@ -240,7 +71,7 @@ class Models extends base_1.default {
             if (!language) {
                 language = yield (0, prompts_1.select)({
                     message: 'Select the language you want to generate models for',
-                    options: Object.keys(Languages).map((key) => ({ value: key, label: key, hint: Languages[key] })),
+                    options: Object.keys(modelina_cli_1.Languages).map((key) => ({ value: key, label: key, hint: modelina_cli_1.Languages[key] })),
                 });
                 askForOutput = true;
             }
@@ -271,130 +102,11 @@ class Models extends base_1.default {
                 (0, prompts_1.cancel)(operationCancelled);
                 this.exit();
             }
-            return { language, file, output: output || 'stdout' };
+            return { language, file, output: output !== null && output !== void 0 ? output : 'stdout' };
         });
     }
 }
 exports.default = Models;
 Models.description = 'Generates typed models';
-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,
-        default: false,
-    }), output: core_1.Flags.string({
-        char: 'o',
-        description: 'The output directory where the models should be written to. Omitting this flag will write the models to `stdout`.',
-        required: false
-    }), 
-    /**
-     * TypeScript specific options
-     */
-    tsModelType: core_1.Flags.string({
-        type: 'option',
-        options: ['class', 'interface'],
-        description: 'TypeScript specific, define which type of model needs to be generated.',
-        required: false,
-        default: 'class',
-    }), tsEnumType: core_1.Flags.string({
-        type: 'option',
-        options: ['enum', 'union'],
-        description: 'TypeScript specific, define which type of enums needs to be generated.',
-        required: false,
-        default: 'enum',
-    }), tsModuleSystem: core_1.Flags.string({
-        type: 'option',
-        options: ['ESM', 'CJS'],
-        description: 'TypeScript specific, define the module system to be used.',
-        required: false,
-        default: 'ESM',
-    }), tsIncludeComments: core_1.Flags.boolean({
-        description: 'TypeScript specific, if enabled add comments while generating models.',
-        required: false,
-        default: false,
-    }), tsExportType: core_1.Flags.string({
-        type: 'option',
-        options: ['default', 'named'],
-        description: 'TypeScript specific, define which type of export needs to be generated.',
-        required: false,
-        default: 'default',
-    }), tsJsonBinPack: core_1.Flags.boolean({
-        description: 'TypeScript specific, define basic support for serializing to and from binary with jsonbinpack.',
-        required: false,
-        default: false,
-    }), tsMarshalling: core_1.Flags.boolean({
-        description: 'TypeScript specific, generate the models with marshalling functions.',
-        required: false,
-        default: false,
-    }), tsExampleInstance: core_1.Flags.boolean({
-        description: 'Typescript specific, generate example of the model',
-        required: false,
-        default: false,
-    }), tsRawPropertyNames: core_1.Flags.boolean({
-        description: 'Typescript specific, generate the models using raw property names.',
-        required: false,
-        default: false,
-    }), 
-    /**
-     * Go and Java specific package name to use for the generated models
-     */
-    packageName: core_1.Flags.string({
-        description: 'Go, Java and Kotlin specific, define the package to use for the generated models. This is required when language is `go`, `java` or `kotlin`.',
-        required: false
-    }), 
-    /**
-     * Java specific options
-     */
-    javaIncludeComments: core_1.Flags.boolean({
-        description: 'Java specific, if enabled add comments while generating models.',
-        required: false,
-        default: false
-    }), javaJackson: core_1.Flags.boolean({
-        description: 'Java specific, generate the models with Jackson serialization support',
-        required: false,
-        default: false
-    }), javaConstraints: core_1.Flags.boolean({
-        description: 'Java specific, generate the models with constraints',
-        required: false,
-        default: false
-    }), 
-    /**
-     * C++ and C# and PHP specific namespace to use for the generated models
-     */
-    namespace: core_1.Flags.string({
-        description: 'C#, C++ and PHP specific, define the namespace to use for the generated models. This is required when language is `csharp`,`c++` or `php`.',
-        required: false
-    }), 
-    /**
-     * C# specific options
-     */
-    csharpAutoImplement: core_1.Flags.boolean({
-        description: 'C# specific, define whether to generate auto-implemented properties or not.',
-        required: false,
-        default: false
-    }), csharpNewtonsoft: core_1.Flags.boolean({
-        description: 'C# specific, generate the models with newtonsoft serialization support',
-        required: false,
-        default: false
-    }), csharpArrayType: core_1.Flags.string({
-        type: 'option',
-        description: 'C# specific, define which type of array needs to be generated.',
-        options: ['Array', 'List'],
-        required: false,
-        default: 'Array'
-    }), csharpHashcode: core_1.Flags.boolean({
-        description: 'C# specific, generate the models with the GetHashCode method overwritten',
-        required: false,
-        default: false
-    }), csharpEqual: core_1.Flags.boolean({
-        description: 'C# specific, generate the models with the Equal method overwritten',
-        required: false,
-        default: false
-    }), csharpSystemJson: core_1.Flags.boolean({
-        description: 'C# specific, generate the models with System.Text.Json serialization support',
-        required: false,
-        default: false
-    }) }, (0, parser_1.validationFlags)({ logDiagnostics: false }));
+Models.args = modelina_cli_1.ModelinaArgs;
+Models.flags = (0, models_flags_1.modelsFlags)();

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

@@ -1,4 +1,4 @@
-import Command from '../../base';
+import Command from '../../core/base';
 export default class NewFile extends Command {
     static description: string;
     static flags: {

package/lib/commands/new/file.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
 const fs_1 = require("fs");
-const base_1 = tslib_1.__importDefault(require("../../base"));
+const base_1 = tslib_1.__importDefault(require("../../core/base"));
 const inquirer = tslib_1.__importStar(require("inquirer"));
-const Studio_1 = require("../../models/Studio");
+const Studio_1 = require("../../core/models/Studio");
 const path_1 = require("path");
-const SpecificationFile_1 = require("../../models/SpecificationFile");
+const SpecificationFile_1 = require("../../core/models/SpecificationFile");
 const picocolors_1 = require("picocolors");
+const file_flags_1 = require("../../core/flags/new/file.flags");
 const { writeFile, readFile } = fs_1.promises;
 const DEFAULT_ASYNCAPI_FILE_NAME = 'asyncapi.yaml';
 const DEFAULT_ASYNCAPI_TEMPLATE = 'default-example.yaml';
@@ -152,14 +152,7 @@ class NewFile extends base_1.default {
 }
 exports.default = NewFile;
 NewFile.description = 'Creates a new asyncapi file';
-NewFile.flags = {
-    help: core_1.Flags.help({ char: 'h' }),
-    'file-name': core_1.Flags.string({ char: 'n', description: 'name of the file' }),
-    example: core_1.Flags.string({ char: 'e', description: getExamplesFlagDescription() }),
-    studio: core_1.Flags.boolean({ char: 's', description: 'open in Studio' }),
-    port: core_1.Flags.integer({ char: 'p', description: 'port in which to start Studio' }),
-    'no-tty': core_1.Flags.boolean({ description: 'do not use an interactive terminal' }),
-};
+NewFile.flags = (0, file_flags_1.fileFlags)(getExamplesFlagDescription());
 NewFile.examples = [
     'asyncapi new\t - start creation of a file in interactive mode',
     'asyncapi new --file-name=my-asyncapi.yml --example=default-example.yml --no-tty\t - create a new file with a specific name, using one of the examples and without interactive mode'

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

@@ -1,5 +1,5 @@
-import Command from '../../base';
-import { Specification } from '../../models/SpecificationFile';
+import Command from '../../core/base';
+import { Specification } from '../../core/models/SpecificationFile';
 export declare const successMessage: (projectName: string) => string;
 export default class NewGlee extends Command {
     static description: string;

package/lib/commands/new/glee.js

@@ -2,30 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.successMessage = void 0;
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
 const fs_1 = require("fs");
-const base_1 = tslib_1.__importDefault(require("../../base"));
+const base_1 = tslib_1.__importDefault(require("../../core/base"));
 const path_1 = tslib_1.__importStar(require("path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const SpecificationFile_1 = require("../../models/SpecificationFile");
+const SpecificationFile_1 = require("../../core/models/SpecificationFile");
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const inquirer_1 = require("inquirer");
 // eslint-disable-next-line
 // @ts-ignore
 const generator_1 = tslib_1.__importDefault(require("@asyncapi/generator"));
 const picocolors_1 = require("picocolors");
+const glee_flags_1 = require("../../core/flags/new/glee.flags");
 const successMessage = (projectName) => `🎉 Your Glee project has been successfully created!
 ⏩ Next steps: follow the instructions ${(0, picocolors_1.cyan)('below')} to manage your project:
 
   cd ${projectName}\t\t ${(0, picocolors_1.gray)('# Navigate to the project directory')}
   npm install\t\t ${(0, picocolors_1.gray)('# Install the project dependencies')}
-  npm run dev\t\t ${(0, picocolors_1.gray)('# Start the project in development mode')} 
+  npm run dev\t\t ${(0, picocolors_1.gray)('# Start the project in development mode')}
 
 You can also open the project in your favourite editor and start tweaking it.
 `;
 exports.successMessage = successMessage;
 const errorMessages = {
-    alreadyExists: (projectName) => `Unable to create the project because the directory "${(0, picocolors_1.cyan)(projectName)}" already exists at "${process.cwd()}/${projectName}". 
+    alreadyExists: (projectName) => `Unable to create the project because the directory "${(0, picocolors_1.cyan)(projectName)}" already exists at "${process.cwd()}/${projectName}".
 To specify a different name for the new project, please run the command below with a unique project name:
 
     ${(0, picocolors_1.gray)('asyncapi new glee --name ') + (0, picocolors_1.gray)(projectName) + (0, picocolors_1.gray)('-1')}`,
@@ -174,24 +174,4 @@ exports.default = NewGlee;
 NewGlee.description = 'Creates a new Glee project';
 NewGlee.successMessage = exports.successMessage;
 NewGlee.errorMessages = errorMessages;
-NewGlee.flags = {
-    help: core_1.Flags.help({ char: 'h' }),
-    name: core_1.Flags.string({
-        char: 'n',
-        description: 'Name of the Project',
-        default: 'project',
-    }),
-    template: core_1.Flags.string({
-        char: 't',
-        description: 'Name of the Template',
-        default: 'default',
-    }),
-    file: core_1.Flags.string({
-        char: 'f',
-        description: 'The path to the AsyncAPI file for generating a Glee project.',
-    }),
-    'force-write': core_1.Flags.boolean({
-        default: false,
-        description: 'Force writing of the generated files to given directory even if it is a git repo with unstaged files or not empty dir (defaults to false)',
-    }),
-};
+NewGlee.flags = (0, glee_flags_1.gleeFlags)();

package/lib/commands/optimize.d.ts

@@ -1,4 +1,4 @@
-import Command from '../base';
+import Command from '../core/base';
 import { Parser } from '@asyncapi/parser';
 export declare enum Optimizations {
     REMOVE_COMPONENTS = "remove-components",

package/lib/commands/optimize.js

@@ -4,13 +4,14 @@ exports.Outputs = exports.Optimizations = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const optimizer_1 = require("@asyncapi/optimizer");
-const base_1 = tslib_1.__importDefault(require("../base"));
-const validation_error_1 = require("../errors/validation-error");
-const SpecificationFile_1 = require("../models/SpecificationFile");
+const base_1 = tslib_1.__importDefault(require("../core/base"));
+const validation_error_1 = require("../core/errors/validation-error");
+const SpecificationFile_1 = require("../core/models/SpecificationFile");
 const inquirer = tslib_1.__importStar(require("inquirer"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fs_1 = require("fs");
 const parser_1 = require("@asyncapi/parser");
+const optimize_flags_1 = require("../core/flags/optimize.flags");
 const { writeFile } = fs_1.promises;
 var Optimizations;
 (function (Optimizations) {
@@ -195,12 +196,7 @@ Optimize.examples = [
     'asyncapi optimize ./asyncapi.yaml --optimization=remove-components --optimization=reuse-components --optimization=move-all-to-components --no-tty',
     'asyncapi optimize ./asyncapi.yaml --optimization=remove-components --output=terminal --no-tty',
 ];
-Optimize.flags = {
-    help: core_1.Flags.help({ char: 'h' }),
-    optimization: core_1.Flags.string({ char: 'p', default: Object.values(Optimizations), options: Object.values(Optimizations), multiple: true, description: 'select the type of optimizations that you want to apply.' }),
-    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.flags = (0, optimize_flags_1.optimizeFlags)();
 Optimize.args = {
     'spec-file': core_1.Args.string({ description: 'spec path, url, or context-name', required: false }),
 };

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

@@ -1,4 +1,4 @@
-import Command from '../../base';
+import Command from '../../core/base';
 export default class Start extends Command {
     static description: string;
     run(): Promise<void>;

package/lib/commands/start/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const base_1 = tslib_1.__importDefault(require("../../base"));
+const base_1 = tslib_1.__importDefault(require("../../core/base"));
 const core_1 = require("@oclif/core");
 class Start extends base_1.default {
     run() {
@@ -12,4 +12,4 @@ class Start extends base_1.default {
     }
 }
 exports.default = Start;
-Start.description = 'Start asyncapi studio';
+Start.description = '';

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

@@ -1,4 +1,4 @@
-import Command from '../../base';
+import Command from '../../core/base';
 export default class StartStudio extends Command {
     static description: string;
     static flags: {

package/lib/commands/start/studio.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
-const base_1 = tslib_1.__importDefault(require("../../base"));
-const Studio_1 = require("../../models/Studio");
-const SpecificationFile_1 = require("../../models/SpecificationFile");
+const base_1 = tslib_1.__importDefault(require("../../core/base"));
+const Studio_1 = require("../../core/models/Studio");
+const SpecificationFile_1 = require("../../core/models/SpecificationFile");
+const studio_flags_1 = require("../../core/flags/start/studio.flags");
 class StartStudio extends base_1.default {
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -19,8 +19,4 @@ class StartStudio extends base_1.default {
 }
 exports.default = StartStudio;
 StartStudio.description = 'starts a new local instance of Studio';
-StartStudio.flags = {
-    help: core_1.Flags.help({ char: 'h' }),
-    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.flags = (0, studio_flags_1.studioFlags)();