From b2e45cd18e45e799f356dd2d8d74207a4a0e6d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Belli?= <niccolo.belli@linuxsystems.it>
Date: Wed, 5 Feb 2025 18:31:33 +0100
Subject: [PATCH] fix(enum-values): handle more corner cases

---
 packages/openapi-typescript/src/lib/ts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/openapi-typescript/src/lib/ts.ts b/packages/openapi-typescript/src/lib/ts.ts
index d07a1cfa3..355034614 100644
--- a/packages/openapi-typescript/src/lib/ts.ts
+++ b/packages/openapi-typescript/src/lib/ts.ts
@@ -256,7 +256,7 @@ export function tsArrayLiteralExpression(
     !options.injectFooter.some((node) => ts.isTypeAliasDeclaration(node) && node?.name?.escapedText === "FlattenedDeepRequired")
   ) {
     const helper = stringToAST(
-      "type FlattenedDeepRequired<T> = { [K in keyof T]: Required<FlattenedDeepRequired<T[K] extends unknown[] ? T[K][number] : T[K]>>; };",
+      "type FlattenedDeepRequired<T> = { [K in keyof T]-?: FlattenedDeepRequired<T[K] extends unknown[] | undefined | null ? Extract<T[K], unknown[]>[number] : T[K]>; };",
     )[0] as any;
     options.injectFooter.push(helper);
   }