@asyncapi/cli 2.3.12 → 2.4.0

package/assets/create-glee-app/templates/default/package-lock.json

@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@asyncapi/glee": "^0.37.7"
+        "@asyncapi/glee": "^0.37.8"
       },
       "devDependencies": {
         "@types/node": "^20.5.9"
@@ -81,9 +81,9 @@
       }
     },
     "node_modules/@asyncapi/generator-react-sdk": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.1.1.tgz",
-      "integrity": "sha512-R86Xa20wLtzI4fVf9HECR+UCSYvNE1B4WZs3eI5jAvGtONBTFOvkixd4SUL+uLP4DP96pU2DuKhih/PQbmMneQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.1.2.tgz",
+      "integrity": "sha512-hU9ux8hEMhXwQWWzySZlZ+L5SsM0r4uXdPFvYRTX5uVGeLKGoj4Ok8hY2gPhahKcvMELOIU2mw3O6h9h9AcskQ==",
       "dependencies": {
         "@asyncapi/parser": "^3.1.0",
         "@babel/core": "7.12.9",
@@ -169,13 +169,13 @@
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/@asyncapi/glee": {
-      "version": "0.37.7",
-      "resolved": "https://registry.npmjs.org/@asyncapi/glee/-/glee-0.37.7.tgz",
-      "integrity": "sha512-E+wGnDmV3ix2eELOeDlHOKSQx0Q+7BcxrBWzQQGkxAiMPjJz+2gzfKXU/58MX8CNnvXFWSVLnKRDtR+ntU4rJQ==",
+      "version": "0.37.8",
+      "resolved": "https://registry.npmjs.org/@asyncapi/glee/-/glee-0.37.8.tgz",
+      "integrity": "sha512-1qa/OuOzA38AvuNu1w/wduXKnXjxtHMcCYggVoCQVIzJZ6lG9xaK73g3floUUDK5sMAqiytvisCyGVobXzv4Kw==",
       "dependencies": {
         "@asyncapi/generator": "^1.17.25",
-        "@asyncapi/html-template": "^2.3.10",
-        "@asyncapi/markdown-template": "^1.6.5",
+        "@asyncapi/html-template": "^2.3.14",
+        "@asyncapi/markdown-template": "^1.6.6",
         "@asyncapi/parser": "^3.1.0",
         "@next/env": "^14.0.4",
         "@types/jest": "^29.5.11",
@@ -216,11 +216,11 @@
       }
     },
     "node_modules/@asyncapi/html-template": {
-      "version": "2.3.13",
-      "resolved": "https://registry.npmjs.org/@asyncapi/html-template/-/html-template-2.3.13.tgz",
-      "integrity": "sha512-IxldILMhc78cQVGf+gP9ggBeclOs7d2AHGhoCeyLsqfTbn4ndnxLS5IjI+JgAf1BAPvHFg6bBX6Tnfnw8ZxxFw==",
+      "version": "2.3.14",
+      "resolved": "https://registry.npmjs.org/@asyncapi/html-template/-/html-template-2.3.14.tgz",
+      "integrity": "sha512-e7jHGXNtovA2u9n0A9CtPy+xkXa76vpz+gdY/4q4TC4bm6EadEhcDiNQ0LtFnUjcHDuxXzYZs8/0BZr1vSBeQw==",
       "dependencies": {
-        "@asyncapi/generator-react-sdk": "^1.1.1",
+        "@asyncapi/generator-react-sdk": "^1.1.2",
         "@asyncapi/parser": "^3.1.0",
         "@asyncapi/react-component": "^1.2.13",
         "highlight.js": "10.7.3",
@@ -231,11 +231,11 @@
       }
     },
     "node_modules/@asyncapi/markdown-template": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@asyncapi/markdown-template/-/markdown-template-1.6.5.tgz",
