Migrating traverse related methods to core types (#2579)

RobinTail · web-flow · commit e15e2fe779f4 · 2025-04-25T19:43:10.000+02:00
Instead of #2574
diff --git a/express-zod-api/src/common-helpers.ts b/express-zod-api/src/common-helpers.ts
@@ -89,8 +89,7 @@ export const getMessageFromError = (error: Error): string => {
 export const pullExampleProps = <T extends z.ZodObject>(subject: T) =>
   Object.entries(subject.shape).reduce<Partial<z.input<T>>[]>(
     (acc, [key, schema]) => {
-      const examples =
-        (schema as z.ZodType).meta()?.[metaSymbol]?.examples || [];
+      const { examples = [] } = globalRegistry.get(schema)?.[metaSymbol] || {};
       return combinations(acc, examples.map(R.objOf(key)), ([left, right]) => ({
         ...left,
         ...right,
diff --git a/express-zod-api/src/documentation-helpers.ts b/express-zod-api/src/documentation-helpers.ts
@@ -404,7 +404,9 @@ export const depictRequestParams = ({
         name,
         in: location,
         deprecated: globalRegistry.get(paramSchema)?.deprecated,
-        required: !(paramSchema as z.ZodType).isOptional(),
+        required: !(
+          paramSchema instanceof z.ZodType && paramSchema.isOptional()
+        ),
         description: depicted.description || description,
         schema: result,
         examples: depictParamExamples(objectSchema, name),
diff --git a/express-zod-api/src/zts.ts b/express-zod-api/src/zts.ts
@@ -4,10 +4,12 @@ import type {
   $ZodDefault,
   $ZodDiscriminatedUnion,
   $ZodEnum,
+  $ZodInterface,
   $ZodIntersection,
   $ZodLazy,
   $ZodLiteral,
   $ZodNullable,
+  $ZodObject,
   $ZodOptional,
   $ZodPipe,
   $ZodReadonly,
@@ -66,7 +68,7 @@ const onLiteral: Producer = ({ _zod: { def } }: $ZodLiteral) => {
   return values.length === 1 ? values[0] : f.createUnionTypeNode(values);
 };
 
-const onInterface: Producer = (int: z.ZodInterface, { next, makeAlias }) =>
+const onInterface: Producer = (int: $ZodInterface, { next, makeAlias }) =>
   makeAlias(int, () => {
     const members = Object.entries(int._zod.def.shape).map<ts.TypeElement>(
       ([key, value]) => {
@@ -84,16 +86,16 @@ const onInterface: Producer = (int: z.ZodInterface, { next, makeAlias }) =>
   });
 
 const onObject: Producer = (
-  { _zod: { def } }: z.ZodObject,
+  { _zod: { def } }: $ZodObject,
   { isResponse, next },
 ) => {
   const members = Object.entries(def.shape).map<ts.TypeElement>(
     ([key, value]) => {
       const isOptional = isResponse
-        ? value instanceof z.ZodOptional
-        : value instanceof z.ZodPromise
-          ? false
-          : (value as z.ZodType).isOptional();
+        ? value._zod.def.type === "optional"
+        : value._zod.def.type !== "promise" &&
+          value instanceof z.ZodType &&
+          value.isOptional();
       const { description: comment, deprecated: isDeprecated } =
         globalRegistry.get(value) || {};
       return makeInterfaceProp(key, next(value), {
@@ -211,9 +213,9 @@ const onFile: Producer = (schema: FileSchema) => {
   const stringType = ensureTypeNode(ts.SyntaxKind.StringKeyword);
   const bufferType = ensureTypeNode("Buffer");
   const unionType = f.createUnionTypeNode([stringType, bufferType]);
-  return schema instanceof z.ZodString
+  return schema._zod.def.type === "string"
     ? stringType
-    : schema instanceof z.ZodUnion
+    : schema._zod.def.type === "union"
       ? unionType
       : bufferType;
 };
