diff --git a/package-lock.json b/package-lock.json index 3d5920ef95a772f18e9ffc7761509b810a4ef9be..859b60ea92d1e08043121b1451420d962f169268 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2039,21 +2039,6 @@ } } }, - "@babel/runtime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz", - "integrity": "sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==", - "requires": { - "regenerator-runtime": "^0.12.0" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.12.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", - "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" - } - } - }, "@babel/template": { "version": "7.2.2", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz", @@ -4372,6 +4357,46 @@ } } }, + "@sidvind/better-ajv-errors": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/@sidvind/better-ajv-errors/-/better-ajv-errors-0.6.9.tgz", + "integrity": "sha512-OPdSVMjy4xR/fnN3JBVu4xHyzmRBlrIWAzgdGiVdiGwPypucoh1yN4bFy5FpE+261NF1CwR2CGYgPiMwLVX+zQ==", + "requires": { + "@babel/code-frame": "^7.0.0", + "chalk": "^2.4.1", + "json-to-ast": "^2.0.3", + "jsonpointer": "^4.0.1", + "leven": "^3.1.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", @@ -6040,48 +6065,6 @@ "integrity": "sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==", "dev": true }, - "better-ajv-errors": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-0.6.2.tgz", - "integrity": "sha512-0tZRYqH9wvfHlWsBcgoqf3y8CABjdjKe2P+uVIPuxXE9iM7R51r1QrRse0v9clnOpiql3BwXGN3pQiXPmAHjdg==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/runtime": "^7.0.0", - "chalk": "^2.4.1", - "core-js": "^2.5.7", - "json-to-ast": "^2.0.3", - "jsonpointer": "^4.0.1", - "leven": "^2.1.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "binary-extensions": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", @@ -7704,7 +7687,8 @@ "core-js": { "version": "2.6.5", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", - "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==" + "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==", + "dev": true }, "core-js-compat": { "version": "3.4.8", @@ -15260,9 +15244,9 @@ "dev": true }, "leven": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", - "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==" }, "levn": { "version": "0.3.0", diff --git a/package.json b/package.json index 23ed2f0452f27b0511b886fefc41937bcd59f24e..f5fc591f4b0d488e85b55322fd582ecbf1242063 100644 --- a/package.json +++ b/package.json @@ -131,9 +131,9 @@ }, "dependencies": { "@babel/code-frame": "^7.0.0", + "@sidvind/better-ajv-errors": "^0.6.9", "acorn-walk": "^7.0.0", "ajv": "^6.10.0", - "better-ajv-errors": "^0.6.2", "chalk": "^3.0.0", "deepmerge": "^4.0.0", "eslint": "^6.0.0", diff --git a/src/error/__snapshots__/schema-validation-error.spec.ts.snap b/src/error/__snapshots__/schema-validation-error.spec.ts.snap index 514098cd40c3cc20661961af3ccf7b912fdcf2f6..64925d5b168644b470e7ce4749aec3afffe2f779 100644 --- a/src/error/__snapshots__/schema-validation-error.spec.ts.snap +++ b/src/error/__snapshots__/schema-validation-error.spec.ts.snap @@ -8,14 +8,18 @@ exports[`SchemaValidationError should pretty-print validation errors 1`] = ` > 3 | \\"flow\\": \\"spam\\" | ^^^^^^ 👈🏽 type should be boolean 4 | } - 5 | },TYPE should be array + 5 | } + +TYPE should be array 1 | { 2 | \\"foo\\": { > 3 | \\"flow\\": \\"spam\\" | ^^^^^^ 👈🏽 type should be array 4 | } - 5 | },ANYOF should match some schema in anyOf + 5 | } + +ANYOF should match some schema in anyOf 1 | { 2 | \\"foo\\": { diff --git a/src/error/schema-validation-error.ts b/src/error/schema-validation-error.ts index 709b1721c2cae200e782a1e081e57e726e3f81b7..17d7d77178a84aa67754d4dae94ddd319fd3ad13 100644 --- a/src/error/schema-validation-error.ts +++ b/src/error/schema-validation-error.ts @@ -1,5 +1,5 @@ +import betterAjvErrors from "@sidvind/better-ajv-errors"; import Ajv from "ajv"; -import betterAjvErrors from "better-ajv-errors"; import { UserError } from "../error/user-error"; export class SchemaValidationError extends UserError { diff --git a/src/meta/table.ts b/src/meta/table.ts index cbc4e6f11394f7b6eef4073cc970396c3b0c1253..f6ad8f06f783fab8c1a9e2efd901834cc99087d3 100644 --- a/src/meta/table.ts +++ b/src/meta/table.ts @@ -1,5 +1,5 @@ +import betterAjvErrors from "@sidvind/better-ajv-errors"; import Ajv from "ajv"; -import betterAjvErrors from "better-ajv-errors"; import deepmerge from "deepmerge"; import jsonMergePatch from "json-merge-patch"; import { HtmlElement } from "../dom";