add generic schema check for tuples

Author: omermecitoglu

src/core/resolvers/imported-schema.ts

@@ -1,4 +1,5 @@
 import type { OpenAPI, Operation, SchemaDefinition } from "~/core/openapi";
+import { getTupleItems, isTuple } from "~/core/tuple";
 import getContentSchema from "./content";
 import resolveEndpoints from "./enpoint";
 import { filterGenericSchemas, resolveSchema, simplifySchema } from "./schema-definition";
@@ -16,12 +17,21 @@ function resolveResponseSchemas(responses: Operation["responses"]) {
   }).flat();
 }
 
+function extractTuples(collection: string[]) {
+  return collection.map(schema => {
+    if (isTuple(schema.replaceAll("[]", ""))) {
+      return getTupleItems(schema);
+    }
+    return schema;
+  }).flat();
+}
+
 export function resolveSchemas(paths: OpenAPI["paths"]) {
   const collection = resolveEndpoints(paths).map(({ operation }) => ([
     ...resolveRequestSchemas(operation.requestBody),
     ...resolveResponseSchemas(operation.responses),
   ])).flat();
-  const uniqueCollection = Array.from(new Set(collection));
+  const uniqueCollection = Array.from(new Set(extractTuples(collection)));
   return filterGenericSchemas(uniqueCollection).toSorted();
 }
 
@@ -43,6 +53,6 @@ function resolvePropDefinition(definition: SchemaDefinition) {
 
 export function resolveSchemasFromProps(props: Record<string, SchemaDefinition>) {
   const collection = Object.values(props).map(resolvePropDefinition).flat();
-  const uniqueCollection = Array.from(new Set(collection));
+  const uniqueCollection = Array.from(new Set(extractTuples(collection)));
   return filterGenericSchemas(uniqueCollection).toSorted();
 }

src/core/resolvers/schema-definition.ts

@@ -1,4 +1,5 @@
 import type { SchemaDefinition } from "~/core/openapi";
+import { getTupleItems, isTuple } from "~/core/tuple";
 
 function resolveArray(items: SchemaDefinition[], isArray: boolean) {
   const schemas = items.map(resolveSchema);
@@ -95,13 +96,18 @@ function isEverydayType(schema: string) {
 }
 
 function isArraySchema(schema: string) {
-  return schema.includes("[]");
+  return schema.endsWith("[]");
 }
 
 function isGenericSchema(schema: string) {
   if (isArraySchema(schema)) {
     return isGenericSchema(schema.replace("[]", ""));
   }
+  if (isTuple(schema)) {
+    const items = getTupleItems(schema);
+    if (items.every(isGenericSchema)) return true;
+    throw new Error("There is a named type in the tuple. This resolver is not smart enough to handle that.");
+  }
   if (isEverydayType(schema)) return true;
   if (isRawObject(schema)) return true;
   return false;

src/core/tuple.ts

@@ -0,0 +1,8 @@
+export function isTuple(schema: string) {
+  return (/^\[(?:\s*[^,[\]]+\s*(?:,\s*[^,[\]]+\s*)*)?\]$/).test(schema);
+}
+
+export function getTupleItems(schema: string) {
+  const matches = schema.match(/\s*([^,[\]\s]+)\s*/g);
+  return matches?.map(m => m.trim()) ?? [];
+}