@kubb/plugin-zod 3.16.1 → 3.16.3

package/dist/utils.cjs

@@ -1,4 +0,0 @@
-'use strict';
-
-//# sourceMappingURL=utils.cjs.map
-//# sourceMappingURL=utils.cjs.map

package/dist/utils.d.cts

@@ -1,34 +1,28 @@
-import { z } from 'zod';
+import { z } from "zod";
 
-/**
- * See https://github.com/colinhacks/tozod/blob/master/src/index.ts
- * Adapted based on https://github.com/colinhacks/zod/issues/372
- */
+//#region src/utils/ToZod.d.ts
 
 type isAny<T> = [any extends T ? 'true' : 'false'] extends ['true'] ? true : false;
 type nonoptional<T> = T extends undefined ? never : T;
 type nonnullable<T> = T extends null ? never : T;
 type equals<X, Y> = [X] extends [Y] ? ([Y] extends [X] ? true : false) : false;
 type zodKey<T> = isAny<T> extends true ? 'any' : equals<T, boolean> extends true ? 'boolean' : [undefined] extends [T] ? 'optional' : [null] extends [T] ? 'nullable' : T extends any[] ? 'array' : equals<T, string> extends true ? 'string' : equals<T, bigint> extends true ? 'bigint' : equals<T, number> extends true ? 'number' : equals<T, Date> extends true ? 'date' : T extends {
-    [k: string]: any;
+  [k: string]: any;
 } ? 'object' : 'rest';
 type ToZod<T> = {
-    any: z.ZodAny;
-    optional: z.ZodOptional<ToZod<nonoptional<T>>>;
-    nullable: z.ZodNullable<ToZod<nonnullable<T>>>;
-    array: T extends Array<infer U> ? z.ZodArray<ToZod<U>> : never;
-    string: z.ZodString;
-    bigint: z.ZodBigInt;
-    number: z.ZodNumber;
-    boolean: z.ZodBoolean;
-    date: z.ZodDate;
-    object: z.ZodObject<{
-        [K in keyof T]: T[K];
-    }, 'passthrough', unknown, T>;
-    rest: z.ZodType<T>;
+  any: z.ZodAny;
+  optional: z.ZodOptional<ToZod<nonoptional<T>>>;
+  nullable: z.ZodNullable<ToZod<nonnullable<T>>>;
+  array: T extends Array<infer U> ? z.ZodArray<ToZod<U>> : never;
+  string: z.ZodString;
+  bigint: z.ZodBigInt;
+  number: z.ZodNumber;
+  boolean: z.ZodBoolean;
+  date: z.ZodDate;
+  object: z.ZodObject<{ [K in keyof T]: T[K] }, 'passthrough', unknown, T>;
+  rest: z.ZodType<T>;
 }[zodKey<T>];
-type ZodShape<T> = {
-    [key in keyof T]-?: ToZod<T[key]>;
-};
-
-export type { ToZod, ZodShape };
+type ZodShape<T> = { [key in keyof T]-?: ToZod<T[key]> };
+//#endregion
+export { type ToZod, type ZodShape };
+//# sourceMappingURL=utils.d.cts.map

package/dist/utils.d.ts

@@ -1,34 +1,28 @@
-import { z } from 'zod';
+import { z } from "zod";
 
-/**
- * See https://github.com/colinhacks/tozod/blob/master/src/index.ts
- * Adapted based on https://github.com/colinhacks/zod/issues/372
- */
+//#region src/utils/ToZod.d.ts
 
 type isAny<T> = [any extends T ? 'true' : 'false'] extends ['true'] ? true : false;
 type nonoptional<T> = T extends undefined ? never : T;
 type nonnullable<T> = T extends null ? never : T;
 type equals<X, Y> = [X] extends [Y] ? ([Y] extends [X] ? true : false) : false;
 type zodKey<T> = isAny<T> extends true ? 'any' : equals<T, boolean> extends true ? 'boolean' : [undefined] extends [T] ? 'optional' : [null] extends [T] ? 'nullable' : T extends any[] ? 'array' : equals<T, string> extends true ? 'string' : equals<T, bigint> extends true ? 'bigint' : equals<T, number> extends true ? 'number' : equals<T, Date> extends true ? 'date' : T extends {
-    [k: string]: any;
+  [k: string]: any;
 } ? 'object' : 'rest';
 type ToZod<T> = {
-    any: z.ZodAny;
-    optional: z.ZodOptional<ToZod<nonoptional<T>>>;
-    nullable: z.ZodNullable<ToZod<nonnullable<T>>>;
-    array: T extends Array<infer U> ? z.ZodArray<ToZod<U>> : never;
-    string: z.ZodString;
-    bigint: z.ZodBigInt;
-    number: z.ZodNumber;
-    boolean: z.ZodBoolean;
-    date: z.ZodDate;
-    object: z.ZodObject<{
-        [K in keyof T]: T[K];
-    }, 'passthrough', unknown, T>;
-    rest: z.ZodType<T>;
+  any: z.ZodAny;
+  optional: z.ZodOptional<ToZod<nonoptional<T>>>;
+  nullable: z.ZodNullable<ToZod<nonnullable<T>>>;
+  array: T extends Array<infer U> ? z.ZodArray<ToZod<U>> : never;
+  string: z.ZodString;
+  bigint: z.ZodBigInt;
+  number: z.ZodNumber;
+  boolean: z.ZodBoolean;
+  date: z.ZodDate;
+  object: z.ZodObject<{ [K in keyof T]: T[K] }, 'passthrough', unknown, T>;
+  rest: z.ZodType<T>;
 }[zodKey<T>];
