Merge pull request #105 from samchon/feat/allOf

Fix #104: conversion OpenAPI version when `allOf.length` is 1.
samchon · Dec 4, 2024 · 8b84e90 · 8b84e90
2 parents 2ccc87f + fe4f81e
commit 8b84e90
Show file tree

Hide file tree

Showing 7 changed files with 2,258 additions and 170 deletions.
diff --git a/examples/v2.0/semanticscholar.json b/examples/v2.0/semanticscholar.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@samchon/openapi",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "OpenAPI definitions and converters for 'typia' and 'nestia'.",
   "main": "./lib/index.js",
   "module": "./lib/index.mjs",

diff --git a/src/converters/OpenApiV3Upgrader.ts b/src/converters/OpenApiV3Upgrader.ts
@@ -281,7 +281,8 @@ export namespace OpenApiV3Upgrader {
         if (TypeChecker.isAnyOf(schema)) schema.anyOf.forEach(visit);
         else if (TypeChecker.isOneOf(schema)) schema.oneOf.forEach(visit);
         else if (TypeChecker.isAllOf(schema))
-          union.push(convertAllOfSchema(components)(schema));
+          if (schema.allOf.length === 1) visit(schema.allOf[0]);
+          else union.push(convertAllOfSchema(components)(schema));
         // ATOMIC TYPE CASE (CONSIDER ENUM VALUES)
         else if (
           TypeChecker.isBoolean(schema) ||

diff --git a/src/converters/OpenApiV3_1Emender.ts b/src/converters/OpenApiV3_1Emender.ts
@@ -381,7 +381,8 @@ export namespace OpenApiV3_1Emender {
         else if (TypeChecker.isOneOf(schema)) schema.oneOf.forEach(visit);
         else if (TypeChecker.isAnyOf(schema)) schema.anyOf.forEach(visit);
         else if (TypeChecker.isAllOf(schema))
-          union.push(convertAllOfSchema(components)(schema));
+          if (schema.allOf.length === 1) visit(schema.allOf[0]);
+          else union.push(convertAllOfSchema(components)(schema));
         // ATOMIC TYPE CASE (CONSIDER ENUM VALUES)
         else if (TypeChecker.isBoolean(schema))
           if (