add anyOf support to schema-definition resolver

omermecitoglu · Jun 14, 2024 · 437a0b7 · 437a0b7
1 parent febe18d
commit 437a0b7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@omer-x/next-openapi-interface-generator",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "OpenAPI interface generator for Next.js",
   "keywords": [
     "next",
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@omer-x/eslint-config": "^1.0.7",
-    "@omer-x/openapi-types": "^0.1.1",
+    "@omer-x/openapi-types": "^0.1.2",
     "@types/node": "^20.14.2",
     "@types/yargs": "^17.0.32",
     "eslint": "^8.57.0",

diff --git a/src/core/resolvers/schema-definition.ts b/src/core/resolvers/schema-definition.ts
@@ -38,7 +38,8 @@ export function resolveSchema(definition?: SchemaObject): string {
       if (definition.format === "binary") return "File";
       // TODO: handle definition.format === "date"
       if (definition.enum) {
-        return `(${definition.enum.map(resolveEnumItem).join(" | ")})`;
+        const collection = definition.enum.map(resolveEnumItem);
+        return collection.length > 1 ? `(${collection.join(" | ")})` : collection.join(" | ");
       }
       return "string";
     }
@@ -61,6 +62,9 @@ export function resolveSchema(definition?: SchemaObject): string {
   if (definition.oneOf) {
     return resolveArray(definition.oneOf, false);
   }
+  if (definition.anyOf) {
+    return resolveArray(definition.anyOf, false);
+  }
   return "unknown";
 }