zod-openapi 3.3.0 → 4.0.0

package/dist/extendZod.chunk.cjs

@@ -1,36 +1,91 @@
 "use strict";
+const mergeOpenApi = (openapi, {
+  ref: _ref,
+  refType: _refType,
+  param: _param,
+  header: _header,
+  ...rest
+} = {}) => ({
+  ...rest,
+  ...openapi
+});
 function extendZodWithOpenApi(zod) {
   if (typeof zod.ZodType.prototype.openapi !== "undefined") {
     return;
   }
   zod.ZodType.prototype.openapi = function(openapi) {
+    const { zodOpenApi, ...rest } = this._def;
     const result = new this.constructor({
-      ...this._def,
-      openapi
+      ...rest,
+      zodOpenApi: {
+        openapi: mergeOpenApi(
+          openapi,
+          zodOpenApi == null ? void 0 : zodOpenApi.openapi
+        )
+      }
     });
+    result._def.zodOpenApi.current = result;
+    if (zodOpenApi) {
+      result._def.zodOpenApi.previous = this;
+    }
+    return result;
+  };
+  const zodDescribe = zod.ZodType.prototype.describe;
+  zod.ZodType.prototype.describe = function(...args) {
+    const result = zodDescribe.apply(this, args);
+    const def = result._def;
+    if (def.zodOpenApi) {
+      const cloned = { ...def.zodOpenApi };
+      cloned.openapi = mergeOpenApi({ description: args[0] }, cloned.openapi);
+      cloned.previous = this;
+      cloned.current = result;
+      def.zodOpenApi = cloned;
+    } else {
+      def.zodOpenApi = {
+        openapi: { description: args[0] },
+        current: result
+      };
+    }
     return result;
   };
   const zodObjectExtend = zod.ZodObject.prototype.extend;
   zod.ZodObject.prototype.extend = function(...args) {
     const extendResult = zodObjectExtend.apply(this, args);
-    extendResult._def.extendMetadata = {
-      extends: this
-    };
-    delete extendResult._def.openapi;
+    const zodOpenApi = extendResult._def.zodOpenApi;
+    if (zodOpenApi) {
+      const cloned = { ...zodOpenApi };
+      cloned.openapi = mergeOpenApi({}, cloned.openapi);
+      cloned.previous = this;
+      extendResult._def.zodOpenApi = cloned;
+    } else {
+      extendResult._def.zodOpenApi = {
+        previous: this
+      };
+    }
     return extendResult;
   };
   const zodObjectOmit = zod.ZodObject.prototype.omit;
   zod.ZodObject.prototype.omit = function(...args) {
     const omitResult = zodObjectOmit.apply(this, args);
-    delete omitResult._def.extendMetadata;
-    delete omitResult._def.openapi;
+    const zodOpenApi = omitResult._def.zodOpenApi;
+    if (zodOpenApi) {
+      const cloned = { ...zodOpenApi };
+      cloned.openapi = mergeOpenApi({}, cloned.openapi);
+      delete cloned.previous;
+      omitResult._def.zodOpenApi = cloned;
+    }
     return omitResult;
   };
   const zodObjectPick = zod.ZodObject.prototype.pick;
   zod.ZodObject.prototype.pick = function(...args) {
     const pickResult = zodObjectPick.apply(this, args);
-    delete pickResult._def.extendMetadata;
-    delete pickResult._def.openapi;
+    const zodOpenApi = pickResult._def.zodOpenApi;
+    if (zodOpenApi) {
+      const cloned = { ...zodOpenApi };
+      cloned.openapi = mergeOpenApi({}, cloned.openapi);
+      delete cloned.previous;
+      pickResult._def.zodOpenApi = cloned;
+    }
     return pickResult;
   };
 }

package/dist/extendZod.chunk.mjs

