fix: adding tests, backwards compat with openapi 3.0

Author: mnahkies

packages/openapi-code-generator/src/core/input.spec.ts

@@ -70,8 +70,8 @@ describe("core/input - SchemaNormalizer", () => {
       enum: undefined,
       exclusiveMaximum: undefined,
       exclusiveMinimum: undefined,
-      maximum: undefined,
-      minimum: undefined,
+      inclusiveMaximum: undefined,
+      inclusiveMinimum: undefined,
       multipleOf: undefined,
       nullable: false,
       readOnly: false,
@@ -244,15 +244,14 @@ describe("core/input - SchemaNormalizer", () => {
           ...base.number,
           format: "int64",
           multipleOf: 2,
-          maximum: 4,
-          minimum: -2,
+          inclusiveMaximum: 4,
+          inclusiveMinimum: -2,
           exclusiveMaximum: 5,
           exclusiveMinimum: -3,
         })
       })
 
-      // todo: implement
-      it.skip("handles openapi 3.0 boolean exclusiveMaximum / exclusiveMinimum modifiers (true)", () => {
+      it("handles openapi 3.0 boolean exclusiveMaximum / exclusiveMinimum modifiers (true)", () => {
         const actual = schemaNormalizer.normalize({
           type: "number",
           format: "int64",
@@ -272,8 +271,7 @@ describe("core/input - SchemaNormalizer", () => {
         })
       })
 
-      // todo: implement
-      it.skip("handles openapi 3.0 boolean exclusiveMaximum / exclusiveMinimum modifiers (false)", () => {
+      it("handles openapi 3.0 boolean exclusiveMaximum / exclusiveMinimum modifiers (false)", () => {
         const actual = schemaNormalizer.normalize({
           type: "number",
           format: "int64",

packages/openapi-code-generator/src/core/input.ts

@@ -685,18 +685,46 @@ export class SchemaNormalizer {
           Number.isFinite(it),
         )
 
-        let exclusiveMaximum = schemaObject.exclusiveMaximum
+        const calcMaximums = () => {
+          // draft-wright-json-schema-validation-01 changed "exclusiveMaximum"/"exclusiveMinimum" from boolean modifiers
+          // of "maximum"/"minimum" to independent numeric fields.
+          // we need to support both.
+          if (typeof schemaObject.exclusiveMaximum === "boolean") {
+            if (schemaObject.exclusiveMaximum) {
+              return {
+                exclusiveMaximum: schemaObject.maximum,
+                inclusiveMaximum: undefined,
+              }
+            } else {
+              return {
+                exclusiveMaximum: undefined,
+                inclusiveMaximum: schemaObject.maximum,
+              }
+            }
+          }
 
-        if (typeof exclusiveMaximum === "boolean") {
-          logger.warn("boolean exclusiveMaximum not yet supported - ignoring")
-          exclusiveMaximum = undefined
+          return {exclusiveMaximum: schemaObject.exclusiveMaximum}
         }
 
-        let exclusiveMinimum = schemaObject.exclusiveMinimum
+        const calcMinimums = () => {
+          // draft-wright-json-schema-validation-01 changed "exclusiveMaximum"/"exclusiveMinimum" from boolean modifiers
+          // of "maximum"/"minimum" to independent numeric fields.
+          // we need to support both.
+          if (typeof schemaObject.exclusiveMinimum === "boolean") {
+            if (schemaObject.exclusiveMinimum) {
+              return {
+                exclusiveMinimum: schemaObject.minimum,
+                inclusiveMinimum: undefined,
+              }
+            } else {
+              return {
+                exclusiveMinimum: undefined,
+                inclusiveMinimum: schemaObject.minimum,
+              }
+            }
+          }
 
-        if (typeof exclusiveMinimum === "boolean") {
-          logger.warn("boolean exclusiveMinimum not yet supported - ignoring")
-          exclusiveMinimum = undefined
+          return {exclusiveMinimum: schemaObject.exclusiveMinimum}
         }
 
         return {
@@ -706,12 +734,11 @@ export class SchemaNormalizer {
           // todo: https://github.com/mnahkies/openapi-code-generator/issues/51
           format: schemaObject.format,
           enum: enumValues.length ? enumValues : undefined,
-          exclusiveMaximum,
-          exclusiveMinimum,
-          maximum: schemaObject.maximum,
-          minimum: schemaObject.minimum,
+          inclusiveMaximum: schemaObject.maximum,
+          inclusiveMinimum: schemaObject.minimum,
           multipleOf: schemaObject.multipleOf,
-
+          ...calcMaximums(),
+          ...calcMinimums(),
           "x-enum-extensibility": enumValues.length
             ? (schemaObject["x-enum-extensibility"] ??
               self.config.enumExtensibility)

packages/openapi-code-generator/src/core/openapi-types-normalized.ts

@@ -35,8 +35,8 @@ export interface IRModelNumeric extends IRModelBase {
   enum?: number[] | undefined
   exclusiveMaximum?: number | undefined
   exclusiveMinimum?: number | undefined
-  maximum?: number | undefined
-  minimum?: number | undefined
+  inclusiveMaximum?: number | undefined
+  inclusiveMinimum?: number | undefined
   multipleOf?: number | undefined
 
   "x-enum-extensibility"?: "open" | "closed" | undefined

packages/openapi-code-generator/src/typescript/common/schema-builders/joi-schema-builder.ts

@@ -246,13 +246,13 @@ export class JoiBuilder extends AbstractSchemaBuilder<
         : undefined,
       Number.isFinite(model.exclusiveMinimum)
         ? `greater(${model.exclusiveMinimum})`
-        : Number.isFinite(model.minimum)
-          ? `min(${model.minimum})`
+        : Number.isFinite(model.inclusiveMinimum)
+          ? `min(${model.inclusiveMinimum})`
           : undefined,
       Number.isFinite(model.exclusiveMaximum)
         ? `less(${model.exclusiveMaximum})`
-        : Number.isFinite(model.maximum)
-          ? `max(${model.maximum})`
+        : Number.isFinite(model.inclusiveMaximum)
+          ? `max(${model.inclusiveMaximum})`
           : undefined,
     ]
       .filter(isDefined)

packages/openapi-code-generator/src/typescript/common/schema-builders/zod-v3-schema-builder.ts

@@ -259,13 +259,13 @@ export class ZodV3Builder extends AbstractSchemaBuilder<
         : undefined,
       Number.isFinite(model.exclusiveMinimum)
         ? `gt(${model.exclusiveMinimum})`
-        : Number.isFinite(model.minimum)
-          ? `min(${model.minimum})`
+        : Number.isFinite(model.inclusiveMinimum)
+          ? `min(${model.inclusiveMinimum})`
           : undefined,
       Number.isFinite(model.exclusiveMaximum)
         ? `lt(${model.exclusiveMaximum})`
-        : Number.isFinite(model.maximum)
-          ? `max(${model.maximum})`
+        : Number.isFinite(model.inclusiveMaximum)
+          ? `max(${model.inclusiveMaximum})`
           : undefined,
     ]
       .filter(isDefined)

packages/openapi-code-generator/src/typescript/common/schema-builders/zod-v4-schema-builder.ts

@@ -262,13 +262,13 @@ export class ZodV4Builder extends AbstractSchemaBuilder<
         : undefined,
       Number.isFinite(model.exclusiveMinimum)
         ? `gt(${model.exclusiveMinimum})`
-        : Number.isFinite(model.minimum)
-          ? `min(${model.minimum})`
+        : Number.isFinite(model.inclusiveMinimum)
+          ? `min(${model.inclusiveMinimum})`
           : undefined,
       Number.isFinite(model.exclusiveMaximum)
         ? `lt(${model.exclusiveMaximum})`
-        : Number.isFinite(model.maximum)
-          ? `max(${model.maximum})`
+        : Number.isFinite(model.inclusiveMaximum)
+          ? `max(${model.inclusiveMaximum})`
           : undefined,
     ]
       .filter(isDefined)