Skip to content

Commit 29b609a

Browse files
committed
correct check null/undefined for minimum and maximum
1 parent b970244 commit 29b609a

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

packages/docusaurus-plugin-openapi-docs/src/markdown/schema.test.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,18 @@ describe("getQualifierMessage", () => {
124124
expect(actual).toBe(expected);
125125
});
126126

127+
it("should render 0 minimum and maximum", () => {
128+
const expected = "**Possible values:** `>= 0` and `<= 40`";
129+
const actual = getQualifierMessage({ minimum: 0, maximum: 40 });
130+
expect(actual).toBe(expected);
131+
});
132+
133+
it("should render minimum and 0 maximum", () => {
134+
const expected = "**Possible values:** `>= -10` and `<= 0`";
135+
const actual = getQualifierMessage({ minimum: -10, maximum: 0 });
136+
expect(actual).toBe(expected);
137+
});
138+
127139
it("should render boolean exclusiveMinimum and maximum", () => {
128140
const expected = "**Possible values:** `> 1` and `<= 40`";
129141
const actual = getQualifierMessage({

packages/docusaurus-plugin-openapi-docs/src/markdown/schema.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ export function getQualifierMessage(schema?: SchemaObject): string | undefined {
116116
}
117117

118118
if (
119-
schema.minimum ||
120-
schema.maximum ||
119+
schema.minimum != null ||
120+
schema.maximum != null ||
121121
typeof schema.exclusiveMinimum === "number" ||
122122
typeof schema.exclusiveMaximum === "number"
123123
) {
@@ -126,16 +126,16 @@ export function getQualifierMessage(schema?: SchemaObject): string | undefined {
126126
let maximum;
127127
if (typeof schema.exclusiveMinimum === "number") {
128128
minimum = `\`> ${schema.exclusiveMinimum}\``;
129-
} else if (schema.minimum && !schema.exclusiveMinimum) {
129+
} else if (schema.minimum != null && !schema.exclusiveMinimum) {
130130
minimum = `\`>= ${schema.minimum}\``;
131-
} else if (schema.minimum && schema.exclusiveMinimum === true) {
131+
} else if (schema.minimum != null && schema.exclusiveMinimum === true) {
132132
minimum = `\`> ${schema.minimum}\``;
133133
}
134134
if (typeof schema.exclusiveMaximum === "number") {
135135
maximum = `\`< ${schema.exclusiveMaximum}\``;
136-
} else if (schema.maximum && !schema.exclusiveMaximum) {
136+
} else if (schema.maximum != null && !schema.exclusiveMaximum) {
137137
maximum = `\`<= ${schema.maximum}\``;
138-
} else if (schema.maximum && schema.exclusiveMaximum === true) {
138+
} else if (schema.maximum != null && schema.exclusiveMaximum === true) {
139139
maximum = `\`< ${schema.maximum}\``;
140140
}
141141

packages/docusaurus-theme-openapi-docs/src/markdown/schema.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ export function getQualifierMessage(schema?: SchemaObject): string | undefined {
112112
}
113113

114114
if (
115-
schema.minimum ||
116-
schema.maximum ||
115+
schema.minimum != null ||
116+
schema.maximum != null ||
117117
typeof schema.exclusiveMinimum === "number" ||
118118
typeof schema.exclusiveMaximum === "number"
119119
) {
@@ -122,16 +122,16 @@ export function getQualifierMessage(schema?: SchemaObject): string | undefined {
122122
let maximum;
123123
if (typeof schema.exclusiveMinimum === "number") {
124124
minimum = `\`> ${schema.exclusiveMinimum}\``;
125-
} else if (schema.minimum && !schema.exclusiveMinimum) {
125+
} else if (schema.minimum != null && !schema.exclusiveMinimum) {
126126
minimum = `\`>= ${schema.minimum}\``;
127-
} else if (schema.minimum && schema.exclusiveMinimum === true) {
127+
} else if (schema.minimum != null && schema.exclusiveMinimum === true) {
128128
minimum = `\`> ${schema.minimum}\``;
129129
}
130130
if (typeof schema.exclusiveMaximum === "number") {
131131
maximum = `\`< ${schema.exclusiveMaximum}\``;
132-
} else if (schema.maximum && !schema.exclusiveMaximum) {
132+
} else if (schema.maximum != null && !schema.exclusiveMaximum) {
133133
maximum = `\`<= ${schema.maximum}\``;
134-
} else if (schema.maximum && schema.exclusiveMaximum === true) {
134+
} else if (schema.maximum != null && schema.exclusiveMaximum === true) {
135135
maximum = `\`< ${schema.maximum}\``;
136136
}
137137

0 commit comments

Comments
 (0)