@asyncapi/react-component 1.0.0-next.5 → 1.0.0-next.50

package/lib/esm/helpers/message.js

@@ -26,24 +26,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/esm/helpers/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/helpers/message.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC;IAAA;IAiDA,CAAC;IAhDQ,8BAAe,GAAtB,UAAuB,MAAW,EAAE,OAAiB;QAAjB,wBAAA,EAAA,YAAiB;QACnD,IAAI;YACF,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,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"}
+{"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/esm/helpers/parser.js

@@ -34,26 +34,27 @@ 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 };
     }
 };
-import { parse, parseFromUrl, registerSchemaParser } from '@asyncapi/parser';
-import openapiSchemaParser from '@asyncapi/openapi-schema-parser';
-import avroSchemaParser from '@asyncapi/avro-schema-parser';
+import { Parser as AsyncapiParser, fromURL } from '@asyncapi/parser';
+import { OpenAPISchemaParser } from '@asyncapi/openapi-schema-parser';
+import { AvroSchemaParser } from '@asyncapi/avro-schema-parser';
 import { VALIDATION_ERRORS_TYPE } from '../constants';
-registerSchemaParser(openapiSchemaParser);
-registerSchemaParser(avroSchemaParser);
+var asyncapiParser = new AsyncapiParser();
+asyncapiParser.registerSchemaParser(OpenAPISchemaParser());
+asyncapiParser.registerSchemaParser(AvroSchemaParser());
 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, 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)];
