Merge pull request #542 from traversable/zod-to-string-discriminated-union-bug

fix(zod,zod-types): fixes `zx.toString` bug with `z.default` objects containing an unmatched bracket

Author: ahrjarrett

.changeset/large-wolves-lay.md

@@ -0,0 +1,6 @@
+---
+"@traversable/zod-types": patch
+"@traversable/zod": patch
+---
+
+fix(zod,zod-types): fixes `zx.toString` bug where objects with 1+ props passed to `z.default` included an unmatched closing bracket

packages/zod-types/src/utils.ts

@@ -155,7 +155,7 @@ export function serializeShort(json: unknown): string {
       case Array_isArray(x): return x.length === 0 ? '[]' : '[' + x.join(', ') + ']'
       case !!x && typeof x === 'object': {
         const xs = Object.entries(x)
-        return xs.length === 0 ? '{}' : '{' + xs.map(([k, v]) => parseKey(k) + ': ' + v).join(',') + '}]'
+        return xs.length === 0 ? '{}' : '{' + xs.map(([k, v]) => parseKey(k) + ': ' + v).join(',') + '}'
       }
     }
   })(json as Json.Unary<string>)

packages/zod/src/to-string.ts

@@ -1,8 +1,8 @@
 import { z } from 'zod'
 import type { Showable } from '@traversable/registry'
-import { has, Number_isNatural, Object_entries, parseKey } from '@traversable/registry'
+import { has, Number_isNatural, Object_entries, parseKey, escape } from '@traversable/registry'
 import type { Options as v4_Options } from '@traversable/zod-types'
-import { defaults as v4_defaults, tagged, serializeShort, Ctx, F, Z, Warn } from '@traversable/zod-types'
+import { defaults as v4_defaults, tagged, serializeShort, Ctx, F, Z } from '@traversable/zod-types'
 
 export interface Options extends v4_Options {}
 export interface Config extends Required<Options> {}
@@ -140,7 +140,9 @@ export function toString(schema: z.ZodType | z.core.$ZodType, options?: toString
       case tagged('array')(x): return `${z}.array(${x._zod.def.element})${applyArrayConstraints(x)}`
       case tagged('record')(x): return `${z}.record(${x._zod.def.keyType}, ${x._zod.def.valueType})`
       case tagged('intersection')(x): return `${z}.intersection(${x._zod.def.left}, ${x._zod.def.right})`
-      case tagged('union')(x): return `${z}.union([${x._zod.def.options.join(',')}])`
+      case tagged('union')(x): return x._zod.def.discriminator === undefined
+        ? `${z}.union([${x._zod.def.options.join(',')}])`
+        : `${z}.discriminatedUnion(["${escape(x._zod.def.discriminator)}", ${x._zod.def.options.join(',')}])`
       case tagged('lazy')(x): return `${z}.lazy(() => ${x._zod.def.getter()})`
       case tagged('pipe')(x): return `${x._zod.def.in}.pipe(${x._zod.def.out})`
       case tagged('default')(x): return `${x._zod.def.innerType}.default(${serializeShort(x._zod.def.defaultValue!)})`