-      "integrity": "sha512-5lzj5HO0sKNkg90fRQ/cE20MJoYmqKdvHhRDocFm5LKN0OPj3sgFqExYE64mVA0AEdXcUeF23dpv8094qc2hkg==",
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/@asyncapi/markdown-template/-/markdown-template-1.6.6.tgz",
+      "integrity": "sha512-Hm9B/g2B9lHpE2uoM6nKQqU3PmRGpalwm/ufKcLHV4aPq3S870nvD2TWPv+qVMCCeJMyOeJi0l8Wj5yWY4TU2A==",
       "dependencies": {
-        "@asyncapi/generator-react-sdk": "^1.1.1",
+        "@asyncapi/generator-react-sdk": "^1.1.2",
         "openapi-sampler": "^1.3.0",
         "yaml": "^1.10.2"
       }
@@ -10169,9 +10169,9 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "node_modules/path-to-regexp": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
-      "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw=="
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",

package/assets/create-glee-app/templates/default/package.json

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/asyncapi/glee-hello-world#readme",
   "dependencies": {
-    "@asyncapi/glee": "^0.37.7"
+    "@asyncapi/glee": "^0.37.8"
   },
   "devDependencies": {
     "@types/node": "^20.5.9"

package/assets/create-glee-app/templates/tutorial/package-lock.json

@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@asyncapi/glee": "^0.37.7"
+        "@asyncapi/glee": "^0.37.8"
       },
       "engines": {
         "node": ">=14.15.1"
@@ -78,9 +78,9 @@
       }
     },
     "node_modules/@asyncapi/generator-react-sdk": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.1.1.tgz",
-      "integrity": "sha512-R86Xa20wLtzI4fVf9HECR+UCSYvNE1B4WZs3eI5jAvGtONBTFOvkixd4SUL+uLP4DP96pU2DuKhih/PQbmMneQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.1.2.tgz",
+      "integrity": "sha512-hU9ux8hEMhXwQWWzySZlZ+L5SsM0r4uXdPFvYRTX5uVGeLKGoj4Ok8hY2gPhahKcvMELOIU2mw3O6h9h9AcskQ==",
       "dependencies": {
         "@asyncapi/parser": "^3.1.0",
         "@babel/core": "7.12.9",
@@ -166,13 +166,13 @@
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/@asyncapi/glee": {
-      "version": "0.37.7",
-      "resolved": "https://registry.npmjs.org/@asyncapi/glee/-/glee-0.37.7.tgz",
-      "integrity": "sha512-E+wGnDmV3ix2eELOeDlHOKSQx0Q+7BcxrBWzQQGkxAiMPjJz+2gzfKXU/58MX8CNnvXFWSVLnKRDtR+ntU4rJQ==",
+      "version": "0.37.8",
+      "resolved": "https://registry.npmjs.org/@asyncapi/glee/-/glee-0.37.8.tgz",
+      "integrity": "sha512-1qa/OuOzA38AvuNu1w/wduXKnXjxtHMcCYggVoCQVIzJZ6lG9xaK73g3floUUDK5sMAqiytvisCyGVobXzv4Kw==",
       "dependencies": {
         "@asyncapi/generator": "^1.17.25",
-        "@asyncapi/html-template": "^2.3.10",
-        "@asyncapi/markdown-template": "^1.6.5",
+        "@asyncapi/html-template": "^2.3.14",
+        "@asyncapi/markdown-template": "^1.6.6",
         "@asyncapi/parser": "^3.1.0",
         "@next/env": "^14.0.4",
         "@types/jest": "^29.5.11",
@@ -213,11 +213,11 @@
       }
     },
     "node_modules/@asyncapi/html-template": {
-      "version": "2.3.13",
-      "resolved": "https://registry.npmjs.org/@asyncapi/html-template/-/html-template-2.3.13.tgz",
-      "integrity": "sha512-IxldILMhc78cQVGf+gP9ggBeclOs7d2AHGhoCeyLsqfTbn4ndnxLS5IjI+JgAf1BAPvHFg6bBX6Tnfnw8ZxxFw==",
+      "version": "2.3.14",
+      "resolved": "https://registry.npmjs.org/@asyncapi/html-template/-/html-template-2.3.14.tgz",
+      "integrity": "sha512-e7jHGXNtovA2u9n0A9CtPy+xkXa76vpz+gdY/4q4TC4bm6EadEhcDiNQ0LtFnUjcHDuxXzYZs8/0BZr1vSBeQw==",
       "dependencies": {
-        "@asyncapi/generator-react-sdk": "^1.1.1",
+        "@asyncapi/generator-react-sdk": "^1.1.2",
         "@asyncapi/parser": "^3.1.0",
         "@asyncapi/react-component": "^1.2.13",
         "highlight.js": "10.7.3",
@@ -228,11 +228,11 @@
       }
     },
     "node_modules/@asyncapi/markdown-template": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@asyncapi/markdown-template/-/markdown-template-1.6.5.tgz",
