@asyncapi/cli 0.40.9 → 0.42.0

package/README.md

@@ -76,6 +76,8 @@ Thanks go to these wonderful people ([emoji key](https://allcontributors.org/doc
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/sambhavgupta0705"><img src="https://avatars.githubusercontent.com/u/81870866?v=4?s=100" width="100px;" alt="Sambhav Gupta"/><br /><sub><b>Sambhav Gupta</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=sambhavgupta0705" title="Code">💻</a> <a href="https://github.com/asyncapi/cli/commits?author=sambhavgupta0705" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/CyberHippo"><img src="https://avatars.githubusercontent.com/u/18269437?v=4?s=100" width="100px;" alt="Hippolyte Vergnol"/><br /><sub><b>Hippolyte Vergnol</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=CyberHippo" title="Code">💻</a> <a href="#infra-CyberHippo" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.jentevets.com"><img src="https://avatars.githubusercontent.com/u/22449126?v=4?s=100" width="100px;" alt="Jente Vets"/><br /><sub><b>Jente Vets</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=Vetsoo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kaushik-rishi"><img src="https://avatars.githubusercontent.com/u/52498617?v=4?s=100" width="100px;" alt="Rishi"/><br /><sub><b>Rishi</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=kaushik-rishi" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://ashishpadhy.live"><img src="https://avatars.githubusercontent.com/u/100484401?v=4?s=100" width="100px;" alt="Ashish Padhy"/><br /><sub><b>Ashish Padhy</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=Shurtu-gal" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

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

@@ -32,11 +32,16 @@ export default class Models extends Command {
          */
         packageName: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         /**
-         * C# specific options
+         * C++ and C# and PHP specific namespace to use for the generated models
          */
         namespace: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        /**
+         * C# specific options
+         */
         csharpAutoImplement: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         csharpArrayType: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        csharpHashcode: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        csharpEqual: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/lib/commands/generate/models.js

@@ -17,6 +17,8 @@ var Languages;
     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 {
@@ -24,7 +26,7 @@ class Models extends base_1.default {
     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, namespace, csharpAutoImplement, csharpArrayType, packageName, output } = flags;
+            const { tsModelType, tsEnumType, tsIncludeComments, tsModuleSystem, tsExportType, tsJsonBinPack, namespace, csharpAutoImplement, csharpArrayType, csharpHashcode, csharpEqual, packageName, output } = flags;
             const { language, file } = args;
             const inputFile = (yield (0, SpecificationFile_1.load)(file)) || (yield (0, SpecificationFile_1.load)());
             const { document, status } = yield (0, parser_1.parse)(this, inputFile, flags);
@@ -81,21 +83,39 @@ class Models extends base_1.default {
                     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.CSharpFileGenerator({
-                        presets: csharpAutoImplement ? [
-                            {
-                                preset: modelina_1.CSHARP_DEFAULT_PRESET,
-                                options: {
-                                    autoImplementedProperties: true
-                                }
+                    if (csharpAutoImplement) {
+                        presets.push({
+                            preset: modelina_1.CSHARP_DEFAULT_PRESET,
+                            options: {
+                                autoImplementedProperties: true
+                            }
+                        });
+                    }
+                    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.');
@@ -135,6 +155,15 @@ class Models extends base_1.default {
                         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}?`);
             }
@@ -215,12 +244,16 @@ Models.flags = Object.assign({ help: core_1.Flags.help({ char: 'h' }), output: c
         required: false
     }), 
     /**
-     * C# specific options
+     * C++ and C# and PHP specific namespace to use for the generated models
      */
     namespace: core_1.Flags.string({
-        description: 'C# specific, define the namespace to use for the generated models. This is required when language is `csharp`.',
+        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
-    }), csharpAutoImplement: core_1.Flags.boolean({
+    }), 
+    /**
+     * C# specific options
+     */
+    csharpAutoImplement: core_1.Flags.boolean({
         description: 'C# specific, define whether to generate auto-implemented properties or not.',
         required: false,
         default: false
@@ -230,4 +263,12 @@ Models.flags = Object.assign({ help: core_1.Flags.help({ char: 'h' }), output: c
         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
     }) }, (0, parser_1.validationFlags)({ logDiagnostics: false }));

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.40.9",
+  "version": "0.42.0",
   "commands": {
     "bundle": {
       "id": "bundle",
@@ -542,7 +542,7 @@
         "namespace": {
           "name": "namespace",
           "type": "option",
-          "description": "C# specific, define the namespace to use for the generated models. This is required when language is `csharp`.",
+          "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,
           "multiple": false
         },
@@ -565,6 +565,20 @@
           ],
           "default": "Array"
         },
+        "csharpHashcode": {
+          "name": "csharpHashcode",
+          "type": "boolean",
+          "description": "C# specific, generate the models with the GetHashCode method overwritten",
+          "required": false,
+          "allowNo": false
+        },
+        "csharpEqual": {
+          "name": "csharpEqual",
+          "type": "boolean",
+          "description": "C# specific, generate the models with the Equal method overwritten",
+          "required": false,
+          "allowNo": false
+        },
         "log-diagnostics": {
           "name": "log-diagnostics",
           "type": "boolean",
@@ -617,7 +631,9 @@
             "dart",
             "python",
             "rust",
-            "kotlin"
+            "kotlin",
+            "php",
+            "cplusplus"
           ]
         },
         "file": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "0.40.9",
+  "version": "0.42.0",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run"