-type ZodShape<T> = {
-    [key in keyof T]-?: ToZod<T[key]>;
-};
-
-export type { ToZod, ZodShape };
+type ZodShape<T> = { [key in keyof T]-?: ToZod<T[key]> };
+//#endregion
+export { type ToZod, type ZodShape };
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -1,3 +1 @@
-
-//# sourceMappingURL=utils.js.map
-//# sourceMappingURL=utils.js.map
+export {  };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-zod",
-  "version": "3.16.1",
+  "version": "3.16.3",
   "description": "Zod schema generator plugin for Kubb, creating type-safe validation schemas from OpenAPI specifications for runtime data validation.",
   "keywords": [
     "zod",
@@ -27,30 +27,25 @@
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs",
-      "default": "./dist/index.cjs"
-    },
-    "./generators": {
-      "import": "./dist/generators.js",
-      "require": "./dist/generators.cjs",
-      "default": "./dist/generators.cjs"
+      "require": "./dist/index.cjs"
     },
     "./components": {
       "import": "./dist/components.js",
-      "require": "./dist/components.cjs",
-      "default": "./dist/components.cjs"
+      "require": "./dist/components.cjs"
+    },
+    "./generators": {
+      "import": "./dist/generators.js",
+      "require": "./dist/generators.cjs"
     },
     "./utils": {
       "import": "./dist/utils.js",
-      "require": "./dist/utils.cjs",
-      "default": "./dist/utils.cjs"
+      "require": "./dist/utils.cjs"
     },
-    "./package.json": "./package.json",
-    "./*": "./*"
+    "./package.json": "./package.json"
   },
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.cts",
   "typesVersions": {
     "*": {
       "components": [
@@ -71,21 +66,20 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
-    "@kubb/core": "3.16.1",
-    "@kubb/oas": "3.16.1",
-    "@kubb/parser-ts": "3.16.1",
-    "@kubb/plugin-ts": "3.16.1",
-    "@kubb/plugin-oas": "3.16.1",
-    "@kubb/react": "3.16.1"
+    "@kubb/core": "3.16.3",
+    "@kubb/oas": "3.16.3",
+    "@kubb/parser-ts": "3.16.3",
+    "@kubb/plugin-oas": "3.16.3",
+    "@kubb/plugin-ts": "3.16.3",
+    "@kubb/react": "3.16.3"
   },
   "devDependencies": {
     "@asteasolutions/zod-to-openapi": "^7.3.4",
     "@hono/zod-openapi": "0.19.2",
-    "tsup": "^8.5.0",
+    "tsdown": "^0.14.1",
     "zod": "~3.24.4",
-    "@kubb/config-ts": "3.16.1",
-    "@kubb/config-tsup": "3.16.1",
-    "@kubb/plugin-oas": "3.16.1"
+    "@kubb/config-ts": "3.16.3",
+    "@kubb/plugin-oas": "3.16.3"
   },
   "peerDependencies": {
     "@kubb/react": "^3.0.0"
@@ -98,13 +92,13 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "tsup",
+    "build": "tsdown",
     "clean": "npx rimraf ./dist",
     "lint": "bun biome lint .",
-    "lint:fix": "bun biome lint--fix --unsafe .",
+    "lint:fix": "bun biome lint --fix --unsafe .",
     "release": "pnpm publish --no-git-check",
     "release:canary": "bash ../../.github/canary.sh && node ../../scripts/build.js canary && pnpm publish --no-git-check",
-    "start": "tsup --watch",
+    "start": "tsdown --watch",
     "test": "vitest --passWithNoTests",
     "typecheck": "tsc -p ./tsconfig.json --noEmit --emitDeclarationOnly false"
   }

package/src/components/Zod.tsx

@@ -1,6 +1,6 @@
 import transformers from '@kubb/core/transformers'
 import type { SchemaObject } from '@kubb/oas'
-import { isKeyword, type Schema, schemaKeywords } from '@kubb/plugin-oas'
+import { isKeyword, type Schema, SchemaGenerator, schemaKeywords } from '@kubb/plugin-oas'
 import { Const, File, Type } from '@kubb/react'
 import * as parserZod from '../parser.ts'
 import type { PluginZod } from '../types.ts'
@@ -34,7 +34,8 @@ export function Zod({
   version,
   emptySchemaType,
 }: Props) {
-  const hasTuple = tree.some((item) => isKeyword(item, schemaKeywords.tuple))
+  const hasTuple = !!SchemaGenerator.deepSearch(tree, schemaKeywords.tuple)
+
   const schemas = parserZod.sort(tree).filter((item) => {
     if (hasTuple && (isKeyword(item, schemaKeywords.min) || isKeyword(item, schemaKeywords.max))) {
       return false

package/src/parser.ts

@@ -223,6 +223,14 @@ type ParserOptions = {
 export function parse({ parent, current, name, siblings }: SchemaTree, options: ParserOptions): string | undefined {
   const value = zodKeywordMapper[current.keyword as keyof typeof zodKeywordMapper]
 
+  // Early exit: if siblings contain both matches and ref → skip matches entirely
+  const hasMatches = siblings.some((it) => isKeyword(it, schemaKeywords.matches))
+  const hasRef = siblings.some((it) => isKeyword(it, schemaKeywords.ref))
+
+  if (hasMatches && hasRef && isKeyword(current, schemaKeywords.matches)) {
+    return undefined // strip matches
+  }
+
   if (!value) {
     return undefined
   }