@asyncapi/react-component 1.0.0-next.9 → 1.0.0

package/lib/cjs/helpers/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -10,9 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./bemClasses"), exports);
+__exportStar(require("./common"), exports);
 __exportStar(require("./marked"), exports);
-__exportStar(require("./toKebabCase"), exports);
 __exportStar(require("./parser"), exports);
 __exportStar(require("./specification"), exports);
 __exportStar(require("./server"), exports);

package/lib/cjs/helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA6B;AAC7B,2CAAyB;AACzB,gDAA8B;AAC9B,2CAAyB;AACzB,kDAAgC;AAChC,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,2CAAyB;AACzB,2CAAyB;AACzB,kDAAgC;AAChC,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB","sourcesContent":["export * from './common';\nexport * from './marked';\nexport * from './parser';\nexport * from './specification';\nexport * from './server';\nexport * from './message';\nexport * from './schema';\n"]}

package/lib/cjs/helpers/marked.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hljs = exports.renderMarkdown = void 0;
-var marked_1 = __importDefault(require("marked"));
+var marked_1 = require("marked");
 var core_1 = __importDefault(require("highlight.js/lib/core"));
 exports.hljs = core_1.default;
 var json_1 = __importDefault(require("highlight.js/lib/languages/json"));
@@ -28,7 +28,7 @@ var markedOptions = {
     },
 };
 function renderMarkdown(content) {
-    return marked_1.default(content, markedOptions);
+    return (0, marked_1.marked)(content, markedOptions);
 }
 exports.renderMarkdown = renderMarkdown;
 //# sourceMappingURL=marked.js.map

package/lib/cjs/helpers/marked.js.map

