@asyncapi/cli 0.55.0 → 0.56.1

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.26.3"
+        "@asyncapi/glee": "^0.26.4"
       },
       "devDependencies": {
         "@types/node": "^20.5.9"
@@ -462,9 +462,9 @@
       }
     },
     "node_modules/@asyncapi/glee": {
-      "version": "0.26.3",
-      "resolved": "https://registry.npmjs.org/@asyncapi/glee/-/glee-0.26.3.tgz",
-      "integrity": "sha512-BNF+s/K3CDZGTS6ZjmsLMRwaQPBQxu1YlwTwxpp6Fina0lDVIx7eKvh0uTPa6A4RhW7dz6dB22V12oFazR3UDw==",
+      "version": "0.26.4",
+      "resolved": "https://registry.npmjs.org/@asyncapi/glee/-/glee-0.26.4.tgz",
+      "integrity": "sha512-EXHlCFL2GgVf85hl+ydCIxKs6Oddtp7Zyz2aRvE1gdFbTVxf1MZI3iLvN1b6RoTD/RhbxI9nrCOvNPrP6mP4CQ==",
       "dependencies": {
         "@asyncapi/generator": "^1.11.0",
         "@asyncapi/html-template": "^0.28.4",
@@ -2755,13 +2755,13 @@
       }
     },
     "node_modules/@jimp/jpeg": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.1.tgz",
-      "integrity": "sha512-8352zrdlCCLFdZ/J+JjBslDvml+fS3Z8gttdml0We759PnnZGqrnPRhkOEOJbNUlE+dD4ckLeIe6NPxlS/7U+w==",
+      "version": "0.16.13",
+      "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.13.tgz",
+      "integrity": "sha512-BJHlDxzTlCqP2ThqP8J0eDrbBfod7npWCbJAcfkKqdQuFk0zBPaZ6KKaQKyKxmWJ87Z6ohANZoMKEbtvrwz1AA==",
       "dependencies": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.16.1",
-        "jpeg-js": "0.4.2"
+        "@jimp/utils": "^0.16.13",
+        "jpeg-js": "^0.4.2"
       },
       "peerDependencies": {
         "@jimp/custom": ">=0.3.5"
@@ -3113,9 +3113,9 @@
       }
     },
     "node_modules/@jimp/utils": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.1.tgz",
-      "integrity": "sha512-8fULQjB0x4LzUSiSYG6ZtQl355sZjxbv8r9PPAuYHzS9sGiSHJQavNqK/nKnpDsVkU88/vRGcE7t3nMU0dEnVw==",
+      "version": "0.16.13",
+      "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.13.tgz",
+      "integrity": "sha512-VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA==",
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "regenerator-runtime": "^0.13.3"
@@ -4241,6 +4241,14 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
@@ -7839,9 +7847,9 @@
       }
     },
     "node_modules/jpeg-js": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.2.tgz",
-      "integrity": "sha512-+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw=="
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
+      "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
     },
     "node_modules/js-sdsl": {
       "version": "4.3.0",
@@ -9442,23 +9450,24 @@
       }
     },
     "node_modules/plist": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
-      "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
+      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
       "dependencies": {
+        "@xmldom/xmldom": "^0.8.8",
         "base64-js": "^1.5.1",
-        "xmlbuilder": "^9.0.7"
+        "xmlbuilder": "^15.1.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10.4.0"
       }
     },
     "node_modules/plist/node_modules/xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
       "engines": {
-        "node": ">=4.0"
+        "node": ">=8.0"
       }
     },
     "node_modules/pngjs": {
@@ -12528,9 +12537,9 @@
       }
     },
     "@asyncapi/glee": {
-      "version": "0.26.3",
-      "resolved": "https://registry.npmjs.org/@asyncapi/glee/-/glee-0.26.3.tgz",
-      "integrity": "sha512-BNF+s/K3CDZGTS6ZjmsLMRwaQPBQxu1YlwTwxpp6Fina0lDVIx7eKvh0uTPa6A4RhW7dz6dB22V12oFazR3UDw==",
+      "version": "0.26.4",
+      "resolved": "https://registry.npmjs.org/@asyncapi/glee/-/glee-0.26.4.tgz",
+      "integrity": "sha512-EXHlCFL2GgVf85hl+ydCIxKs6Oddtp7Zyz2aRvE1gdFbTVxf1MZI3iLvN1b6RoTD/RhbxI9nrCOvNPrP6mP4CQ==",
       "requires": {
         "@asyncapi/generator": "^1.11.0",
         "@asyncapi/html-template": "^0.28.4",
@@ -14209,13 +14218,13 @@
       }
     },
     "@jimp/jpeg": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.1.tgz",
