Fix NormalizeServerDates mangling types

Author: kossnocorp

Diff for: src/index.ts

@@ -109,9 +109,10 @@ export namespace Typesaurus {
   > = Core.ConcatModel<ModelToConcatTo, ModelToConcat>;
 
   /**
-   * Normalizes server dates in an object. It replaces ServerDate with regular Date. It's useful when reusing interfaces
-   * in a non-Typesaurus environment or when you need to store it in an array (where server dates are not allowed).
+   * Deeply normalizes server dates in a given type. It replaces ServerDate with
+   * regular Date. It's useful when reusing interfaces in a non-Typesaurus
+   * environment or when you need to store it in an array (where server dates
+   * are not allowed).
    */
-  export type NormalizeServerDates<Interface> =
-    Core.NormalizeServerDates<Interface>;
+  export type NormalizeServerDates<Type> = Core.NormalizeServerDates<Type>;
 }

Diff for: src/types/core.ts

@@ -1530,14 +1530,20 @@ export namespace TypesaurusCore {
     : never;
 
   /**
-   * Normalizes server dates in an object. It replaces ServerDate with regular Date. It's useful when reusing interfaces
-   * in a non-Typesaurus environment or when you need to store it in an array (where server dates are not allowed).
+   * Deeply normalizes server dates in a given type. It replaces ServerDate with
+   * regular Date. It's useful when reusing interfaces in a non-Typesaurus
+   * environment or when you need to store it in an array (where server dates
+   * are not allowed).
    */
-  export type NormalizeServerDates<Interface> = {
-    [Key in keyof Interface]: Interface[Key] extends ServerDate
-      ? Date
-      : NormalizeServerDates<Interface[Key]>;
-  };
+  export type NormalizeServerDates<Type> = Type extends ServerDate
+    ? Date
+    : Type extends Date | Ref<any> | string | number | boolean
+      ? Type
+      : Type extends Array<infer Item>
+        ? Array<NormalizeServerDates<Item>>
+        : Type extends object
+          ? { [Key in keyof Type]: NormalizeServerDates<Type[Key]> }
+          : never;
 
   /**
    * The options. It allows to configure the Firebase settings.

Diff for: src/tysts/core.ts

@@ -196,12 +196,43 @@ interface Mixed {
   nested2: Mixed | undefined;
   nested3?: Mixed;
   nested4?: Mixed | undefined;
+  arrayOfObjects: Array<{
+    date?: Date;
+    some?: "things";
+    things?: "some" | undefined;
+    opaqueNumber: OpaqueNumber;
+    opaqueString: OpaqueString;
+    opaqueBoolean: OpaqueBoolean;
+  }>;
 }
 
 type OpaqueJSON = string & { __json: {} };
 
 type OpaqueNumber = number & { __number: 123 };
 
+type OpaqueString = string & { __string: "hello" };
+
+type OpaqueBoolean = boolean & { __boolean: true };
+
+interface OpaqueTypes {
+  number: OpaqueNumber;
+  numberArr: OpaqueNumber[];
+  string: OpaqueString;
+  stringArr: OpaqueString[];
+  boolean: OpaqueBoolean;
+  booleanArr: OpaqueBoolean[];
+  object: {
+    number: OpaqueNumber;
+    string: OpaqueString;
+    boolean: OpaqueBoolean;
+  };
+  array: Array<{
+    number: OpaqueNumber;
+    string: OpaqueString;
+    boolean: OpaqueBoolean;
+  }>;
+}
+
 interface CustomCollection {
   hello: "world";
 }
@@ -3056,6 +3087,12 @@ namespace NormalizeServerDates {
   >;
 
   type Result2 = Assert<number, Core.NormalizeServerDates<number>>;
+
+  type asd = Core.NormalizeServerDates<OpaqueString>;
+
+  type Result3 = Assert<OpaqueString, Core.NormalizeServerDates<OpaqueString>>;
+
+  type Result4 = Assert<OpaqueTypes, Core.NormalizeServerDates<OpaqueTypes>>;
 }
 
 namespace Nullify {