Merge pull request #30 from firefliesai/feat/improve-array-support

Author: greguintow

src/lib/class-validator-integration.ts

@@ -43,7 +43,7 @@ interface ClassValidatorMetadata {
  */
 export interface InferredArrayItems {
   type?: 'string' | 'number' | 'integer' | 'boolean';
-  enum?: (string | number)[];
+  enum?: (string | number | boolean)[];
   minimum?: number;
   maximum?: number;
   minLength?: number;
@@ -74,19 +74,21 @@ export interface InferredSchemaProperties {
  * Tries to get the class-validator metadata storage if available
  */
 function getClassValidatorMetadataStorage(): any | null {
+  const getGlobalStorage = () => {
+    const g = globalThis as any;
+    return g.classValidatorMetadataStorage || null;
+  };
+
   try {
     // Prefer getMetadataStorage() if class-validator is loaded - ensures same instance
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     const cv = require('class-validator');
     if (typeof cv.getMetadataStorage === 'function') {
       return cv.getMetadataStorage();
     }
-    // Fallback to global storage (populated when class-validator decorators run)
-    const global = globalThis as any;
-    return global.classValidatorMetadataStorage || null;
+    return getGlobalStorage();
   } catch {
-    const global = globalThis as any;
-    return global.classValidatorMetadataStorage || null;
+    return getGlobalStorage();
   }
 }
 
@@ -186,10 +188,13 @@ export function inferClassValidatorProperties(
               typeof v === 'string' || typeof v === 'number' || typeof v === 'boolean',
           );
           if (allPrimitive && values.length > 0) {
-            const firstType = typeof values[0];
-            items.type =
-              firstType === 'string' ? 'string' : firstType === 'number' ? 'number' : 'boolean';
-            items.enum = values as (string | number)[];
+            const allSameType = values.every((v: unknown) => typeof v === typeof values[0]);
+            if (allSameType) {
+              const firstType = typeof values[0];
+              items.type =
+                firstType === 'string' ? 'string' : firstType === 'number' ? 'number' : 'boolean';
+            }
+            items.enum = values as (string | number | boolean)[];
           }
         }
         break;

src/lib/types.ts

@@ -21,8 +21,8 @@ export type Constructor<T> = new (...args: any[]) => T;
 
 // Schema types
 export interface SchemaItemType {
-  type?: 'string' | 'number' | 'boolean' | Constructor<any>;
-  enum?: (string | number)[];
+  type?: 'string' | 'number' | 'boolean' | 'integer' | Constructor<any>;
+  enum?: (string | number | boolean)[];
   format?: 'date-time' | 'uri' | 'email' | string;
   minimum?: number;
   maximum?: number;

src/lib/utils.ts

@@ -230,7 +230,9 @@ export function normalizeItemsType(items: any): any {
 
     if (items.type === Date) {
       normalizedItems.type = 'string';
-      normalizedItems.format = 'date-time';
+      if (!normalizedItems.format) {
+        normalizedItems.format = 'date-time';
+      }
       return normalizedItems;
     } else if (items.type === String) {
       normalizedItems.type = 'string';