-
-
Notifications
You must be signed in to change notification settings - Fork 880
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add pattern and path to regexp create errors #2477 #2485
Open
jasoniangreen
wants to merge
7
commits into
master
Choose a base branch
from
feat-add-informative-regexp-errors
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+64
−5
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d33a36d
feat: add pattern and path to regexp create errors #2477
jasoniangreen 4e3463d
fix: include original error and add extra info
jasoniangreen 1110b70
simplify tests
jasoniangreen ad6c039
Merge branch 'master' into feat-add-informative-regexp-errors
jasoniangreen e99d84f
remove only from test
jasoniangreen 3380afd
Merge branch 'feat-add-informative-regexp-errors' of github.com:ajv-v…
jasoniangreen ae457fb
fix
jasoniangreen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,9 +18,16 @@ const def: CodeKeywordDefinition = { | |
error, | ||
code(cxt: KeywordCxt) { | ||
const {data, $data, schema, schemaCode, it} = cxt | ||
// TODO regexp should be wrapped in try/catchs | ||
const u = it.opts.unicodeRegExp ? "u" : "" | ||
const regExp = $data ? _`(new RegExp(${schemaCode}, ${u}))` : usePattern(cxt, schema) | ||
const regExp = $data | ||
? _`(function() { | ||
try { | ||
return new RegExp(${schemaCode}, ${u}) | ||
} catch (e) { | ||
throw new Error(e.message + ' | pattern ' + ${schemaCode} + ' at ' + ${it.errSchemaPath}) | ||
} | ||
})()` | ||
: usePattern(cxt, schema) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is probably a way to build this with gen.try etc but maybe this is ok? I'm still getting my head around codegen stuff. |
||
cxt.fail$data(_`!${regExp}.test(${data})`) | ||
}, | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
import _Ajv from "../ajv2020" | ||
import * as assert from "assert" | ||
|
||
describe("Invalid regexp patterns should throw more informative errors (issue #2477)", () => { | ||
it("throws with pattern and schema path", () => { | ||
const ajv = new _Ajv() | ||
|
||
const rootSchema = { | ||
type: "string", | ||
pattern: "^[0-9]{2-4}", | ||
} | ||
|
||
assert.throws( | ||
() => ajv.compile(rootSchema), | ||
(thrown: Error) => thrown.message.includes("pattern ^[0-9]{2-4} at #") | ||
) | ||
|
||
const pathSchema = { | ||
type: "object", | ||
properties: { | ||
foo: rootSchema, | ||
}, | ||
} | ||
|
||
assert.throws( | ||
() => ajv.compile(pathSchema), | ||
(thrown: Error) => thrown.message.includes("pattern ^[0-9]{2-4} at #/properties/foo") | ||
) | ||
}) | ||
it("throws with pattern and schema path with $data", () => { | ||
const ajv = new _Ajv({$data: true}) | ||
|
||
const schema = { | ||
properties: { | ||
shouldMatch: {}, | ||
string: {pattern: {$data: "1/shouldMatch"}}, | ||
}, | ||
} | ||
const validate = ajv.compile(schema) | ||
|
||
assert.throws( | ||
() => ajv.compile(validate({shouldMatch: "^[0-9]{2-4}", string: "123"})), | ||
(thrown: Error) => thrown.message.includes("pattern ^[0-9]{2-4} at #/properties/string") | ||
) | ||
}) | ||
}) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was never using
opts.code.regExp
? Is that intentional?