@@ -1,35 +1,90 @@
+const mergeOpenApi = (openapi, {
+  ref: _ref,
+  refType: _refType,
+  param: _param,
+  header: _header,
+  ...rest
+} = {}) => ({
+  ...rest,
+  ...openapi
+});
 function extendZodWithOpenApi(zod) {
   if (typeof zod.ZodType.prototype.openapi !== "undefined") {
     return;
   }
   zod.ZodType.prototype.openapi = function(openapi) {
+    const { zodOpenApi, ...rest } = this._def;
     const result = new this.constructor({
-      ...this._def,
-      openapi
+      ...rest,
+      zodOpenApi: {
+        openapi: mergeOpenApi(
+          openapi,
+          zodOpenApi == null ? void 0 : zodOpenApi.openapi
+        )
+      }
     });
+    result._def.zodOpenApi.current = result;
+    if (zodOpenApi) {
+      result._def.zodOpenApi.previous = this;
+    }
+    return result;
+  };
+  const zodDescribe = zod.ZodType.prototype.describe;
+  zod.ZodType.prototype.describe = function(...args) {
+    const result = zodDescribe.apply(this, args);
+    const def = result._def;
+    if (def.zodOpenApi) {
+      const cloned = { ...def.zodOpenApi };
+      cloned.openapi = mergeOpenApi({ description: args[0] }, cloned.openapi);
+      cloned.previous = this;
+      cloned.current = result;
+      def.zodOpenApi = cloned;
+    } else {
+      def.zodOpenApi = {
+        openapi: { description: args[0] },
+        current: result
+      };
+    }
     return result;
   };
   const zodObjectExtend = zod.ZodObject.prototype.extend;
   zod.ZodObject.prototype.extend = function(...args) {
     const extendResult = zodObjectExtend.apply(this, args);
-    extendResult._def.extendMetadata = {
-      extends: this
-    };
-    delete extendResult._def.openapi;
+    const zodOpenApi = extendResult._def.zodOpenApi;
+    if (zodOpenApi) {
+      const cloned = { ...zodOpenApi };
+      cloned.openapi = mergeOpenApi({}, cloned.openapi);
+      cloned.previous = this;
+      extendResult._def.zodOpenApi = cloned;
+    } else {
+      extendResult._def.zodOpenApi = {
+        previous: this
+      };
+    }
     return extendResult;
   };
   const zodObjectOmit = zod.ZodObject.prototype.omit;
   zod.ZodObject.prototype.omit = function(...args) {
     const omitResult = zodObjectOmit.apply(this, args);
-    delete omitResult._def.extendMetadata;
-    delete omitResult._def.openapi;
+    const zodOpenApi = omitResult._def.zodOpenApi;
+    if (zodOpenApi) {
+      const cloned = { ...zodOpenApi };
+      cloned.openapi = mergeOpenApi({}, cloned.openapi);
+      delete cloned.previous;
+      omitResult._def.zodOpenApi = cloned;
+    }
     return omitResult;
   };
   const zodObjectPick = zod.ZodObject.prototype.pick;
   zod.ZodObject.prototype.pick = function(...args) {
     const pickResult = zodObjectPick.apply(this, args);
-    delete pickResult._def.extendMetadata;
-    delete pickResult._def.openapi;
+    const zodOpenApi = pickResult._def.zodOpenApi;
+    if (zodOpenApi) {
+      const cloned = { ...zodOpenApi };
+      cloned.openapi = mergeOpenApi({}, cloned.openapi);
+      delete cloned.previous;
+      pickResult._def.zodOpenApi = cloned;
+    }
     return pickResult;
   };
 }

package/dist/extendZodTypes.d.ts

@@ -25,6 +25,7 @@ interface ZodOpenApiMetadata<T extends ZodTypeAny, TInferred = z.input<T> | z.ou
     refType?: CreationType;
     /**
      * Used to set the created type of an effect.
+     * If this was previously set to `same` and this is throwing an error, your effect is no longer returning the same type.
      */
     effectType?: CreationType | (z.input<T> extends z.output<T> ? z.output<T> extends z.input<T> ? 'same' : never : never);
     /**
@@ -54,6 +55,21 @@ interface ZodOpenApiMetadata<T extends ZodTypeAny, TInferred = z.input<T> | z.ou
      */
     type?: SchemaObject['type'];
 }
+interface ZodOpenApiMetadataDef {
+    /**
+     * Up to date OpenAPI metadata
+     */
+    openapi?: ZodOpenApiMetadata<ZodTypeAny>;
+    /**
+     * Used to keep track of the Zod Schema had `.openapi` called on it
+     */
+    current?: ZodTypeAny;
+    /**
+     * Used to keep track of the previous Zod Schema that had `.openapi` called on it if another `.openapi` is called.
+     * This can also be present when .extend is called on an object.
+     */
+    previous?: ZodTypeAny;
+}
 interface ZodOpenApiExtendMetadata {
     extends: ZodObject<any, any, any, any, any>;
 }
@@ -65,10 +81,7 @@ declare module 'zod' {
         openapi<T extends ZodTypeAny>(this: T, metadata: ZodOpenApiMetadata<T>): T;
     }
     interface ZodTypeDef {
-        /**
-         * OpenAPI metadata
-         */
-        openapi?: ZodOpenApiMetadata<ZodTypeAny>;
+        zodOpenApi?: ZodOpenApiMetadataDef;
     }
     interface ZodObjectDef {
         extendMetadata?: ZodOpenApiExtendMetadata;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod-openapi",
-  "version": "3.3.0",
+  "version": "4.0.0",
   "description": "Convert Zod Schemas to OpenAPI v3.x documentation",
   "keywords": [
     "typescript",