-      "integrity": "sha512-5lzj5HO0sKNkg90fRQ/cE20MJoYmqKdvHhRDocFm5LKN0OPj3sgFqExYE64mVA0AEdXcUeF23dpv8094qc2hkg==",
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/@asyncapi/markdown-template/-/markdown-template-1.6.6.tgz",
+      "integrity": "sha512-Hm9B/g2B9lHpE2uoM6nKQqU3PmRGpalwm/ufKcLHV4aPq3S870nvD2TWPv+qVMCCeJMyOeJi0l8Wj5yWY4TU2A==",
       "dependencies": {
-        "@asyncapi/generator-react-sdk": "^1.1.1",
+        "@asyncapi/generator-react-sdk": "^1.1.2",
         "openapi-sampler": "^1.3.0",
         "yaml": "^1.10.2"
       }
@@ -10166,9 +10166,9 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "node_modules/path-to-regexp": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
-      "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw=="
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",

package/assets/create-glee-app/templates/tutorial/package.json

@@ -16,6 +16,6 @@
   "author": "Fran Mendez",
   "license": "Apache-2.0",
   "dependencies": {
-    "@asyncapi/glee": "^0.37.7"
+    "@asyncapi/glee": "^0.37.8"
   }
 }

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

@@ -6,7 +6,7 @@
     "": {
       "name": "myTemplate",
       "dependencies": {
-        "@asyncapi/generator-react-sdk": "^1.1.1"
+        "@asyncapi/generator-react-sdk": "^1.1.2"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -23,9 +23,9 @@
       }
     },
     "node_modules/@asyncapi/generator-react-sdk": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.1.1.tgz",
-      "integrity": "sha512-R86Xa20wLtzI4fVf9HECR+UCSYvNE1B4WZs3eI5jAvGtONBTFOvkixd4SUL+uLP4DP96pU2DuKhih/PQbmMneQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.1.2.tgz",
+      "integrity": "sha512-hU9ux8hEMhXwQWWzySZlZ+L5SsM0r4uXdPFvYRTX5uVGeLKGoj4Ok8hY2gPhahKcvMELOIU2mw3O6h9h9AcskQ==",
       "dependencies": {
         "@asyncapi/parser": "^3.1.0",
         "@babel/core": "7.12.9",

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

@@ -5,6 +5,6 @@
     "supportedProtocols": []
   },
   "dependencies": {
-    "@asyncapi/generator-react-sdk": "^1.1.1"
+    "@asyncapi/generator-react-sdk": "^1.1.2"
   }
 }

package/lib/commands/convert.d.ts

