Skip to content
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.

Sign up for GitHub

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

resolve references before validating the discriminator #1815

Merged
merged 15 commits into from
Jan 15, 2022
Merged

resolve references before validating the discriminator #1815

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
105a976
resolve references before validating the discriminator
dfeufel Nov 12, 2021
afb1781
prettier style
dfeufel Nov 12, 2021
61f7471
adjust according to comments, add some doc
dfeufel Nov 15, 2021
b09118f
Merge branch 'master' into bugfix/issue1554
dfeufel Nov 15, 2021
3fc732a
resolve schema from SchemaEnv
dfeufel Nov 17, 2021
e17376c
Merge branch 'master' into bugfix/issue1554
dfeufel Nov 17, 2021
13e1d2d
Merge branch 'master' into bugfix/issue1554
epoberezkin Nov 21, 2021
ced6416
Merge branch 'master' into bugfix/issue1554
epoberezkin Jan 15, 2022
569162a
simplify code, change comment
epoberezkin Jan 15, 2022
d4bb1d9
add import
epoberezkin Jan 15, 2022
97ca393
Update lib/vocabularies/discriminator/index.ts
epoberezkin Jan 15, 2022
7ee06cf
let to conts
epoberezkin Jan 15, 2022
e7f3d6d
Update lib/vocabularies/discriminator/index.ts
epoberezkin Jan 15, 2022
3451db8
update error message
epoberezkin Jan 15, 2022
c6839a8
fix regexp in the test
epoberezkin Jan 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resolve schema from SchemaEnv
  • Loading branch information
@dfeufel
dfeufel committed Nov 17, 2021
commit 3fc732a65d2afaca85a4aae1c9fa554f9e741387
5 changes: 4 additions & 1 deletion lib/vocabularies/discriminator/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type {CodeKeywordDefinition, AnySchemaObject, KeywordErrorDefinition} fro
import type {KeywordCxt} from "../../compile/validate"
import {_, getProperty, Name} from "../../compile/codegen"
import {DiscrError, DiscrErrorObj} from "../discriminator/types"
import {resolveRef} from "../../compile"
import {resolveRef, SchemaEnv} from "../../compile"
epoberezkin marked this conversation as resolved.
Show resolved Hide resolved

export type DiscriminatorError = DiscrErrorObj<DiscrError.Tag> | DiscrErrorObj<DiscrError.Mapping>

Expand Down Expand Up @@ -67,6 +67,9 @@ const def: CodeKeywordDefinition = {
let propSch
epoberezkin marked this conversation as resolved.
Show resolved Hide resolved
if (sch?.["$ref"] && Object.keys(sch).length === 1) {
epoberezkin marked this conversation as resolved.
Show resolved Hide resolved
epoberezkin marked this conversation as resolved.
Show resolved Hide resolved
sch = resolveRef.call(it.self, it.schemaEnv, it.baseId, sch?.["$ref"])
if (sch instanceof SchemaEnv) {
sch = sch.schema
}
propSch = sch?.properties?.[tagName]
if (typeof propSch != "object") {
throw new Error(
Expand Down