zod-openapi 3.2.0 → 4.0.0-beta.0

package/dist/components.chunk.cjs

@@ -9,16 +9,122 @@ const isAnyZodType = (zodType) => {
     (_a = zodType == null ? void 0 : zodType._def) == null ? void 0 : _a.typeName
   );
 };
-const enhanceWithMetadata = (schema, metadata) => {
+const openApiVersions = [
+  "3.0.0",
+  "3.0.1",
+  "3.0.2",
+  "3.0.3",
+  "3.1.0"
+];
+const satisfiesVersion = (test, against) => openApiVersions.indexOf(test) >= openApiVersions.indexOf(against);
+const createDescriptionMetadata = (schema, description, state) => {
+  if (satisfiesVersion(state.components.openapi, "3.1.0")) {
+    return {
+      type: "ref",
+      schema: {
+        $ref: schema.schema.$ref,
+        description
+      },
+      zodType: schema.zodType,
+      effects: schema.effects,
+      schemaObject: schema.schemaObject
+    };
+  }
+  return {
+    type: "schema",
+    schema: {
+      description,
+      allOf: [schema.schema]
+    },
+    effects: schema.effects
+  };
+};
+const isValueEqual = (value, previous) => {
+  if (typeof value !== typeof previous) {
+    return false;
+  }
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value === previous;
+  }
+  if (Array.isArray(value) && Array.isArray(previous)) {
+    const sorted = [...value].sort();
+    const previousSorted = [...previous].sort();
+    return sorted.every((v, i) => isValueEqual(v, previousSorted[i]));
+  }
+  if (value === null || previous === null) {
+    return value === previous;
+  }
+  if (typeof value === "object" && typeof previous === "object") {
+    const keys = Object.keys(value);
+    return keys.every(
+      (key) => isValueEqual(
+        value[key],
+        previous[key]
+      )
+    );
+  }
+  return value === previous;
+};
+const enhanceWithMetadata = (schema, metadata, state, previous) => {
+  const values = Object.entries(metadata).reduce(
+    (acc, [key, value]) => {
+      if (value === void 0) {
+        return acc;
+      }
+      acc[key] = value;
+      return acc;
+    },
+    {}
+  );
+  const length = Object.values(values).length;
   if (schema.type === "ref") {
-    if (Object.values(metadata).every((val) => val === void 0)) {
+    if (length === 0) {
       return schema;
     }
+    if (length === 1 && metadata.description) {
+      return createDescriptionMetadata(schema, metadata.description, state);
+    }
     return {
       type: "schema",
       schema: {
-        allOf: [schema.schema, metadata]
+        allOf: [schema.schema],
+        ...metadata
+      },
+      effects: schema.effects
+    };
+  }
+  if (previous && schema.schema.type !== "object") {
+    const diff = Object.entries({ ...schema.schema, ...values }).reduce(
+      (acc, [key, value]) => {
+        if (previous.schemaObject && isValueEqual(
+          previous.schemaObject[key],
+          value
+        )) {
+          return acc;
+        }
+        acc[key] = value;
+        return acc;
       },
+      {}
+    );
+    const diffLength = Object.values(diff).length;
+    if (diffLength === 0) {
+      return {
+        type: "ref",
+        schema: {
+          $ref: previous.schema.$ref
+        },
+        effects: schema.effects,
+        schemaObject: previous.schemaObject,
+        zodType: previous.zodType
+      };
+    }
+    if (diffLength === 1 && typeof diff.description === "string") {
+      return createDescriptionMetadata(previous, diff.description, state);
+    }
+    return {
+      type: "schema",
+      schema: { allOf: [previous.schema], ...diff },
       effects: schema.effects
     };
   }
@@ -55,7 +161,16 @@ const createBooleanSchema = (_zodBoolean) => ({
   }
 });
 const createBrandedSchema = (zodBranded, state) => createSchemaObject(zodBranded._def.type, state, ["brand"]);
-const createCatchSchema = (zodCatch, state) => createSchemaObject(zodCatch._def.innerType, state, ["catch"]);
+const createCatchSchema = (zodCatch, state, previous) => {
+  const schemaObject = createSchemaObject(zodCatch._def.innerType, state, [
+    "default"
+  ]);
+  const catchResult = zodCatch.safeParse(void 0);
+  const maybeDefaultValue = catchResult.success ? {
+    default: catchResult.data
+  } : {};
+  return enhanceWithMetadata(schemaObject, maybeDefaultValue, state, previous);
+};
 const createDateSchema = (_zodDate, state) => {
   var _a;
   return {
@@ -65,22 +180,19 @@ const createDateSchema = (_zodDate, state) => {
     }
   };
 };
-const createDefaultSchema = (zodDefault, state) => {
+const createDefaultSchema = (zodDefault, state, previous) => {
   const schemaObject = createSchemaObject(zodDefault._def.innerType, state, [
     "default"
   ]);
-  return enhanceWithMetadata(schemaObject, {
-    default: zodDefault._def.defaultValue()
-  });
+  return enhanceWithMetadata(
+    schemaObject,
+    {
+      default: zodDefault._def.defaultValue()
+    },
+    state,
+    previous
+  );
 };
-const openApiVersions = [
-  "3.0.0",
-  "3.0.1",
-  "3.0.2",
-  "3.0.3",
-  "3.1.0"
-];
-const satisfiesVersion = (test, against) => openApiVersions.indexOf(test) >= openApiVersions.indexOf(against);
 const createNativeEnumSchema = (zodEnum, state) => {
   const enumValues = getValidEnumValues(zodEnum._def.values);
   const { numbers, strings } = sortStringsAndNumbers(enumValues);
@@ -132,14 +244,14 @@ const sortStringsAndNumbers = (values) => ({
   numbers: values.filter((value) => typeof value === "number")
 });
 const createTransformSchema = (zodTransform, state) => {
-  var _a, _b, _c;
-  if (((_a = zodTransform._def.openapi) == null ? void 0 : _a.effectType) === "output") {
+  var _a, _b, _c, _d, _e, _f;
+  if (((_b = (_a = zodTransform._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.effectType) === "output") {
     return {
       type: "schema",
       schema: createManualOutputTransformSchema(zodTransform, state)
     };
   }
-  if (((_b = zodTransform._def.openapi) == null ? void 0 : _b.effectType) === "input" || ((_c = zodTransform._def.openapi) == null ? void 0 : _c.effectType) === "same") {
+  if (((_d = (_c = zodTransform._def.zodOpenApi) == null ? void 0 : _c.openapi) == null ? void 0 : _d.effectType) === "input" || ((_f = (_e = zodTransform._def.zodOpenApi) == null ? void 0 : _e.openapi) == null ? void 0 : _f.effectType) === "same") {
     return createSchemaObject(zodTransform._def.schema, state, [
       "transform input"
     ]);
@@ -169,18 +281,18 @@ const createTransformSchema = (zodTransform, state) => {
   };
 };
 const createManualOutputTransformSchema = (zodTransform, state) => {
-  var _a;
-  if (!((_a = zodTransform._def.openapi) == null ? void 0 : _a.type)) {
+  var _a, _b, _c;
+  if (!((_b = (_a = zodTransform._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.type)) {
     const zodType = zodTransform.constructor.name;
     const schemaName = `${zodType} - ${zodTransform._def.effect.type}`;
     throw new Error(
       `Failed to determine a type for ${schemaName} at ${state.path.join(
         " > "
-      )}. Please change the 'effectType' to 'input', wrap it in a ZodPipeline or assign it a manual 'type'.`
+      )}. Please change the 'effectType' to 'same' or 'input', wrap it in a ZodPipeline or assign it a manual 'type'.`
     );
   }
   return {
-    type: zodTransform._def.openapi.type
+    type: (_c = zodTransform._def.zodOpenApi) == null ? void 0 : _c.openapi.type
   };
 };
 const getZodTypeName = (zodType) => {
@@ -372,20 +484,26 @@ const createEnumSchema = (zodEnum) => ({
   }
 });
 const createIntersectionSchema = (zodIntersection, state) => {
-  const left = createSchemaObject(zodIntersection._def.left, state, [
-    "intersection left"
-  ]);
-  const right = createSchemaObject(zodIntersection._def.right, state, [
-    "intersection right"
-  ]);
+  const schemas = flattenIntersection(zodIntersection);
+  const allOfs = schemas.map(
+    (schema, index) => createSchemaObject(schema, state, [`intersection ${index}`])
+  );
   return {
     type: "schema",
     schema: {
-      allOf: [left.schema, right.schema]
+      allOf: allOfs.map((schema) => schema.schema)
     },
-    effects: flattenEffects([left.effects, right.effects])
+    effects: flattenEffects(allOfs.map((schema) => schema.effects))
   };
 };
+const flattenIntersection = (zodType) => {
+  if (!isZodType(zodType, "ZodIntersection")) {
+    return [zodType];
+  }
+  const leftSchemas = flattenIntersection(zodType._def.left);
+  const rightSchemas = flattenIntersection(zodType._def.right);
+  return [...leftSchemas, ...rightSchemas];
+};
 const createLazySchema = (zodLazy, state) => {
   const innerSchema = zodLazy._def.getter();
   return createSchemaObject(innerSchema, state, ["lazy schema"]);
@@ -418,8 +536,8 @@ const createLiteralSchema = (zodLiteral, state) => {
   };
 };
 const createManualTypeSchema = (zodSchema, state) => {
-  var _a;
-  if (!((_a = zodSchema._def.openapi) == null ? void 0 : _a.type)) {
+  var _a, _b, _c;
+  if (!((_b = (_a = zodSchema._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.type)) {
     const schemaName = zodSchema.constructor.name;
     throw new Error(
       `Unknown schema ${schemaName} at ${state.path.join(
@@ -430,7 +548,7 @@ const createManualTypeSchema = (zodSchema, state) => {
   return {
     type: "schema",
     schema: {
-      type: zodSchema._def.openapi.type
+      type: (_c = zodSchema._def.zodOpenApi) == null ? void 0 : _c.openapi.type
     }
   };
 };
@@ -523,16 +641,19 @@ const createNumberSchema = (zodNumber, state) => {
   const zodNumberChecks = getZodNumberChecks(zodNumber);
   const minimum = mapMinimum(zodNumberChecks, state.components.openapi);
   const maximum = mapMaximum(zodNumberChecks, state.components.openapi);
+  const multipleOf = mapMultipleOf(zodNumberChecks);
   return {
     type: "schema",
     schema: {
       type: mapNumberType(zodNumberChecks),
+      ...multipleOf && multipleOf,
       ...minimum && minimum,
       // Union types are not easy to tame
       ...maximum && maximum
     }
   };
 };
+const mapMultipleOf = (zodNumberCheck) => zodNumberCheck.multipleOf ? { multipleOf: zodNumberCheck.multipleOf.value } : void 0;
 const mapMaximum = (zodNumberCheck, openapi) => {
   if (!zodNumberCheck.max) {
     return void 0;
@@ -565,79 +686,11 @@ const getZodNumberChecks = (zodNumber) => zodNumber._def.checks.reduce((acc, che
 }, {});
 const mapNumberType = (zodNumberChecks) => zodNumberChecks.int ? "integer" : "number";
 const createOptionalSchema = (zodOptional, state) => createSchemaObject(zodOptional.unwrap(), state, ["optional"]);
-const isOptionalSchema = (zodSchema, state) => {
-  var _a, _b, _c;
-  if (isZodType(zodSchema, "ZodOptional") || isZodType(zodSchema, "ZodNever") || isZodType(zodSchema, "ZodUndefined") || isZodType(zodSchema, "ZodLiteral") && zodSchema._def.value === void 0) {
-    return { optional: true };
-  }
-  if (isZodType(zodSchema, "ZodDefault")) {
-    if (((_a = zodSchema._def.openapi) == null ? void 0 : _a.effectType) === "input") {
-      return { optional: true };
-    }
-    if (((_b = zodSchema._def.openapi) == null ? void 0 : _b.effectType) === "output") {
-      return { optional: false };
-    }
-    return {
-      optional: state.type === "input",
-      effects: [
-        {
-          type: "schema",
-          creationType: state.type,
-          zodType: zodSchema,
-          path: [...state.path]
-        }
-      ]
-    };
-  }
-  if (isZodType(zodSchema, "ZodNullable") || isZodType(zodSchema, "ZodCatch")) {
-    return isOptionalSchema(zodSchema._def.innerType, state);
-  }
-  if (isZodType(zodSchema, "ZodEffects")) {
-    return isOptionalSchema(zodSchema._def.schema, state);
-  }
-  if (isZodType(zodSchema, "ZodUnion") || isZodType(zodSchema, "ZodDiscriminatedUnion")) {
-    const results = zodSchema._def.options.map(
-      (schema) => isOptionalSchema(schema, state)
-    );
-    return results.reduce(
-      (acc, result) => ({
-        optional: acc.optional || result.optional,
-        effects: flattenEffects([acc.effects, result.effects])
-      }),
-      { optional: false }
-    );
-  }
-  if (isZodType(zodSchema, "ZodIntersection")) {
-    const results = [zodSchema._def.left, zodSchema._def.right].map(
-      (schema) => isOptionalSchema(schema, state)
-    );
-    return results.reduce(
-      (acc, result) => ({
-        optional: acc.optional || result.optional,
-        effects: flattenEffects([acc.effects, result.effects])
-      }),
-      { optional: false }
-    );
-  }
-  if (isZodType(zodSchema, "ZodPipeline")) {
-    const type = ((_c = zodSchema._def.openapi) == null ? void 0 : _c.effectType) ?? state.type;
-    if (type === "input") {
-      return isOptionalSchema(zodSchema._def.in, state);
-    }
-    if (type === "output") {
-      return isOptionalSchema(zodSchema._def.out, state);
-    }
-  }
-  if (isZodType(zodSchema, "ZodLazy")) {
-    return isOptionalSchema(zodSchema._def.getter(), state);
-  }
-  return { optional: zodSchema.isOptional() };
-};
-const createObjectSchema = (zodObject, state) => {
-  var _a;
+const isOptionalObjectKey = (zodSchema) => isZodType(zodSchema, "ZodNever") || isZodType(zodSchema, "ZodUndefined") || isZodType(zodSchema, "ZodLiteral") && zodSchema._def.value === void 0;
+const createObjectSchema = (zodObject, previous, state) => {
   const extendedSchema = createExtendedSchema(
     zodObject,
-    (_a = zodObject._def.extendMetadata) == null ? void 0 : _a.extends,
+    previous == null ? void 0 : previous.zodType,
     state
   );
   if (extendedSchema) {
@@ -653,12 +706,12 @@ const createObjectSchema = (zodObject, state) => {
   );
 };
 const createExtendedSchema = (zodObject, baseZodObject, state) => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e;
   if (!baseZodObject) {
     return void 0;
   }
   const component = state.components.schemas.get(baseZodObject);
-  if (component ?? ((_a = baseZodObject._def.openapi) == null ? void 0 : _a.ref)) {
+  if (component ?? ((_b = (_a = baseZodObject._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.ref)) {
     createSchemaObject(baseZodObject, state, ["extended schema"]);
   }
   const completeComponent = state.components.schemas.get(baseZodObject);
@@ -688,8 +741,53 @@ const createExtendedSchema = (zodObject, baseZodObject, state) => {
   const extendedSchema = createObjectSchemaFromShape(
     diffShape,
     diffOpts,
-    state
+    state,
+    true
   );
+  const schemaLength = Object.keys(extendedSchema.schema).length;
+  const effects = flattenEffects([
+    completeComponent.type === "complete" ? completeComponent.effects : [],
+    completeComponent.type === "in-progress" ? [
+      {
+        type: "component",
+        zodType: zodObject,
+        path: [...state.path]
+      }
+    ] : [],
+    extendedSchema.effects
+  ]);
+  if (schemaLength === 0) {
+    return {
+      type: "ref",
+      schema: {
+        $ref: createComponentSchemaRef(
+          completeComponent.ref,
+          (_c = state.documentOptions) == null ? void 0 : _c.componentRefPath
+        )
+      },
+      schemaObject: completeComponent.type === "complete" ? completeComponent.schemaObject : void 0,
+      zodType: zodObject,
+      effects
+    };
+  }
+  if (schemaLength === 1 && extendedSchema.schema.description) {
+    return createDescriptionMetadata(
+      {
+        type: "ref",
+        schema: {
+          $ref: createComponentSchemaRef(
+            completeComponent.ref,
+            (_d = state.documentOptions) == null ? void 0 : _d.componentRefPath
+          )
+        },
+        schemaObject: completeComponent.type === "complete" ? completeComponent.schemaObject : void 0,
+        zodType: zodObject,
+        effects
+      },
+      extendedSchema.schema.description,
+      state
+    );
+  }
   return {
     type: "schema",
     schema: {
@@ -697,7 +795,7 @@ const createExtendedSchema = (zodObject, baseZodObject, state) => {
         {
           $ref: createComponentSchemaRef(
             completeComponent.ref,
-            (_b = state.documentOptions) == null ? void 0 : _b.componentRefPath
+            (_e = state.documentOptions) == null ? void 0 : _e.componentRefPath
           )
         }
       ],
@@ -740,14 +838,14 @@ const createShapeDiff = (baseObj, extendedObj) => {
   }
   return acc;
 };
-const createObjectSchemaFromShape = (shape, { unknownKeys, catchAll }, state) => {
+const createObjectSchemaFromShape = (shape, { unknownKeys, catchAll }, state, omitType) => {
   const properties = mapProperties(shape, state);
-  const required = mapRequired(shape, state);
+  const required = mapRequired(properties, shape, state);
   const additionalProperties = !isZodType(catchAll, "ZodNever") ? createSchemaObject(catchAll, state, ["additional properties"]) : void 0;
   return {
     type: "schema",
     schema: {
-      type: "object",
+      ...!omitType && { type: "object" },
       ...properties && { properties: properties.properties },
       ...(required == null ? void 0 : required.required.length) && { required: required.required },
       ...unknownKeys === "strict" && { additionalProperties: false },
@@ -762,17 +860,38 @@ const createObjectSchemaFromShape = (shape, { unknownKeys, catchAll }, state) =>
     ])
   };
 };
-const mapRequired = (shape, state) => {
-  const { required, effects: allEffects } = Object.entries(shape).reduce(
-    (acc, [key, zodSchema]) => {
-      state.path.push(`property: ${key}`);
-      const { optional, effects } = isOptionalSchema(zodSchema, state);
-      state.path.pop();
-      if (!optional) {
+const mapRequired = (properties, shape, state) => {
+  if (!properties) {
+    return void 0;
+  }
+  const { required, effects } = Object.entries(properties.schemas).reduce(
+    (acc, [key, schemaOrRef]) => {
+      const zodSchema = shape[key];
+      if (!zodSchema) {
+        throw new Error("Property somehow doesn't exist in shape");
+      }
+      const result = zodSchema.safeParse(void 0);
+      if (!result.success) {
         acc.required.push(key);
+        return acc;
       }
-      if (effects) {
-        acc.effects.push(effects);
+      if (result.data !== void 0) {
+        const baseEffect = {
+          zodType: zodSchema,
+          path: [...state.path, `property: ${key}`]
+        };
+        const effect = schemaOrRef.type === "ref" ? {
+          ...baseEffect,
+          type: "component"
+        } : {
+          ...baseEffect,
+          type: "schema",
+          creationType: state.type
+        };
+        acc.effects.push(effect);
+        if (state.type === "output") {
+          acc.required.push(key);
+        }
       }
       return acc;
     },
@@ -781,7 +900,7 @@ const mapRequired = (shape, state) => {
       effects: []
     }
   );
-  return { required, effects: flattenEffects(allEffects) };
+  return { required, effects };
 };
 const mapProperties = (shape, state) => {
   const shapeEntries = Object.entries(shape);
@@ -790,28 +909,28 @@ const mapProperties = (shape, state) => {
   }
   return shapeEntries.reduce(
     (acc, [key, zodSchema]) => {
-      if (isZodType(zodSchema, "ZodNever") || isZodType(zodSchema, "ZodUndefined")) {
+      if (isOptionalObjectKey(zodSchema)) {
         return acc;
       }
-      const property = createSchemaObject(zodSchema, state, [
-        `property: ${key}`
-      ]);
-      acc.properties[key] = property.schema;
-      acc.effects.push(property.effects);
+      const schema = createSchemaObject(zodSchema, state, [`property: ${key}`]);
+      acc.schemas[key] = schema;
+      acc.properties[key] = schema.schema;
+      acc.effects.push(schema.effects);
       return acc;
     },
     {
+      schemas: {},
       properties: {},
       effects: []
     }
   );
 };
 const createPipelineSchema = (zodPipeline, state) => {
-  var _a, _b, _c;
-  if (((_a = zodPipeline._def.openapi) == null ? void 0 : _a.effectType) === "input" || ((_b = zodPipeline._def.openapi) == null ? void 0 : _b.effectType) === "same") {
+  var _a, _b, _c, _d, _e, _f;
+  if (((_b = (_a = zodPipeline._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.effectType) === "input" || ((_d = (_c = zodPipeline._def.zodOpenApi) == null ? void 0 : _c.openapi) == null ? void 0 : _d.effectType) === "same") {
     return createSchemaObject(zodPipeline._def.in, state, ["pipeline input"]);
   }
-  if (((_c = zodPipeline._def.openapi) == null ? void 0 : _c.effectType) === "output") {
+  if (((_f = (_e = zodPipeline._def.zodOpenApi) == null ? void 0 : _e.openapi) == null ? void 0 : _f.effectType) === "output") {
     return createSchemaObject(zodPipeline._def.out, state, ["pipeline output"]);
   }
   if (state.type === "input") {
@@ -1140,11 +1259,14 @@ const mapPrefixItems = (items, state) => {
   return void 0;
 };
 const createUnionSchema = (zodUnion, state) => {
-  var _a, _b;
-  const schemas = zodUnion.options.map(
-    (option, index) => createSchemaObject(option, state, [`union option ${index}`])
-  );
-  if (((_a = zodUnion._def.openapi) == null ? void 0 : _a.unionOneOf) ?? ((_b = state.documentOptions) == null ? void 0 : _b.unionOneOf)) {
+  var _a, _b, _c;
+  const schemas = zodUnion.options.reduce((acc, option, index) => {
+    if (!isOptionalObjectKey(option)) {
+      acc.push(createSchemaObject(option, state, [`union option ${index}`]));
+    }
+    return acc;
+  }, []);
+  if (((_b = (_a = zodUnion._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.unionOneOf) ?? ((_c = state.documentOptions) == null ? void 0 : _c.unionOneOf)) {
     return {
       type: "schema",
       schema: {
@@ -1165,9 +1287,9 @@ const createUnknownSchema = (_zodUnknown) => ({
   type: "schema",
   schema: {}
 });
-const createSchemaSwitch = (zodSchema, state) => {
-  var _a;
-  if ((_a = zodSchema._def.openapi) == null ? void 0 : _a.type) {
+const createSchemaSwitch = (zodSchema, previous, state) => {
+  var _a, _b;
+  if ((_b = (_a = zodSchema._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.type) {
     return createManualTypeSchema(zodSchema, state);
   }
   if (isZodType(zodSchema, "ZodString")) {
@@ -1192,7 +1314,7 @@ const createSchemaSwitch = (zodSchema, state) => {
     return createArraySchema(zodSchema, state);
   }
   if (isZodType(zodSchema, "ZodObject")) {
-    return createObjectSchema(zodSchema, state);
+    return createObjectSchema(zodSchema, previous, state);
   }
   if (isZodType(zodSchema, "ZodUnion")) {
     return createUnionSchema(zodSchema, state);
@@ -1213,7 +1335,7 @@ const createSchemaSwitch = (zodSchema, state) => {
     return createReadonlySchema(zodSchema, state);
   }
   if (isZodType(zodSchema, "ZodDefault")) {
-    return createDefaultSchema(zodSchema, state);
+    return createDefaultSchema(zodSchema, state, previous);
   }
   if (isZodType(zodSchema, "ZodRecord")) {
     return createRecordSchema(zodSchema, state);
@@ -1243,7 +1365,7 @@ const createSchemaSwitch = (zodSchema, state) => {
     return createIntersectionSchema(zodSchema, state);
   }
   if (isZodType(zodSchema, "ZodCatch")) {
-    return createCatchSchema(zodSchema, state);
+    return createCatchSchema(zodSchema, state, previous);
   }
   if (isZodType(zodSchema, "ZodUnknown") || isZodType(zodSchema, "ZodAny")) {
     return createUnknownSchema();
@@ -1259,8 +1381,12 @@ const createSchemaSwitch = (zodSchema, state) => {
   }
   return createManualTypeSchema(zodSchema, state);
 };
-const isDescriptionEqual = (schema, zodSchema) => schema.type === "ref" && zodSchema.description === schema.zodType.description;
-const createNewSchema = (zodSchema, state) => {
+const createNewSchema = ({
+  zodSchema,
+  previous,
+  state
+}) => {
+  var _a;
   if (state.visited.has(zodSchema)) {
     throw new Error(
       `The schema at ${state.path.join(
@@ -1277,25 +1403,35 @@ const createNewSchema = (zodSchema, state) => {
     refType,
     unionOneOf,
     ...additionalMetadata
-  } = zodSchema._def.openapi ?? {};
-  const schema = createSchemaSwitch(zodSchema, state);
-  const description = zodSchema.description && !isDescriptionEqual(schema, zodSchema) ? zodSchema.description : void 0;
-  const schemaWithMetadata = enhanceWithMetadata(schema, {
-    ...description && { description },
-    ...additionalMetadata
-  });
+  } = ((_a = zodSchema._def.zodOpenApi) == null ? void 0 : _a.openapi) ?? {};
+  const schema = createSchemaSwitch(zodSchema, previous, state);
+  const schemaWithMetadata = enhanceWithMetadata(
+    schema,
+    additionalMetadata,
+    state,
+    previous
+  );
   state.visited.delete(zodSchema);
   return schemaWithMetadata;
 };
-const createNewRef = (ref, zodSchema, state) => {
+const createNewRef = ({
+  previous,
+  ref,
+  zodSchema,
+  state
+}) => {
   var _a;
   state.components.schemas.set(zodSchema, {
     type: "in-progress",
     ref
   });
-  const newSchema = createNewSchema(zodSchema, {
-    ...state,
-    visited: /* @__PURE__ */ new Set()
+  const newSchema = createNewSchema({
+    zodSchema,
+    previous,
+    state: {
+      ...state,
+      visited: /* @__PURE__ */ new Set()
+    }
   });
   state.components.schemas.set(zodSchema, {
     type: "complete",
@@ -1311,6 +1447,7 @@ const createNewRef = (ref, zodSchema, state) => {
         (_a = state.documentOptions) == null ? void 0 : _a.componentRefPath
       )
     },
+    schemaObject: newSchema.schema,
     effects: newSchema.effects ? [
       {
         type: "component",
@@ -1332,6 +1469,7 @@ const createExistingRef = (zodSchema, component, state) => {
           (_a = state.documentOptions) == null ? void 0 : _a.componentRefPath
         )
       },
+      schemaObject: component.schemaObject,
       effects: component.effects ? [
         {
           type: "component",
@@ -1351,6 +1489,7 @@ const createExistingRef = (zodSchema, component, state) => {
           (_b = state.documentOptions) == null ? void 0 : _b.componentRefPath
         )
       },
+      schemaObject: void 0,
       effects: [
         {
           type: "component",
@@ -1363,22 +1502,30 @@ const createExistingRef = (zodSchema, component, state) => {
   }
   return;
 };
-const createSchemaOrRef = (zodSchema, state) => {
-  var _a;
+const createSchemaOrRef = (zodSchema, state, onlyRef) => {
+  var _a, _b, _c, _d;
   const component = state.components.schemas.get(zodSchema);
   const existingRef = createExistingRef(zodSchema, component, state);
   if (existingRef) {
     return existingRef;
   }
-  const ref = ((_a = zodSchema._def.openapi) == null ? void 0 : _a.ref) ?? (component == null ? void 0 : component.ref);
+  const previous = ((_a = zodSchema._def.zodOpenApi) == null ? void 0 : _a.previous) ? createSchemaOrRef(zodSchema._def.zodOpenApi.previous, state, true) : void 0;
+  const current = ((_b = zodSchema._def.zodOpenApi) == null ? void 0 : _b.current) && zodSchema._def.zodOpenApi.current !== zodSchema ? createSchemaOrRef(zodSchema._def.zodOpenApi.current, state, true) : void 0;
+  const ref = ((_d = (_c = zodSchema._def.zodOpenApi) == null ? void 0 : _c.openapi) == null ? void 0 : _d.ref) ?? (component == null ? void 0 : component.ref);
   if (ref) {
-    return createNewRef(ref, zodSchema, state);
+    return current ? createNewSchema({ zodSchema, previous: current, state }) : createNewRef({ ref, zodSchema, previous, state });
+  }
+  if (onlyRef) {
+    return previous ?? current;
   }
-  return createNewSchema(zodSchema, state);
+  return createNewSchema({ zodSchema, previous: previous ?? current, state });
 };
 const createSchemaObject = (zodSchema, state, subpath) => {
   state.path.push(...subpath);
   const schema = createSchemaOrRef(zodSchema, state);
+  if (!schema) {
+    throw new Error("Schema does not exist");
+  }
   state.path.pop();
   return schema;
 };
@@ -1441,8 +1588,8 @@ const createContent = (contentObject, components, type, subpath, documentOptions
 );
 const createComponentParamRef = (ref) => `#/components/parameters/${ref}`;
 const createBaseParameter = (schema, components, subpath, documentOptions) => {
-  var _a, _b, _c;
-  const { ref, ...rest } = ((_a = schema._def.openapi) == null ? void 0 : _a.param) ?? {};
+  var _a, _b, _c, _d;
+  const { ref, ...rest } = ((_b = (_a = schema._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.param) ?? {};
   const state = {
     components,
     type: "input",
@@ -1451,8 +1598,8 @@ const createBaseParameter = (schema, components, subpath, documentOptions) => {
     documentOptions
   };
   const schemaObject = createSchema(schema, state, [...subpath, "schema"]);
-  const required = !((_b = isOptionalSchema(schema, state)) == null ? void 0 : _b.optional);
-  const description = ((_c = schema._def.openapi) == null ? void 0 : _c.description) ?? schema._def.description;
+  const required = !schema.isOptional();
+  const description = ((_d = (_c = schema._def.zodOpenApi) == null ? void 0 : _c.openapi) == null ? void 0 : _d.description) ?? schema._def.description;
   return {
     ...description && { description },
     ...rest,
@@ -1463,8 +1610,8 @@ const createBaseParameter = (schema, components, subpath, documentOptions) => {
 const createParamOrRef = (zodSchema, components, subpath, type, name, documentOptions) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const component = components.parameters.get(zodSchema);
-  const paramType = ((_c = (_b = (_a = zodSchema._def) == null ? void 0 : _a.openapi) == null ? void 0 : _b.param) == null ? void 0 : _c.in) ?? (component == null ? void 0 : component.in) ?? type;
-  const paramName = ((_f = (_e = (_d = zodSchema._def) == null ? void 0 : _d.openapi) == null ? void 0 : _e.param) == null ? void 0 : _f.name) ?? (component == null ? void 0 : component.name) ?? name;
+  const paramType = ((_c = (_b = (_a = zodSchema._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.param) == null ? void 0 : _c.in) ?? (component == null ? void 0 : component.in) ?? type;
+  const paramName = ((_f = (_e = (_d = zodSchema._def.zodOpenApi) == null ? void 0 : _d.openapi) == null ? void 0 : _e.param) == null ? void 0 : _f.name) ?? (component == null ? void 0 : component.name) ?? name;
   if (!paramType) {
     throw new Error("Parameter type missing");
   }
@@ -1488,7 +1635,7 @@ const createParamOrRef = (zodSchema, components, subpath, type, name, documentOp
   if ("$ref" in baseParamOrRef) {
     throw new Error("Unexpected Error: received a reference object");
   }
-  const ref = ((_i = (_h = (_g = zodSchema == null ? void 0 : zodSchema._def) == null ? void 0 : _g.openapi) == null ? void 0 : _h.param) == null ? void 0 : _i.ref) ?? (component == null ? void 0 : component.ref);
+  const ref = ((_i = (_h = (_g = zodSchema == null ? void 0 : zodSchema._def.zodOpenApi) == null ? void 0 : _g.openapi) == null ? void 0 : _h.param) == null ? void 0 : _i.ref) ?? (component == null ? void 0 : component.ref);
   const paramObject = {
     in: paramType,
     name: paramName,
@@ -1635,7 +1782,7 @@ const createHeaderOrRef = (schema, components, documentOptions) => {
   if ("$ref" in baseHeader) {
     throw new Error("Unexpected Error: received a reference object");
   }
-  const ref = ((_c = (_b = (_a = schema._def) == null ? void 0 : _a.openapi) == null ? void 0 : _b.header) == null ? void 0 : _c.ref) ?? (component == null ? void 0 : component.ref);
+  const ref = ((_c = (_b = (_a = schema._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.header) == null ? void 0 : _c.ref) ?? (component == null ? void 0 : component.ref);
   if (ref) {
     components.headers.set(schema, {
       type: "complete",
@@ -1650,7 +1797,7 @@ const createHeaderOrRef = (schema, components, documentOptions) => {
 };
 const createBaseHeader = (schema, components, documentOptions) => {
   var _a, _b;
-  const { ref, ...rest } = ((_a = schema._def.openapi) == null ? void 0 : _a.header) ?? {};
+  const { ref, ...rest } = ((_b = (_a = schema._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.header) ?? {};
   const state = {
     components,
     type: "output",
@@ -1659,7 +1806,8 @@ const createBaseHeader = (schema, components, documentOptions) => {
     documentOptions
   };
   const schemaObject = createSchema(schema, state, ["header"]);
-  const required = !((_b = isOptionalSchema(schema, state)) == null ? void 0 : _b.optional);
+  const optionalResult = schema.safeParse(void 0);
+  const required = !optionalResult.success || optionalResult !== void 0;
   return {
     ...rest,
     ...schema && { schema: schemaObject },
@@ -1909,14 +2057,14 @@ const getSchemas = (schemas, components) => {
     return;
   }
   Object.entries(schemas).forEach(([key, schema]) => {
-    var _a;
+    var _a, _b;
     if (isAnyZodType(schema)) {
       if (components.schemas.has(schema)) {
         throw new Error(
           `Schema ${JSON.stringify(schema._def)} is already registered`
         );
       }
-      const ref = ((_a = schema._def.openapi) == null ? void 0 : _a.ref) ?? key;
+      const ref = ((_b = (_a = schema._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.ref) ?? key;
       components.schemas.set(schema, {
         type: "manual",
         ref
@@ -1929,16 +2077,16 @@ const getParameters = (parameters, components) => {
     return;
   }
   Object.entries(parameters).forEach(([key, schema]) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     if (isAnyZodType(schema)) {
       if (components.parameters.has(schema)) {
         throw new Error(
           `Parameter ${JSON.stringify(schema._def)} is already registered`
         );
       }
-      const ref = ((_b = (_a = schema._def.openapi) == null ? void 0 : _a.param) == null ? void 0 : _b.ref) ?? key;
-      const name = (_d = (_c = schema._def.openapi) == null ? void 0 : _c.param) == null ? void 0 : _d.name;
-      const location = (_f = (_e = schema._def.openapi) == null ? void 0 : _e.param) == null ? void 0 : _f.in;
+      const ref = ((_c = (_b = (_a = schema._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.param) == null ? void 0 : _c.ref) ?? key;
+      const name = (_f = (_e = (_d = schema._def.zodOpenApi) == null ? void 0 : _d.openapi) == null ? void 0 : _e.param) == null ? void 0 : _f.name;
+      const location = (_i = (_h = (_g = schema._def.zodOpenApi) == null ? void 0 : _g.openapi) == null ? void 0 : _h.param) == null ? void 0 : _i.in;
       if (!name || !location) {
         throw new Error("`name` or `in` missing in .openapi()");
       }
@@ -1956,14 +2104,14 @@ const getHeaders = (responseHeaders, components) => {
     return;
   }
   Object.entries(responseHeaders).forEach(([key, schema]) => {
-    var _a, _b;
+    var _a, _b, _c;
     if (isAnyZodType(schema)) {
       if (components.parameters.has(schema)) {
         throw new Error(
           `Header ${JSON.stringify(schema._def)} is already registered`
         );
       }
-      const ref = ((_b = (_a = schema._def.openapi) == null ? void 0 : _a.param) == null ? void 0 : _b.ref) ?? key;
+      const ref = ((_c = (_b = (_a = schema._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.param) == null ? void 0 : _c.ref) ?? key;
       components.headers.set(schema, {
         type: "manual",
         ref
@@ -2068,11 +2216,11 @@ const createComponents = (componentsObject, components, documentOptions) => {
 };
 const createSchemaComponents = (componentsObject, components, documentOptions) => {
   Array.from(components.schemas).forEach(([schema, { type }], index) => {
-    var _a;
+    var _a, _b;
     if (type === "manual") {
       const state = {
         components,
-        type: ((_a = schema._def.openapi) == null ? void 0 : _a.refType) ?? "output",
+        type: ((_b = (_a = schema._def.zodOpenApi) == null ? void 0 : _a.openapi) == null ? void 0 : _b.refType) ?? "output",
         path: [],
         visited: /* @__PURE__ */ new Set(),
         documentOptions