From a4d5f0f7a310395cdb321aafeabde1ac9c72917f Mon Sep 17 00:00:00 2001
From: Thomas Smeele <thomas.smeele@hotmail.com>
Date: Mon, 15 Jul 2024 15:42:00 +0000
Subject: [PATCH] Make PR cleaner

---
 src/Model.d.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Model.d.ts b/src/Model.d.ts
index cf60979..eddd773 100644
--- a/src/Model.d.ts
+++ b/src/Model.d.ts
@@ -100,13 +100,9 @@ export type OneSchemaParams = {
 /*
     Entity field signature generated from the schema
  */
-type EntityField<T extends OneField> = T['type'] extends 'array' | ArrayConstructor | ArrayBufferConstructor
-    ? T['items'] extends object
-        ? EntityField<T['items']>[]
-        : EntityFieldFromType<T>
-    : T['enum'] extends readonly EntityFieldFromType<T>[]
-        ? T['enum'][number]
-        : EntityFieldFromType<T>
+type EntityField<T extends OneField> = T['enum'] extends readonly EntityFieldFromType<T>[]
+    ? T['enum'][number]
+    : EntityFieldFromType<T>
 
 type EntityFieldFromType<T extends OneField> = T['type'] extends ArrayConstructor | 'array'
     ? ArrayItemType<T>[]
@@ -128,7 +124,9 @@ type EntityFieldFromType<T extends OneField> = T['type'] extends ArrayConstructo
     ? EntityFieldFromType<Exclude<T['items'], undefined>>[]
     : never
 
-type ArrayItemType<T extends OneField> = T extends {items: OneField} ? EntityFieldFromType<T['items']> : any
+type ArrayItemType<T extends OneField> = T extends {items: OneField}
+    ? EntityField<T['items']>
+    : EntityFieldFromType<T>
 /*
     Select the required properties from a model
 */