fix(zod): fixes type issues with zx.makeLens interacting poorly with zx.defaultValue

Author: ahrjarrett

packages/zod/src/default-value.ts

@@ -85,6 +85,18 @@ export type DefaultTypeMap = {
   string: undefined
 }
 
+export type PreserveTypeMap = {
+  never: never
+  any: any
+  unknown: unknown
+  undefined: undefined
+  null: null | undefined
+  boolean: boolean | undefined
+  bigint: bigint | undefined
+  number: number | undefined
+  string: string | undefined
+}
+
 export type AnyTypeMap = {
   never: unknown
   any: unknown
@@ -115,16 +127,6 @@ export type defaultValue<
   >
   : { [K in keyof T]: defaultValue<T[K], TypeMap, M> }
 
-
-// export type defaultValue<T, Fallback = undefined>
-//   = T extends Primitive | Atom ? T | Fallback
-//   : T extends Set<any> ? Set<defaultValue<ReturnType<(ReturnType<T['values']>['return'] & {})>['value'] & {}, Fallback>>
-//   : T extends Map<any, any> ? Map<
-//     defaultValue<({} & ReturnType<{} & ReturnType<T['entries']>['return']>['value'])[0], Fallback>,
-//     defaultValue<({} & ReturnType<{} & ReturnType<T['entries']>['return']>['value'])[1], Fallback>
-//   >
-//   : { [K in keyof T]-?: defaultValue<T[K], Fallback> }
-
 /** 
  * ## {@link defaultValue `zx.defaultValue`}
  *

packages/zod/src/makeLens.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import type { Key, newtype, Showable } from '@traversable/registry'
+import type { Key, newtype, Primitive, Showable } from '@traversable/registry'
 import {
   Array_from,
   Array_isArray,
@@ -532,9 +532,23 @@ interface Proxy_tuple<T, S, KS extends (keyof any)[]> extends newtype<
   [symbol.path]: KS
 }
 
+export type Atom =
+  | globalThis.Date
+  | globalThis.RegExp
+
+export type CoalesceOptional<T, Fallback = undefined>
+  = T extends Primitive | Atom ? T | Fallback
+  : T extends Set<any> ? Set<CoalesceOptional<ReturnType<(ReturnType<T['values']>['return'] & {})>['value'] & {}, Fallback>>
+  : T extends Map<any, any> ? Map<
+    CoalesceOptional<({} & ReturnType<{} & ReturnType<T['entries']>['return']>['value'])[0], Fallback>,
+    CoalesceOptional<({} & ReturnType<{} & ReturnType<T['entries']>['return']>['value'])[1], Fallback>
+  >
+  : { [K in keyof T]-?: CoalesceOptional<T[K], Fallback> }
+
 interface Proxy_optional<T, S, KS extends (keyof any)[]> {
   [DSL.chainOptional]: Proxy<S>
-  [DSL.coalesceOptional]: Proxy<S, [defaultValue<S>], KS>
+  // [DSL.coalesceOptional]: Proxy<S, [S], KS>
+  [DSL.coalesceOptional]: Proxy<S, [CoalesceOptional<S>], KS>
   [symbol.type]: T
   [symbol.path]: KS
 }