@@ -4,7 +4,9 @@ export default class Convert extends Command {
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        format: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         'target-version': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        perspective: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     static args: {
         'spec-file': import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;

package/lib/commands/convert.js

@@ -27,9 +27,19 @@ class Convert extends base_1.default {
                 this.specFile = yield (0, SpecificationFile_1.load)(filePath);
                 // eslint-disable-next-line sonarjs/no-duplicate-string
                 this.metricsMetadata.to_version = flags['target-version'];
+                // Determine if the input is OpenAPI or AsyncAPI
+                const specJson = this.specFile.toJson();
+                const isOpenAPI = flags['format'] === 'openapi';
+                const isAsyncAPI = flags['format'] === 'asyncapi';
                 // CONVERSION
-                convertedFile = (0, converter_1.convert)(this.specFile.text(), flags['target-version']);
-                if (convertedFile) {
+                if (isOpenAPI) {
+                    convertedFile = (0, converter_1.convertOpenAPI)(this.specFile.text(), specJson.openapi, {
+                        perspective: flags['perspective']
+                    });
+                    this.log(`🎉 The OpenAPI document has been successfully converted to AsyncAPI version ${(0, picocolors_1.green)(flags['target-version'])}!`);
+                }
+                else if (isAsyncAPI) {
+                    convertedFile = (0, converter_1.convert)(this.specFile.text(), flags['target-version']);
                     if (this.specFile.getFilePath()) {
                         this.log(`🎉 The ${(0, picocolors_1.cyan)(this.specFile.getFilePath())} file has been successfully converted to version ${(0, picocolors_1.green)(flags['target-version'])}!!`);
                     }
@@ -68,7 +78,7 @@ class Convert extends base_1.default {
     }
 }
 exports.default = Convert;
-Convert.description = 'Convert asyncapi documents older to newer versions';
+Convert.description = 'Convert asyncapi documents older to newer versions or OpenAPI documents to AsyncAPI';
 Convert.flags = (0, convert_flags_1.convertFlags)(latestVersion);
 Convert.args = {
     'spec-file': core_1.Args.string({ description: 'spec path, url, or context-name', required: false }),

package/lib/core/flags/convert.flags.d.ts

@@ -1,5 +1,7 @@
 export declare const convertFlags: (latestVersion: string) => {
     help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
     output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+    format: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     'target-version': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+    perspective: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
 };

package/lib/core/flags/convert.flags.js

@@ -6,7 +6,20 @@ const convertFlags = (latestVersion) => {
     return {
         help: core_1.Flags.help({ char: 'h' }),
         output: core_1.Flags.string({ char: 'o', description: 'path to the file where the result is saved' }),
-        'target-version': core_1.Flags.string({ char: 't', description: 'asyncapi version to convert to', default: latestVersion })
+        format: core_1.Flags.string({
+            char: 'f',
+            description: 'Specify the format to convert from (openapi or asyncapi)',
+            options: ['openapi', 'asyncapi'],
+            required: true,
+            default: 'asyncapi',
+        }),
+        'target-version': core_1.Flags.string({ char: 't', description: 'asyncapi version to convert to', default: latestVersion }),
+        perspective: core_1.Flags.string({
+            char: 'p',
+            description: 'Perspective to use when converting OpenAPI to AsyncAPI (client or server). Note: This option is only applicable for OpenAPI to AsyncAPI conversions.',
+            options: ['client', 'server'],
+            default: 'server',
+        }),
     };
 };
 exports.convertFlags = convertFlags;

package/oclif.manifest.json

@@ -75,7 +75,7 @@
           "required": false
         }
       },
-      "description": "Convert asyncapi documents older to newer versions",
+      "description": "Convert asyncapi documents older to newer versions or OpenAPI documents to AsyncAPI",
       "flags": {
         "help": {
           "char": "h",
@@ -92,6 +92,20 @@
           "multiple": false,
           "type": "option"
         },
+        "format": {
+          "char": "f",
+          "description": "Specify the format to convert from (openapi or asyncapi)",
+          "name": "format",
+          "required": true,
+          "default": "asyncapi",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "openapi",
+            "asyncapi"
+          ],
+          "type": "option"
+        },
         "target-version": {
           "char": "t",
           "description": "asyncapi version to convert to",
@@ -100,6 +114,19 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "perspective": {
+          "char": "p",
+          "description": "Perspective to use when converting OpenAPI to AsyncAPI (client or server). Note: This option is only applicable for OpenAPI to AsyncAPI conversions.",
+          "name": "perspective",
+          "default": "server",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "client",
+            "server"
+          ],
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -1587,5 +1614,5 @@
       ]
     }
   },
-  "version": "2.3.12"
+  "version": "2.4.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "2.3.12",
+  "version": "2.4.0",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -10,7 +10,7 @@
   "dependencies": {
     "@asyncapi/avro-schema-parser": "^3.0.23",
     "@asyncapi/bundler": "^0.6.3",
-    "@asyncapi/converter": "^1.6.0",
+    "@asyncapi/converter": "^1.6.1",
     "@asyncapi/diff": "^0.4.1",
     "@asyncapi/generator": "^1.17.25",
     "@asyncapi/modelina": "^3.7.0",