-      "integrity": "sha512-8352zrdlCCLFdZ/J+JjBslDvml+fS3Z8gttdml0We759PnnZGqrnPRhkOEOJbNUlE+dD4ckLeIe6NPxlS/7U+w==",
+      "version": "0.16.13",
+      "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.13.tgz",
+      "integrity": "sha512-BJHlDxzTlCqP2ThqP8J0eDrbBfod7npWCbJAcfkKqdQuFk0zBPaZ6KKaQKyKxmWJ87Z6ohANZoMKEbtvrwz1AA==",
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.16.1",
-        "jpeg-js": "0.4.2"
+        "@jimp/utils": "^0.16.13",
+        "jpeg-js": "^0.4.2"
       }
     },
     "@jimp/plugin-blit": {
@@ -14473,9 +14482,9 @@
       }
     },
     "@jimp/utils": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.1.tgz",
-      "integrity": "sha512-8fULQjB0x4LzUSiSYG6ZtQl355sZjxbv8r9PPAuYHzS9sGiSHJQavNqK/nKnpDsVkU88/vRGcE7t3nMU0dEnVw==",
+      "version": "0.16.13",
+      "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.13.tgz",
+      "integrity": "sha512-VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA==",
       "requires": {
         "@babel/runtime": "^7.7.2",
         "regenerator-runtime": "^0.13.3"
@@ -15351,6 +15360,11 @@
         "eslint-visitor-keys": "^3.0.0"
       }
     },
+    "@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="
+    },
     "a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
@@ -18001,9 +18015,9 @@
       "integrity": "sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w=="
     },
     "jpeg-js": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.2.tgz",
-      "integrity": "sha512-+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw=="
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
+      "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
     },
     "js-sdsl": {
       "version": "4.3.0",
@@ -19220,18 +19234,19 @@
       }
     },
     "plist": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
