JsonSchema: Fix @maxValueExclusive setting minimumExclusive inste…

…ad of `maximumExclusive` (#2654) fix [#2531](#2531)
microsoft · Nov 13, 2023 · 3374370 · 3374370
1 parent 797baa8
commit 3374370
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/common/changes/@typespec/json-schema/fix-json-schema-exclusive-max_2023-11-09-17-10.json b/common/changes/@typespec/json-schema/fix-json-schema-exclusive-max_2023-11-09-17-10.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@typespec/json-schema",
+      "comment": "JsonSchema: Fix `@maxValueExclusive` setting `minimumExclusive` instead of `maximumExclusive`",
+      "type": "none"
+    }
+  ],
+  "packageName": "@typespec/json-schema"
+}
diff --git a/packages/json-schema/src/json-schema-emitter.ts b/packages/json-schema/src/json-schema-emitter.ts
@@ -451,7 +451,7 @@ export class JsonSchemaEmitter extends TypeEmitter<Record<string, any>, JSONSche
     applyConstraint(getMinValue, "minimum");
     applyConstraint(getMinValueExclusive, "exclusiveMinimum");
     applyConstraint(getMaxValue, "maximum");
-    applyConstraint(getMaxValueExclusive, "exclusiveMinimum");
+    applyConstraint(getMaxValueExclusive, "exclusiveMaximum");
     applyConstraint(getPattern, "pattern");
     applyConstraint(getMinItems, "minItems");
     applyConstraint(getMaxItems, "maxItems");

diff --git a/packages/json-schema/test/scalar-constraints.test.ts b/packages/json-schema/test/scalar-constraints.test.ts
@@ -1,4 +1,4 @@
-import assert from "assert";
+import assert, { strictEqual } from "assert";
 import { emitSchema } from "./utils.js";
 
 describe("jsonschema: scalar constraints", () => {
@@ -53,6 +53,36 @@ describe("jsonschema: scalar constraints", () => {
       });
     });
 
+    describe("@minValueExclusive/@maxValueExclusive", () => {
+      for (const numType of scalarNumberTypes) {
+        it(numType, async () => {
+          const schemas = await emitSchema(
+            `
+            @minValueExclusive(1)
+            @maxValueExclusive(2)
+            scalar Test extends ${numType};
+          `
+          );
+
+          strictEqual(schemas["Test.json"].exclusiveMinimum, 1);
+          strictEqual(schemas["Test.json"].exclusiveMaximum, 2);
+        });
+
+        it("can be applied on a union", async () => {
+          const schemas = await emitSchema(
+            `
+            @minValueExclusive(1)
+            @maxValueExclusive(2)
+            union Test {int32, string, null};
+          `
+          );
+
+          strictEqual(schemas["Test.json"].exclusiveMinimum, 1);
+          strictEqual(schemas["Test.json"].exclusiveMaximum, 2);
+        });
+      }
+    });
+
     describe("on property", () => {
       for (const numType of [...scalarNumberTypes, "int32 | string | null"]) {
         it(`handles ${numType} properties`, async () => {