@@ -64,15 +65,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, parseFromUrl(arg.url, arg.requestOptions, parserOptions)];
+                        fromResult = 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/esm/helpers/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/helpers/parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7E,OAAO,mBAAmB,MAAM,iCAAiC,CAAC;AAElE,OAAO,gBAAgB,MAAM,8BAA8B,CAAC;AAI5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;AAC1C,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;AAEvC;IAAA;IAqCA,CAAC;IApCc,YAAK,GAAlB,UACE,OAAqB,EACrB,aAAmB;;;;;;;wBAGA,WAAM,KAAK,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,YAAY,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,sBAAsB,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;SArCY,MAAM"}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/helpers/parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAMhE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,IAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;AAC5C,cAAc,CAAC,oBAAoB,CAAC,mBAAmB,EAAE,CAAC,CAAC;AAC3D,cAAc,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,CAAC,CAAC;AAIxD;IAAA;IAkCA,CAAC;IAjCc,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,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;wBACnD,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,sBAAsB,EAAE;YACvC,OAAO;gBACL,KAAK,EAAE,GAAG;aACX,CAAC;SACH;QACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACxB,CAAC,CAAC;IACJ,aAAC;CAAA,AAlCD,IAkCC;SAlCY,MAAM","sourcesContent":["import { Parser as AsyncapiParser, fromURL } from '@asyncapi/parser';\nimport { OpenAPISchemaParser } from '@asyncapi/openapi-schema-parser';\nimport { AvroSchemaParser } from '@asyncapi/avro-schema-parser';\n// @ts-ignore\nimport protoSchemaParser from '@asyncapi/protobuf-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());\n// Waiting for schema parser to be upgraded\n// asyncapiParser.registerSchemaParser(protoSchemaParser);\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(asyncapiParser, arg.url, arg.requestOptions);\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/esm/helpers/schema.js

@@ -1,17 +1,69 @@
-import SchemaClass from '@asyncapi/parser/lib/models/schema';
+import { SchemaV2 as SchemaClass, } from '@asyncapi/parser';
+export var SchemaCustomTypes;
+(function (SchemaCustomTypes) {
+    SchemaCustomTypes["ANY"] = "any";
+    SchemaCustomTypes["RESTRICTED_ANY"] = "restricted any";
+    SchemaCustomTypes["NEVER"] = "never";
+    SchemaCustomTypes["UNKNOWN"] = "unknown";
+})(SchemaCustomTypes || (SchemaCustomTypes = {}));
+var jsonSchemaTypes = [
+    'string',
+    'number',
+    'integer',
+    'boolean',
+    'array',
+    'object',
+    'null',
+];
+var jsonSchemaKeywordTypes = {
+    maxLength: 'string',
+    minLength: 'string',
+    pattern: 'string',
+    contentMediaType: 'string',
+    contentEncoding: 'string',
+    multipleOf: 'number',
+    maximum: 'number',
+    exclusiveMaximum: 'number',
+    minimum: 'number',
+    exclusiveMinimum: 'number',
+    items: 'array',
+    maxItems: 'array',
+    minItems: 'array',
+    uniqueItems: 'array',
+    contains: 'array',
+    additionalItems: 'array',
+    maxProperties: 'object',
+    minProperties: 'object',
+    required: 'object',
+    properties: 'object',
+    patternProperties: 'object',
+    propertyNames: 'object',
+    dependencies: 'object',
+    additionalProperties: 'object',
+};
+var jsonSchemaKeywords = Object.keys(jsonSchemaKeywordTypes);
 var SchemaHelpers = (function () {
     function SchemaHelpers() {
     }
     SchemaHelpers.toSchemaType = function (schema) {
         var _this = this;
-        if (schema === true) {
-            return 'any';
+        if (!schema || typeof schema.json !== 'function') {
+            return SchemaCustomTypes.UNKNOWN;
         }
-        if (schema === false) {
-            return 'never';
+        if (schema.isBooleanSchema()) {
+            if (schema.json() === true) {
+                return SchemaCustomTypes.ANY;
+            }
+            else {
+                return SchemaCustomTypes.NEVER;
+            }
         }
         if (Object.keys(schema.json()).length === 0) {
-            return 'any';
+            return SchemaCustomTypes.ANY;
+        }
+        var not = schema.not();
+        if (not && this.inferType(not) === SchemaCustomTypes.ANY) {
+            return SchemaCustomTypes.NEVER;
         }
         var type = this.inferType(schema);
         if (Array.isArray(type)) {
@@ -20,23 +72,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);
     };
@@ -74,6 +127,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() ||
@@ -94,14 +149,13 @@ var SchemaHelpers = (function () {
         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';
+                    var variableName = _a[0], variable = _a[1];
+                    obj[variableName] = Object.assign({}, variable.json() || {});
+                    obj[variableName].type = 'string';
                     return obj;
                 }, {}),
                 required: Object.keys(urlVariables)
             },
-            _a[this.extRenderType] = false,
             _a[this.extRenderAdditionalInfo] = false,
             _a);
         return new SchemaClass(json);
@@ -116,7 +170,8 @@ var SchemaHelpers = (function () {
                 type: 'object',
                 properties: Object.entries(parameters).reduce(function (obj, _a) {
                     var paramaterName = _a[0], parameter = _a[1];
-                    obj[paramaterName] = Object.assign({}, parameter.schema().json());
+                    var parameterSchema = parameter.schema();
+                    obj[paramaterName] = Object.assign({}, parameterSchema ? parameterSchema.json() : {});
                     obj[paramaterName].description =
                         parameter.description() || obj[paramaterName].description;
                     obj[paramaterName][_this.extParameterLocation] = parameter.location();
@@ -124,7 +179,6 @@ var SchemaHelpers = (function () {
                 }, {}),
                 required: Object.keys(parameters)
             },
-            _a[this.extRenderType] = false,
             _a[this.extRenderAdditionalInfo] = false,
             _a);
         return new SchemaClass(json);
@@ -137,14 +191,17 @@ var SchemaHelpers = (function () {
         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 = Object.values(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 = [];
@@ -184,30 +241,42 @@ var SchemaHelpers = (function () {
                     return obj;
                 }, {})
             },
-            _a[this.extRenderType] = false,
             _a[this.extRenderAdditionalInfo] = false,
             _a);
         return new SchemaClass(json);
     };
     SchemaHelpers.toType = function (type, schema) {
-        var _this = this;
+        if (schema.isCircular()) {
+            return type;
+        }
         if (type === 'array') {
             var items = schema.items();
-            var types = void 0;
             if (Array.isArray(items)) {
-                types = items.map(function (item) { return _this.toSchemaType(item); }).join(', ');
-                types = types.length ? types : 'unknown';
+                return this.toItemsType(items, schema);
             }
-            else if (items) {
-                types = this.toSchemaType(items);
-                types = types || 'unknown';
+            if (!items) {
+                return "array<".concat(SchemaCustomTypes.ANY, ">");
             }
-            return "array<" + types + ">";
+            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) {
-        if (schema.oneOf()) {
+        var oneOf = schema.oneOf();
+        if (oneOf) {
             return 'oneOf';
         }
         if (schema.anyOf()) {
@@ -219,49 +288,36 @@ var SchemaHelpers = (function () {
         return;
     };
     SchemaHelpers.inferType = function (schema) {
-        var jsonSchema = schema.json();
-        var keywords = Object.keys(this.jsonSchemaKeywordTypes);
-        var keywordsLength = keywords.length;
-        var possibleTypes = {};
-        var jsonTypes = jsonSchema.type;
-        if (jsonTypes !== undefined) {
-            if (Array.isArray(jsonTypes)) {
-                for (var i = 0, l = jsonTypes.length; i < l; i++) {
-                    possibleTypes[jsonTypes[i]] = undefined;
+        var types = schema.type();
+        if (types !== undefined) {
+            if (Array.isArray(types)) {
+                if (types.includes('integer') && types.includes('number')) {
+                    types = types.filter(function (t) { return t !== 'integer'; });
                 }
+                return types.length === 1 ? types[0] : types;
             }
-            else {
-                possibleTypes[jsonTypes] = undefined;
-            }
-        }
-        for (var i = 0; i < keywordsLength; i++) {
-            var keyword = keywords[i];
-            if (jsonSchema[keyword] !== undefined) {
-                possibleTypes[this.jsonSchemaKeywordTypes[keyword]] = undefined;
-            }
-        }
-        if (jsonSchema.enum) {
-            for (var _i = 0, _a = jsonSchema.enum; _i < _a.length; _i++) {
-                var value = _a[_i];
-                possibleTypes[typeof value] = undefined;
-            }
+            return types;
         }
-        var types = Object.keys(possibleTypes);
-        if (types.length === 1) {
-            return types[0];
+        var constValue = schema.const();
+        if (constValue !== undefined) {
+            return typeof constValue;
         }
-        if (jsonTypes === 'integer') {
-            return types.filter(function (t) { return t !== 'number'; });
+        var enumValue = schema.enum();
+        if (Array.isArray(enumValue) && enumValue.length) {
+            var inferredType = Array.from(new Set(enumValue.map(function (e) { return typeof e; })));
+            return inferredType.length === 1 ? inferredType[0] : inferredType;
         }
-        if (Array.isArray(jsonTypes) &&
-            jsonTypes.includes('integer') &&
-            !jsonTypes.includes('number')) {
-            return types.filter(function (t) { return t !== 'number'; });
+        var schemaKeys = Object.keys(schema.json() || {}) || [];
+        var hasInferredTypes = jsonSchemaKeywords.some(function (key) {
+            return schemaKeys.includes(key);
+        });
+        if (hasInferredTypes === true) {
+            return SchemaCustomTypes.RESTRICTED_ANY;
         }
-        if (types.includes('integer') && types.includes('number')) {
-            return types.filter(function (t) { return t !== 'integer'; });
+        if (this.toCombinedType(schema)) {
+            return '';
         }
-        return types;
+        return SchemaCustomTypes.ANY;
     };
     SchemaHelpers.humanizeNumberRangeConstraint = function (min, exclusiveMin, max, exclusiveMax) {
         var hasExclusiveMin = exclusiveMin !== undefined;
@@ -292,58 +348,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];
@@ -351,60 +414,22 @@ var SchemaHelpers = (function () {
                     return obj;
                 }, {})
             },
-            _c[this.extRenderType] = false,
-            _c[this.extRenderAdditionalInfo] = false,
-            _c;
+            _d[this.extRenderAdditionalInfo] = false,
+            _d;
     };
     SchemaHelpers.isJSONSchema = function (value) {
-        var _this = this;
         if (value &&
             typeof value === 'object' &&
-            (this.jsonSchemaTypes.includes(value.type) ||
+            (jsonSchemaTypes.includes(value.type) ||
                 (Array.isArray(value.type) &&
-                    value.type.some(function (t) { return !_this.jsonSchemaTypes.includes(t); })))) {
+                    value.type.some(function (t) { return !jsonSchemaTypes.includes(t); })))) {
             return true;
         }
         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';
-    SchemaHelpers.jsonSchemaTypes = [
-        'string',
-        'number',
-        'integer',
-        'boolean',
-        'array',
-        'object',
-        'null',
-    ];
-    SchemaHelpers.jsonSchemaKeywordTypes = {
-        maxLength: 'string',
-        minLength: 'string',
-        pattern: 'string',
-        contentMediaType: 'string',
-        contentEncoding: 'string',
-        multipleOf: 'number',
-        maximum: 'number',
-        exclusiveMaximum: 'number',
-        minimum: 'number',
-        exclusiveMinimum: 'number',
-        items: 'array',
-        maxItems: 'array',
-        minItems: 'array',
-        uniqueItems: 'array',
-        contains: 'array',
-        additionalItems: 'array',
-        maxProperties: 'object',
-        minProperties: 'object',
-        required: 'object',
-        properties: 'object',
-        patternProperties: 'object',
-        propertyNames: 'object',
-        dependencies: 'object',
-        additionalProperties: 'object',
-    };
     return SchemaHelpers;
 }());
 export { SchemaHelpers };