Skip to content

feat(samples): support new semantics of exclusive number ranges #8885

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

Merged
merged 1 commit into from
Jun 6, 2023
Merged

feat(samples): support new semantics of exclusive number ranges #8885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions src/core/plugins/json-schema-2020-12/samples-extensions/fn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,20 +694,22 @@ export const sampleFromSchemaGeneric = (
// display schema default
value = primitive(schema)
if (typeof value === "number") {
let min = schema.minimum
if (min !== undefined && min !== null) {
if (schema.exclusiveMinimum) {
min++
}
value = min
let minValue = null
let maxValue = null
const { minimum, maximum, exclusiveMinimum, exclusiveMaximum } = schema
if (typeof minimum === "number") {
minValue = minimum
}
let max = schema.maximum
if (max !== undefined && max !== null) {
if (schema.exclusiveMaximum) {
max--
}
value = max
if (typeof exclusiveMinimum === "number" && exclusiveMinimum > minValue) {
minValue = exclusiveMinimum + 1
}
if (typeof maximum === "number") {
maxValue = maximum
}
if (typeof exclusiveMaximum === "number" && exclusiveMaximum < maxValue) {
maxValue = exclusiveMaximum - 1
}
value = minValue || maxValue || value
}
if (typeof value === "string") {
if (schema.maxLength !== null && schema.maxLength !== undefined) {
Expand Down
11 changes: 4 additions & 7 deletions test/unit/core/plugins/json-schema-2020-12/samples-extensions/fn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,13 +1298,11 @@ describe("sampleFromSchema", () => {
expect(sampleFromSchema(definition)).toEqual(expected)
})

it("should handle minimum with exclusive", () => {
it("should handle exclusiveMinimum", () => {
const definition = {
type: "number",
minimum: 5,
exclusiveMinimum: true,
exclusiveMinimum: 5,
}

const expected = 6

expect(sampleFromSchema(definition)).toEqual(expected)
Expand All @@ -1321,11 +1319,10 @@ describe("sampleFromSchema", () => {
expect(sampleFromSchema(definition)).toEqual(expected)
})

it("should handle maximum with exclusive", () => {
it("should handle exclusiveMaximum", () => {
const definition = {
type: "number",
maximum: -1,
exclusiveMaximum: true,
exclusiveMaximum: -1,
}

const expected = -2
Expand Down