@asyncapi/cli 1.18.0 → 2.0.0

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

@@ -1,17 +1,21 @@
 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>;
+        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>;
@@ -21,17 +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>;
+        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>;
-        javaIncludeComments: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        javaJackson: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        javaConstraints: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         namespace: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        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,38 +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("../../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");
+const modelina_cli_1 = require("@asyncapi/modelina-cli");
 const models_flags_1 = require("../../core/flags/generate/models.flags");
-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(', ');
 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'));
@@ -51,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);
                 },
@@ -68,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) {
@@ -241,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;
             }
@@ -272,14 +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.args = modelina_cli_1.ModelinaArgs;
 Models.flags = (0, models_flags_1.modelsFlags)();

package/lib/core/flags/generate/models.flags.d.ts

@@ -2,12 +2,16 @@ export declare const modelsFlags: () => {
     '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>;
@@ -17,27 +21,8 @@ export declare const modelsFlags: () => {
     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>;
 };

package/lib/core/flags/generate/models.flags.js

@@ -3,123 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.modelsFlags = void 0;
 const core_1 = require("@oclif/core");
 const parser_1 = require("../../parser");
+const modelina_cli_1 = require("@asyncapi/modelina-cli");
 const modelsFlags = () => {
-    return Object.assign({ help: core_1.Flags.help({ char: 'h' }), 'no-interactive': core_1.Flags.boolean({
+    return Object.assign(Object.assign(Object.assign({}, modelina_cli_1.ModelinaFlags), { '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 }));
+        }) }), (0, parser_1.validationFlags)({ logDiagnostics: false }));
 };
 exports.modelsFlags = modelsFlags;

package/oclif.manifest.json

@@ -680,7 +680,8 @@
             "rust",
             "kotlin",
             "php",
-            "cplusplus"
+            "cplusplus",
+            "scala"
           ],
           "required": true
         },
@@ -699,13 +700,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "no-interactive": {
-          "description": "Disable interactive mode and run with the provided flags.",
-          "name": "no-interactive",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
-        },
         "output": {
           "char": "o",
           "description": "The output directory where the models should be written to. Omitting this flag will write the models to `stdout`.",
@@ -715,6 +709,22 @@
           "multiple": false,
           "type": "option"
         },
+        "packageName": {
+          "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`.",
+          "name": "packageName",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "namespace": {
+          "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`.",
+          "name": "namespace",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "tsModelType": {
           "description": "TypeScript specific, define which type of model needs to be generated.",
           "name": "tsModelType",
@@ -789,7 +799,7 @@
           "type": "boolean"
         },
         "tsExampleInstance": {
-          "description": "Typescript specific, generate example of the model",
+          "description": "Typescript specific, generate example of the model.",
           "name": "tsExampleInstance",
           "required": false,
           "allowNo": false,
@@ -802,43 +812,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "packageName": {
-          "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`.",
-          "name": "packageName",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "javaIncludeComments": {
-          "description": "Java specific, if enabled add comments while generating models.",
-          "name": "javaIncludeComments",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "javaJackson": {
-          "description": "Java specific, generate the models with Jackson serialization support",
-          "name": "javaJackson",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "javaConstraints": {
-          "description": "Java specific, generate the models with constraints",
-          "name": "javaConstraints",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "namespace": {
-          "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`.",
-          "name": "namespace",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "csharpAutoImplement": {
           "description": "C# specific, define whether to generate auto-implemented properties or not.",
           "name": "csharpAutoImplement",
@@ -887,6 +860,34 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "javaIncludeComments": {
+          "description": "Java specific, if enabled add comments while generating models.",
+          "name": "javaIncludeComments",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "javaJackson": {
+          "description": "Java specific, generate the models with Jackson serialization support",
+          "name": "javaJackson",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "javaConstraints": {
+          "description": "Java specific, generate the models with constraints",
+          "name": "javaConstraints",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "no-interactive": {
+          "description": "Disable interactive mode and run with the provided flags.",
+          "name": "no-interactive",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
         "log-diagnostics": {
           "description": "log validation diagnostics or not",
           "name": "log-diagnostics",
@@ -1476,5 +1477,5 @@
       ]
     }
   },
-  "version": "1.18.0"
+  "version": "2.0.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "1.18.0",
+  "version": "2.0.0",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -13,7 +13,7 @@
     "@asyncapi/converter": "^1.4.19",
     "@asyncapi/diff": "^0.4.1",
     "@asyncapi/generator": "^1.17.25",
-    "@asyncapi/modelina": "^3.5.1",
+    "@asyncapi/modelina-cli": "^4.0.0-next.48",
     "@asyncapi/openapi-schema-parser": "^3.0.22",
     "@asyncapi/optimizer": "^1.0.2",
     "@asyncapi/parser": "^3.0.16",