-      "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
+      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
       "requires": {
+        "@xmldom/xmldom": "^0.8.8",
         "base64-js": "^1.5.1",
-        "xmlbuilder": "^9.0.7"
+        "xmlbuilder": "^15.1.1"
       },
       "dependencies": {
         "xmlbuilder": {
-          "version": "9.0.7",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-          "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+          "version": "15.1.1",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+          "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="
         }
       }
     },

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.26.3"
+    "@asyncapi/glee": "^0.26.4"
   },
   "devDependencies": {
     "@types/node": "^20.5.9"

package/lib/commands/convert.js

@@ -11,7 +11,7 @@ const specification_file_1 = require("../errors/specification-file");
 const converter_1 = require("@asyncapi/converter");
 // @ts-ignore
 const specs_1 = tslib_1.__importDefault(require("@asyncapi/specs"));
-const latestVersion = Object.keys(specs_1.default).pop();
+const latestVersion = Object.keys(specs_1.default.schemas).pop();
 class Convert extends base_1.default {
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {

package/lib/commands/generate/models.js

@@ -3,6 +3,7 @@ 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");
@@ -38,6 +39,10 @@ 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.0.0) to a document compatible with the Parser-API version in use in @asyncapi/parser@v2.x  (v1.0.0)
+            // This is needed until https://github.com/asyncapi/modelina/issues/1493 gets fixed.
+            const convertedDoc = (0, multi_parser_1.ConvertDocumentParserAPIVersion)(document.json(), '1.0.0');
             modelina_1.Logger.setLogger({
                 info: (message) => {
                     this.log(message);
@@ -185,12 +190,12 @@ class Models extends base_1.default {
                     throw new Error(`Could not determine generator for language ${language}, are you using one of the following values ${possibleLanguageValues}?`);
             }
             if (output) {
-                const models = yield fileGenerator.generateToFiles(document, output, Object.assign({}, fileOptions));
+                const models = yield fileGenerator.generateToFiles(convertedDoc, output, Object.assign({}, fileOptions));
                 const generatedModels = models.map((model) => { return model.modelName; });
                 this.log(`Successfully generated the following models: ${generatedModels.join(', ')}`);
                 return;
             }
-            const models = yield fileGenerator.generateCompleteModels(document, Object.assign({}, fileOptions));
+            const models = yield fileGenerator.generateCompleteModels(convertedDoc, Object.assign({}, fileOptions));
             const generatedModels = models.map((model) => {
                 return `
 ## Model name: ${model.modelName}

package/lib/parser.d.ts

@@ -1,7 +1,7 @@
 import { convertToOldAPI } from '@asyncapi/parser/cjs';
 import { OutputFormat } from '@stoplight/spectral-cli/dist/services/config';
-import type Command from './base';
 import type { Diagnostic } from '@asyncapi/parser/cjs';
+import type Command from './base';
 import type { Specification } from './models/SpecificationFile';
 export declare type SeveritytKind = 'error' | 'warn' | 'info' | 'hint';
 export { convertToOldAPI };

package/lib/parser.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatOutput = exports.parse = exports.validate = exports.validationFlags = exports.convertToOldAPI = void 0;
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
-const cjs_1 = require("@asyncapi/parser/cjs");
-Object.defineProperty(exports, "convertToOldAPI", { enumerable: true, get: function () { return cjs_1.convertToOldAPI; } });
 const avro_schema_parser_1 = require("@asyncapi/avro-schema-parser");
 const openapi_schema_parser_1 = require("@asyncapi/openapi-schema-parser");
+const cjs_1 = require("@asyncapi/parser/cjs");
+Object.defineProperty(exports, "convertToOldAPI", { enumerable: true, get: function () { return cjs_1.convertToOldAPI; } });
 const raml_dt_schema_parser_1 = require("@asyncapi/raml-dt-schema-parser");
+const core_1 = require("@oclif/core");
 const protobuf_schema_parser_1 = require("@asyncapi/protobuf-schema-parser");
 const spectral_core_1 = require("@stoplight/spectral-core");
-const formatters_1 = require("@stoplight/spectral-cli/dist/formatters");
 const config_1 = require("@stoplight/spectral-cli/dist/services/config");
+const spectral_formatters_1 = require("@stoplight/spectral-formatters");
 const parser = new cjs_1.Parser({
     __unstable: {
         resolver: {
@@ -85,14 +85,14 @@ function logDiagnostics(diagnostics, command, specFile, options = {}) {
 function formatOutput(diagnostics, format, failSeverity) {
     const options = { failSeverity: (0, spectral_core_1.getDiagnosticSeverity)(failSeverity) };
     switch (format) {
-        case 'stylish': return (0, formatters_1.stylish)(diagnostics, options);
-        case 'json': return (0, formatters_1.json)(diagnostics, options);
-        case 'junit': return (0, formatters_1.junit)(diagnostics, options);
-        case 'html': return (0, formatters_1.html)(diagnostics, options);
-        case 'text': return (0, formatters_1.text)(diagnostics, options);
-        case 'teamcity': return (0, formatters_1.teamcity)(diagnostics, options);
-        case 'pretty': return (0, formatters_1.pretty)(diagnostics, options);
-        default: return (0, formatters_1.stylish)(diagnostics, options);
+        case 'stylish': return (0, spectral_formatters_1.stylish)(diagnostics, options);
+        case 'json': return (0, spectral_formatters_1.json)(diagnostics, options);
+        case 'junit': return (0, spectral_formatters_1.junit)(diagnostics, options);
+        case 'html': return (0, spectral_formatters_1.html)(diagnostics, options);
+        case 'text': return (0, spectral_formatters_1.text)(diagnostics, options);
+        case 'teamcity': return (0, spectral_formatters_1.teamcity)(diagnostics, options);
+        case 'pretty': return (0, spectral_formatters_1.pretty)(diagnostics, options);
+        default: return (0, spectral_formatters_1.stylish)(diagnostics, options);
     }
 }
 exports.formatOutput = formatOutput;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.55.0",
+  "version": "0.56.1",
   "commands": {
     "bundle": {
       "id": "bundle",
@@ -76,7 +76,7 @@
           "char": "t",
           "description": "asyncapi version to convert to",
           "multiple": false,
-          "default": "2.6.0"
+          "default": "3.0.0"
         }
       },
       "args": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "0.55.0",
+  "version": "0.56.1",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run"
@@ -16,14 +16,15 @@
     "@asyncapi/modelina": "^1.9.0",
     "@asyncapi/openapi-schema-parser": "^3.0.3",
     "@asyncapi/optimizer": "^0.2.1",
-    "@asyncapi/parser": "^2.1.0",
+    "@asyncapi/parser": "^3.0.0-next-major-spec.2",
     "@asyncapi/protobuf-schema-parser": "3.0.0",
     "@asyncapi/raml-dt-schema-parser": "^4.0.3",
     "@asyncapi/studio": "^0.17.3",
     "@oclif/core": "^1.26.2",
     "@oclif/errors": "^1.3.6",
     "@oclif/plugin-not-found": "^2.3.22",
-    "@stoplight/spectral-cli": "6.6.0",
+    "@smoya/multi-parser": "^3.0.0",
+    "@stoplight/spectral-cli": "6.9.0",
     "ajv": "^8.12.0",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.2",