@@ -1 +1 @@
-{"version":3,"file":"marked.js","sourceRoot":"","sources":["../../../src/helpers/marked.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA4B;AAG5B,+DAAyC;AAgChC,eAhCF,cAAI,CAgCE;AA7Bb,yEAAmD;AACnD,cAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,cAAI,CAAC,CAAC;AAGpC,yEAAmD;AACnD,cAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,cAAI,CAAC,CAAC;AAGpC,yEAAmD;AACnD,cAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,cAAI,CAAC,CAAC;AAEpC,IAAM,aAAa,GAAyB;IAC1C,UAAU,EAAE,gBAAgB;IAC5B,SAAS,EAAE,UAAC,IAAI,EAAE,QAAQ;QACxB,IAAI,CAAC,cAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;QACD,IAAI;YACF,OAAO,cAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAC,KAAK,CAAC;SACjD;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;CACF,CAAC;AAEF,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,gBAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC"}
+{"version":3,"file":"marked.js","sourceRoot":"","sources":["../../../src/helpers/marked.ts"],"names":[],"mappings":";;;;;;AAAA,iCAAgC;AAGhC,+DAAyC;AAgChC,eAhCF,cAAI,CAgCE;AA7Bb,yEAAmD;AACnD,cAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,cAAI,CAAC,CAAC;AAGpC,yEAAmD;AACnD,cAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,cAAI,CAAC,CAAC;AAGpC,yEAAmD;AACnD,cAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,cAAI,CAAC,CAAC;AAEpC,IAAM,aAAa,GAAyB;IAC1C,UAAU,EAAE,gBAAgB;IAC5B,SAAS,EAAE,UAAC,IAAI,EAAE,QAAQ;QACxB,IAAI,CAAC,cAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;QACD,IAAI;YACF,OAAO,cAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAC,KAAK,CAAC;SACjD;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;CACF,CAAC;AAEF,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,IAAA,eAAM,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC","sourcesContent":["import { marked } from 'marked';\n\n// @ts-ignore\nimport hljs from 'highlight.js/lib/core';\n\n// @ts-ignore\nimport json from 'highlight.js/lib/languages/json';\nhljs.registerLanguage('json', json);\n\n// @ts-ignore\nimport yaml from 'highlight.js/lib/languages/yaml';\nhljs.registerLanguage('yaml', yaml);\n\n// @ts-ignore\nimport bash from 'highlight.js/lib/languages/bash';\nhljs.registerLanguage('bash', bash);\n\nconst markedOptions: marked.MarkedOptions = {\n  langPrefix: 'hljs language-',\n  highlight: (code, language) => {\n    if (!hljs.getLanguage(language)) {\n      return code;\n    }\n    try {\n      return hljs.highlight(code, { language }).value;\n    } catch (e) {\n      return code;\n    }\n  },\n};\n\nexport function renderMarkdown(content: string): string {\n  return marked(content, markedOptions);\n}\n\nexport { hljs };\n"]}

package/lib/cjs/helpers/message.js

@@ -8,7 +8,7 @@ var MessageHelpers = (function () {
     MessageHelpers.generateExample = function (schema, options) {
         if (options === void 0) { options = {}; }
         try {
-            return this.sanitizeExample(openapi_sampler_1.sample(schema, options)) || '';
+            return this.sanitizeExample((0, openapi_sampler_1.sample)(schema, options)) || '';
         }
         catch (e) {
             return '';
@@ -29,24 +29,54 @@ var MessageHelpers = (function () {
         return schema;
     };
     MessageHelpers.getPayloadExamples = function (msg) {
-        var examples = msg.examples();
-        if (Array.isArray(examples) && examples.some(function (e) { return e.payload; })) {
-            return examples.flatMap(function (e) { return e.payload; }).filter(Boolean);
+        var _a;
+        var examples = msg.examples().all();
+        if (examples.some(function (e) { return e.hasPayload(); })) {
+            var messageExamples = examples
+                .flatMap(function (e) {
+                if (!e.payload()) {
+                    return;
+                }
+                return {
+                    name: e.name(),
+                    summary: e.summary(),
+                    example: e.payload(),
+                };
+            })
+                .filter(Boolean);
+            if (messageExamples.length > 0) {
+                return messageExamples;
+            }
         }
         var payload = msg.payload();
         if (payload && payload.examples()) {
-            return payload.examples();
+            return (_a = payload.examples()) === null || _a === void 0 ? void 0 : _a.map(function (example) { return ({ example: example }); });
         }
         return;
     };
     MessageHelpers.getHeadersExamples = function (msg) {
-        var examples = msg.examples();
-        if (Array.isArray(examples) && examples.some(function (e) { return e.headers; })) {
-            return examples.flatMap(function (e) { return e.headers; }).filter(Boolean);
+        var _a;
+        var examples = msg.examples().all();
+        if (examples.some(function (e) { return e.hasHeaders(); })) {
+            var messageExamples = examples
+                .flatMap(function (e) {
+                if (!e.hasHeaders()) {
+                    return;
+                }
+                return {
+                    name: e.name(),
+                    summary: e.summary(),
+                    example: e.headers(),
+                };
+            })
+                .filter(Boolean);
+            if (messageExamples.length > 0) {
+                return messageExamples;
+            }
         }
         var headers = msg.headers();
         if (headers && headers.examples()) {
-            return headers.examples();
+            return (_a = headers.examples()) === null || _a === void 0 ? void 0 : _a.map(function (example) { return ({ example: example }); });
         }
         return;
     };

package/lib/cjs/helpers/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/helpers/message.ts"],"names":[],"mappings":";;;AAEA,mDAAyC;AAEzC;IAAA;IAiDA,CAAC;IAhDQ,8BAAe,GAAtB,UAAuB,MAAW,EAAE,OAAiB;QAAjB,wBAAA,EAAA,YAAiB;QACnD,IAAI;YACF,OAAO,IAAI,CAAC,eAAe,CAAC,wBAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;SAC5D;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAEM,8BAAe,GAAtB,UAAuB,MAAW;QAAlC,iBAaC;QAZC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAClE,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,EAAwB;oBAAvB,YAAY,QAAA,EAAE,QAAQ,QAAA;gBAChE,IACE,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC;oBACrC,CAAC,YAAY,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAC7C;oBACA,GAAG,CAAC,YAAY,CAAC,GAAG,KAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;iBACpD;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;SACR;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,iCAAkB,GAAzB,UAA0B,GAAY;QACpC,IAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAChC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,OAAO,EAAT,CAAS,CAAC,EAAE;YAC5D,OAAO,QAAQ,CAAC,OAAO,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,OAAO,EAAT,CAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SACzD;QAED,IAAM,OAAO,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;QAC9B,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,EAAE;YACjC,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;SAC3B;QACD,OAAO;IACT,CAAC;IAEM,iCAAkB,GAAzB,UAA0B,GAAY;QACpC,IAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAChC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,OAAO,EAAT,CAAS,CAAC,EAAE;YAC5D,OAAO,QAAQ,CAAC,OAAO,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,OAAO,EAAT,CAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SACzD;QAED,IAAM,OAAO,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;QAC9B,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,EAAE;YACjC,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;SAC3B;QACD,OAAO;IACT,CAAC;IACH,qBAAC;AAAD,CAAC,AAjDD,IAiDC;AAjDY,wCAAc"}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/helpers/message.ts"],"names":[],"mappings":"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","sourcesContent":["import { MessageInterface } from '@asyncapi/parser';\n// @ts-ignore\nimport { sample } from 'openapi-sampler';\n\nimport { MessageExample } from '../types';\n\nexport class MessageHelpers {\n  static generateExample(schema: any, options: any = {}) {\n    try {\n      return this.sanitizeExample(sample(schema, options)) || '';\n    } catch (e) {\n      return '';\n    }\n  }\n\n  static sanitizeExample(schema: any): any {\n    if (typeof schema === 'object' && schema && !Array.isArray(schema)) {\n      return Object.entries(schema).reduce((obj, [propertyName, property]) => {\n        if (\n          !propertyName.startsWith('x-parser-') &&\n          !propertyName.startsWith('x-schema-private-')\n        ) {\n          obj[propertyName] = this.sanitizeExample(property);\n        }\n        return obj;\n      }, {});\n    }\n    return schema;\n  }\n\n  static getPayloadExamples(\n    msg: MessageInterface,\n  ): MessageExample[] | undefined {\n    const examples = msg.examples().all();\n\n    if (examples.some(e => e.hasPayload())) {\n      const messageExamples = examples\n        .flatMap(e => {\n          if (!e.payload()) {\n            return;\n          }\n          return {\n            name: e.name(),\n            summary: e.summary(),\n            example: e.payload(),\n          };\n        })\n        .filter(Boolean) as MessageExample[];\n\n      if (messageExamples.length > 0) {\n        return messageExamples;\n      }\n    }\n\n    const payload = msg.payload();\n    if (payload && payload.examples()) {\n      return payload.examples()?.map(example => ({ example }));\n    }\n\n    return;\n  }\n\n  static getHeadersExamples(\n    msg: MessageInterface,\n  ): MessageExample[] | undefined {\n    const examples = msg.examples().all();\n    if (examples.some(e => e.hasHeaders())) {\n      const messageExamples = examples\n        .flatMap(e => {\n          if (!e.hasHeaders()) {\n            return;\n          }\n          return {\n            name: e.name(),\n            summary: e.summary(),\n            example: e.headers(),\n          };\n        })\n        .filter(Boolean) as MessageExample[];\n\n      if (messageExamples.length > 0) {\n        return messageExamples;\n      }\n    }\n\n    const headers = msg.headers();\n    if (headers && headers.examples()) {\n      return headers.examples()?.map(example => ({ example }));\n    }\n\n    return;\n  }\n}\n"]}

package/lib/cjs/helpers/parser.js

@@ -35,31 +35,31 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = void 0;
 var parser_1 = require("@asyncapi/parser");
-var openapi_schema_parser_1 = __importDefault(require("@asyncapi/openapi-schema-parser"));
-var avro_schema_parser_1 = __importDefault(require("@asyncapi/avro-schema-parser"));
+var openapi_schema_parser_1 = require("@asyncapi/openapi-schema-parser");
+var protobuf_schema_parser_1 = require("@asyncapi/protobuf-schema-parser");
+var avro_schema_parser_1 = require("@asyncapi/avro-schema-parser");
 var constants_1 = require("../constants");
-parser_1.registerSchemaParser(openapi_schema_parser_1.default);
-parser_1.registerSchemaParser(avro_schema_parser_1.default);
+var asyncapiParser = new parser_1.Parser();
+asyncapiParser.registerSchemaParser((0, openapi_schema_parser_1.OpenAPISchemaParser)());
+asyncapiParser.registerSchemaParser((0, avro_schema_parser_1.AvroSchemaParser)());
+asyncapiParser.registerSchemaParser((0, protobuf_schema_parser_1.ProtoBuffSchemaParser)());
 var Parser = (function () {
     function Parser() {
     }
     Parser.parse = function (content, parserOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var asyncapi, err_1;
+            var document_1, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4, parser_1.parse(content, parserOptions)];
+                        return [4, asyncapiParser.parse(content, parserOptions)];
                     case 1:
-                        asyncapi = _a.sent();
-                        return [2, { asyncapi: asyncapi }];
+                        document_1 = (_a.sent()).document;
+                        return [2, { asyncapi: document_1 }];
                     case 2:
                         err_1 = _a.sent();
                         return [2, this.handleError(err_1)];
@@ -70,15 +70,16 @@ var Parser = (function () {
     };
     Parser.parseFromUrl = function (arg, parserOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var asyncapi, err_2;
+            var fromResult, document_2, err_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4, parser_1.parseFromUrl(arg.url, arg.requestOptions, parserOptions)];
+                        fromResult = (0, parser_1.fromURL)(asyncapiParser, arg.url, arg.requestOptions);
+                        return [4, fromResult.parse(parserOptions)];
                     case 1:
-                        asyncapi = _a.sent();
-                        return [2, { asyncapi: asyncapi }];
+                        document_2 = (_a.sent()).document;
+                        return [2, { asyncapi: document_2 }];
                     case 2:
                         err_2 = _a.sent();
                         return [2, this.handleError(err_2)];

package/lib/cjs/helpers/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/helpers/parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6E;AAE7E,0FAAkE;AAElE,oFAA4D;AAI5D,0CAAsD;AAEtD,6BAAoB,CAAC,+BAAmB,CAAC,CAAC;AAC1C,6BAAoB,CAAC,4BAAgB,CAAC,CAAC;AAEvC;IAAA;IAqCA,CAAC;IApCc,YAAK,GAAlB,UACE,OAAqB,EACrB,aAAmB;;;;;;;wBAGA,WAAM,cAAK,CAAC,OAAO,EAAE,aAAa,CAAC,EAAA;;wBAA9C,QAAQ,GAAG,SAAmC;wBACpD,WAAO,EAAE,QAAQ,UAAA,EAAE,EAAC;;;wBAEpB,WAAO,IAAI,CAAC,WAAW,CAAC,KAAG,CAAC,EAAC;;;;;KAEhC;IAEY,mBAAY,GAAzB,UACE,GAA4B,EAC5B,aAAmB;;;;;;;wBAGA,WAAM,qBAAY,CACjC,GAAG,CAAC,GAAG,EACP,GAAG,CAAC,cAAc,EAClB,aAAa,CACd,EAAA;;wBAJK,QAAQ,GAAG,SAIhB;wBACD,WAAO,EAAE,QAAQ,UAAA,EAAE,EAAC;;;wBAEpB,WAAO,IAAI,CAAC,WAAW,CAAC,KAAG,CAAC,EAAC;;;;;KAEhC;IAEc,kBAAW,GAAG,UAAC,GAAgB;QAC5C,IAAI,GAAG,CAAC,IAAI,KAAK,kCAAsB,EAAE;YACvC,OAAO;gBACL,KAAK,EAAE,GAAG;aACX,CAAC;SACH;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC,CAAC;IACJ,aAAC;CAAA,AArCD,IAqCC;AArCY,wBAAM"}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/helpers/parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAqE;AACrE,yEAAsE;AACtE,2EAAyE;AACzE,mEAAgE;AAIhE,0CAAsD;AAEtD,IAAM,cAAc,GAAG,IAAI,eAAc,EAAE,CAAC;AAC5C,cAAc,CAAC,oBAAoB,CAAC,IAAA,2CAAmB,GAAE,CAAC,CAAC;AAC3D,cAAc,CAAC,oBAAoB,CAAC,IAAA,qCAAgB,GAAE,CAAC,CAAC;AACxD,cAAc,CAAC,oBAAoB,CAAC,IAAA,8CAAqB,GAAE,CAAC,CAAC;AAE7D;IAAA;IAsCA,CAAC;IArCc,YAAK,GAAlB,UACE,OAAqB,EACrB,aAAmB;;;;;;;wBAGI,WAAM,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,EAAA;;wBAA/D,aAAa,CAAA,SAAkD,CAAA,SAAvD;wBAChB,WAAO,EAAE,QAAQ,EAAE,UAAQ,EAAE,EAAC;;;wBAE9B,WAAO,IAAI,CAAC,WAAW,CAAC,KAAkB,CAAC,EAAC;;;;;KAE/C;IAEY,mBAAY,GAAzB,UACE,GAA4B,EAC5B,aAAmB;;;;;;;wBAGX,UAAU,GAAG,IAAA,gBAAO,EACxB,cAAc,EACd,GAAG,CAAC,GAAG,EACP,GAAG,CAAC,cAAqB,CAC1B,CAAC;wBACmB,WAAM,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,EAAA;;wBAAlD,aAAa,CAAA,SAAqC,CAAA,SAA1C;wBAChB,WAAO,EAAE,QAAQ,EAAE,UAAQ,EAAE,EAAC;;;wBAE9B,WAAO,IAAI,CAAC,WAAW,CAAC,KAAkB,CAAC,EAAC;;;;;KAE/C;IAEc,kBAAW,GAAG,UAAC,GAAgB;QAC5C,IAAI,GAAG,CAAC,IAAI,KAAK,kCAAsB,EAAE;YACvC,OAAO;gBACL,KAAK,EAAE,GAAG;aACX,CAAC;SACH;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC,CAAC;IACJ,aAAC;CAAA,AAtCD,IAsCC;AAtCY,wBAAM","sourcesContent":["import { Parser as AsyncapiParser, fromURL } from '@asyncapi/parser';\nimport { OpenAPISchemaParser } from '@asyncapi/openapi-schema-parser';\nimport { ProtoBuffSchemaParser } from '@asyncapi/protobuf-schema-parser';\nimport { AvroSchemaParser } from '@asyncapi/avro-schema-parser';\n\nimport { ErrorObject, ParserReturn, FetchingSchemaInterface } from '../types';\n\nimport { VALIDATION_ERRORS_TYPE } from '../constants';\n\nconst asyncapiParser = new AsyncapiParser();\nasyncapiParser.registerSchemaParser(OpenAPISchemaParser());\nasyncapiParser.registerSchemaParser(AvroSchemaParser());\nasyncapiParser.registerSchemaParser(ProtoBuffSchemaParser());\n\nexport class Parser {\n  static async parse(\n    content: string | any,\n    parserOptions?: any,\n  ): Promise<ParserReturn> {\n    try {\n      const { document } = await asyncapiParser.parse(content, parserOptions);\n      return { asyncapi: document };\n    } catch (err) {\n      return this.handleError(err as ErrorObject);\n    }\n  }\n\n  static async parseFromUrl(\n    arg: FetchingSchemaInterface,\n    parserOptions?: any,\n  ): Promise<ParserReturn> {\n    try {\n      const fromResult = fromURL(\n        asyncapiParser,\n        arg.url,\n        arg.requestOptions as any,\n      );\n      const { document } = await fromResult.parse(parserOptions);\n      return { asyncapi: document };\n    } catch (err) {\n      return this.handleError(err as ErrorObject);\n    }\n  }\n\n  private static handleError = (err: ErrorObject): ParserReturn => {\n    if (err.type === VALIDATION_ERRORS_TYPE) {\n      return {\n        error: err,\n      };\n    }\n    return { error: err };\n  };\n}\n"]}

package/lib/cjs/helpers/schema.js

@@ -1,10 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaHelpers = exports.SchemaCustomTypes = void 0;
-var schema_1 = __importDefault(require("@asyncapi/parser/lib/models/schema"));
+var parser_1 = require("@asyncapi/parser");
 var SchemaCustomTypes;
 (function (SchemaCustomTypes) {
     SchemaCustomTypes["ANY"] = "any";
@@ -78,23 +86,24 @@ var SchemaHelpers = (function () {
         type = this.toType(type, schema);
         var combinedType = this.toCombinedType(schema);
         if (type && combinedType) {
-            return type + " " + combinedType;
+            return "".concat(type, " ").concat(combinedType);
         }
         if (combinedType) {
             return combinedType;
         }
         return type;
     };
-    SchemaHelpers.prettifyValue = function (value) {
+    SchemaHelpers.prettifyValue = function (value, strict) {
+        if (strict === void 0) { strict = true; }
         var typeOf = typeof value;
         if (typeOf === 'string') {
-            return "\"" + value + "\"";
+            return strict ? "\"".concat(value, "\"") : value;
         }
         if (typeOf === 'number' || typeOf === 'bigint' || typeOf === 'boolean') {
-            return value;
+            return "".concat(value);
         }
         if (Array.isArray(value)) {
-            return "[" + value.toString() + "]";
+            return "[".concat(value.toString(), "]");
         }
         return JSON.stringify(value);
     };
@@ -132,6 +141,8 @@ var SchemaHelpers = (function () {
         if (schema.oneOf() ||
             schema.anyOf() ||
             schema.allOf() ||
+            Object.keys(schema.properties() || {}).length > 0 ||
+            schema.items() ||
             schema.not() ||
             schema.if() ||
             schema.then() ||
@@ -146,63 +157,69 @@ var SchemaHelpers = (function () {
     };
     SchemaHelpers.serverVariablesToSchema = function (urlVariables) {
         var _a;
-        if (!urlVariables || !Object.keys(urlVariables).length) {
+        if (!urlVariables || urlVariables.length === 0) {
             return undefined;
         }
+        var obj = {};
+        urlVariables.all().forEach(function (variable) {
+            obj[variable.id()] = __assign({}, (variable.json() || {}));
+            obj[variable.id()].type = 'string';
+        });
         var json = (_a = {
                 type: 'object',
-                properties: Object.entries(urlVariables).reduce(function (obj, _a) {
-                    var urlName = _a[0], url = _a[1];
-                    obj[urlName] = Object.assign({}, url.json());
-                    obj[urlName].type = 'string';
-                    return obj;
-                }, {}),
-                required: Object.keys(urlVariables)
+                properties: obj,
+                required: Object.keys(obj)
             },
-            _a[this.extRenderType] = false,
             _a[this.extRenderAdditionalInfo] = false,
             _a);
-        return new schema_1.default(json);
+        return new parser_1.SchemaV2(json);
     };
     SchemaHelpers.parametersToSchema = function (parameters) {
         var _a;
         var _this = this;
-        if (!parameters || !Object.keys(parameters).length) {
+        if (!parameters || parameters.isEmpty()) {
             return undefined;
         }
+        var obj = {};
+        parameters.all().forEach(function (parameter) {
+            var _a;
+            var parameterSchema = parameter.schema();
+            obj[parameter.id()] = __assign({}, ((_a = parameterSchema === null || parameterSchema === void 0 ? void 0 : parameterSchema.json()) !== null && _a !== void 0 ? _a : {}));
+            obj[parameter.id()].description = parameter.hasDescription()
+                ? parameter.description()
+                : undefined;
+            obj[parameter.id()][_this.extParameterLocation] = parameter.hasLocation()
+                ? parameter.location()
+                : undefined;
+        });
         var json = (_a = {
                 type: 'object',
-                properties: Object.entries(parameters).reduce(function (obj, _a) {
-                    var paramaterName = _a[0], parameter = _a[1];
-                    obj[paramaterName] = Object.assign({}, parameter.schema().json());
-                    obj[paramaterName].description =
-                        parameter.description() || obj[paramaterName].description;
-                    obj[paramaterName][_this.extParameterLocation] = parameter.location();
-                    return obj;
-                }, {}),
-                required: Object.keys(parameters)
+                properties: obj,
+                required: Object.keys(obj)
             },
-            _a[this.extRenderType] = false,
             _a[this.extRenderAdditionalInfo] = false,
             _a);
-        return new schema_1.default(json);
+        return new parser_1.SchemaV2(json);
     };
     SchemaHelpers.jsonToSchema = function (value) {
         var json = this.jsonFieldToSchema(value);
-        return new schema_1.default(json);
+        return new parser_1.SchemaV2(json);
     };
     SchemaHelpers.getCustomExtensions = function (value) {
         if (!value || typeof value.extensions !== 'function') {
             return;
         }
-        return Object.entries(value.extensions() || {}).reduce(function (obj, _a) {
-            var extName = _a[0], ext = _a[1];
-            if (!extName.startsWith('x-parser-') &&
-                !extName.startsWith('x-schema-private-')) {
-                obj[extName] = ext;
+        var extensions = value.extensions();
+        var filteredExtensions = {};
+        for (var _i = 0, _a = extensions.all(); _i < _a.length; _i++) {
+            var ext = _a[_i];
+            var extType = ext;
+            if (!extType.id().startsWith('x-parser-') &&
+                !extType.id().startsWith('x-schema-private-')) {
+                filteredExtensions[extType.id()] = extType.value();
             }
-            return obj;
-        }, {});
+        }
+        return filteredExtensions;
     };
     SchemaHelpers.getDependentRequired = function (propertyName, schema) {
         var dependentRequired = [];
@@ -238,38 +255,43 @@ var SchemaHelpers = (function () {
                 type: 'object',
                 properties: Object.entries(records).reduce(function (obj, _a) {
                     var propertyName = _a[0], propertySchema = _a[1];
-                    obj[propertyName] = Object.assign({}, propertySchema.json());
+                    obj[propertyName] = __assign({}, (propertySchema.json() || {}));
                     return obj;
                 }, {})
             },
-            _a[this.extRenderType] = false,
             _a[this.extRenderAdditionalInfo] = false,
             _a);
-        return new schema_1.default(json);
+        return new parser_1.SchemaV2(json);
     };
     SchemaHelpers.toType = function (type, schema) {
-        var _this = this;
+        if (schema.isCircular()) {
+            return type;
+        }
         if (type === 'array') {
             var items = schema.items();
             if (Array.isArray(items)) {
-                var types = items.map(function (item) { return _this.toSchemaType(item); }).join(', ');
-                var additionalItems = schema.additionalItems();
-                if (additionalItems === undefined || additionalItems.json()) {
-                    var additionalType = additionalItems === undefined || additionalItems.json() === true
-                        ? SchemaCustomTypes.ANY
-                        : this.toSchemaType(additionalItems);
-                    return "tuple<" + (types ||
-                        SchemaCustomTypes.UNKNOWN) + ", ...optional<" + additionalType + ">>";
-                }
-                return "tuple<" + (types || SchemaCustomTypes.UNKNOWN) + ">";
+                return this.toItemsType(items, schema);
             }
             if (!items) {
-                return "array<" + SchemaCustomTypes.ANY + ">";
+                return "array<".concat(SchemaCustomTypes.ANY, ">");
             }
-            return "array<" + (this.toSchemaType(items) || SchemaCustomTypes.UNKNOWN) + ">";
+            return "array<".concat(this.toSchemaType(items) || SchemaCustomTypes.UNKNOWN, ">");
         }
         return type;
     };
+    SchemaHelpers.toItemsType = function (items, schema) {
+        var _this = this;
+        var types = items.map(function (item) { return _this.toSchemaType(item); }).join(', ');
+        var additionalItems = schema.additionalItems();
+        if (additionalItems !== undefined && additionalItems !== false) {
+            var additionalType = additionalItems === true
+                ? SchemaCustomTypes.ANY
+                : this.toSchemaType(additionalItems);
+            return "tuple<".concat(types ||
+                SchemaCustomTypes.UNKNOWN, ", ...optional<").concat(additionalType, ">>");
+        }
+        return "tuple<".concat(types || SchemaCustomTypes.UNKNOWN, ">");
+    };
     SchemaHelpers.toCombinedType = function (schema) {
         var oneOf = schema.oneOf();
         if (oneOf) {
@@ -344,58 +366,65 @@ var SchemaHelpers = (function () {
         }
         var strigifiedMultipleOf = multipleOf.toString(10);
         if (!/^0\.0*1$/.test(strigifiedMultipleOf)) {
-            return "multiple of " + strigifiedMultipleOf;
+            return "multiple of ".concat(strigifiedMultipleOf);
         }
-        return "decimal places <= " + strigifiedMultipleOf.split('.')[1].length;
+        return "decimal places <= ".concat(strigifiedMultipleOf.split('.')[1].length);
     };
     SchemaHelpers.humanizeRangeConstraint = function (description, min, max) {
         var stringRange;
         if (min !== undefined && max !== undefined) {
             if (min === max) {
-                stringRange = min + " " + description;
+                stringRange = "".concat(min, " ").concat(description);
             }
             else {
-                stringRange = "[ " + min + " .. " + max + " ] " + description;
+                stringRange = "[ ".concat(min, " .. ").concat(max, " ] ").concat(description);
             }
         }
         else if (max !== undefined) {
-            stringRange = "<= " + max + " " + description;
+            stringRange = "<= ".concat(max, " ").concat(description);
         }
         else if (min !== undefined) {
             if (min === 1) {
                 stringRange = 'non-empty';
             }
             else {
-                stringRange = ">= " + min + " " + description;
+                stringRange = ">= ".concat(min, " ").concat(description);
             }
         }
         return stringRange;
     };
     SchemaHelpers.jsonFieldToSchema = function (value) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         var _this = this;
-        if (typeof value !== 'object') {
-            var str = typeof value.toString === 'function' ? value.toString() : value;
+        if (value === undefined || value === null) {
             return _a = {
                     type: 'string',
-                    const: str
+                    const: ''
                 },
                 _a[this.extRawValue] = true,
                 _a;
         }
+        if (typeof value !== 'object') {
+            var str = typeof value.toString === 'function' ? value.toString() : value;
+            return _b = {
+                    type: 'string',
+                    const: str
+                },
+                _b[this.extRawValue] = true,
+                _b;
+        }
         if (this.isJSONSchema(value)) {
             return value;
         }
         if (Array.isArray(value)) {
-            return _b = {
+            return _c = {
                     type: 'array',
                     items: value.map(function (v) { return _this.jsonFieldToSchema(v); })
                 },
-                _b[this.extRenderType] = false,
-                _b[this.extRenderAdditionalInfo] = false,
-                _b;
+                _c[this.extRenderAdditionalInfo] = false,
+                _c;
         }
-        return _c = {
+        return _d = {
                 type: 'object',
                 properties: Object.entries(value).reduce(function (obj, _a) {
                     var k = _a[0], v = _a[1];
@@ -403,9 +432,8 @@ var SchemaHelpers = (function () {
                     return obj;
                 }, {})
             },
-            _c[this.extRenderType] = false,
-            _c[this.extRenderAdditionalInfo] = false,
-            _c;
+            _d[this.extRenderAdditionalInfo] = false,
+            _d;
     };
     SchemaHelpers.isJSONSchema = function (value) {
         if (value &&
@@ -417,7 +445,6 @@ var SchemaHelpers = (function () {
         }
         return false;
     };
-    SchemaHelpers.extRenderType = 'x-schema-private-render-type';
     SchemaHelpers.extRenderAdditionalInfo = 'x-schema-private-render-additional-info';
     SchemaHelpers.extRawValue = 'x-schema-private-raw-value';
     SchemaHelpers.extParameterLocation = 'x-schema-private-parameter-location';