Skip to content

Commit 66bc2b7

Browse files
pullfrog[bot]mrlubos
authored andcommitted
feat: support x-pattern-message extension in Zod and Valibot validator plugins
1 parent ee11962 commit 66bc2b7

12 files changed

Lines changed: 25 additions & 12 deletions

File tree

‎packages/openapi-ts-tests/valibot/v1/__snapshots__/3.0.x/validators/valibot.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as v from 'valibot';
55
export const vBaz = v.optional(v.pipe(v.pipe(v.string(), v.regex(/foo\nbar/)), v.readonly()), 'baz');
66

77
export const vFoo: v.GenericSchema = v.nullish(v.object({
8-
foo: v.optional(v.pipe(v.string(), v.regex(/^\d{3}-\d{2}-\d{4}$/))),
8+
foo: v.optional(v.pipe(v.string(), v.regex(/^\d{3}-\d{2}-\d{4}$/, 'Must be a valid SSN format (###-##-####)'))),
99
bar: v.optional(v.lazy(() => vBar)),
1010
baz: v.optional(v.array(v.lazy(() => vFoo))),
1111
qux: v.optional(v.pipe(v.number(), v.integer(), v.gtValue(0)), 0)

‎packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/validators/zod.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as z from 'zod/v4-mini';
55
export const zBaz = z._default(z.readonly(z.string().check(z.regex(/foo\nbar/))), 'baz');
66

77
export const zFoo = z._default(z.nullable(z.object({
8-
foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/))),
8+
foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/, 'Must be a valid SSN format (###-##-####)'))),
99
bar: z.optional(z.lazy((): any => zBar)),
1010
baz: z.optional(z.array(z.lazy((): any => zFoo))),
1111
qux: z._default(z.optional(z.int().check(z.gt(0))), 0)

‎packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v3/validators/zod.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { z } from 'zod';
55
export const zBaz = z.string().regex(/foo\nbar/).readonly().default('baz');
66

77
export const zFoo: z.ZodTypeAny = z.object({
8-
foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/).optional(),
8+
foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/, 'Must be a valid SSN format (###-##-####)').optional(),
99
bar: z.lazy(() => zBar).optional(),
1010
baz: z.array(z.lazy(() => zFoo)).optional(),
1111
qux: z.number().int().gt(0).optional().default(0)

‎packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/validators/zod.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as z from 'zod/v4';
55
export const zBaz = z.string().regex(/foo\nbar/).readonly().default('baz');
66

77
export const zFoo = z.object({
8-
foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/).optional(),
8+
foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/, 'Must be a valid SSN format (###-##-####)').optional(),
99
bar: z.lazy((): any => zBar).optional(),
1010
baz: z.array(z.lazy((): any => zFoo)).optional(),
1111
qux: z.int().gt(0).optional().default(0)

‎packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/validators/zod.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as z from 'zod/mini';
55
export const zBaz = z._default(z.readonly(z.string().check(z.regex(/foo\nbar/))), 'baz');
66

77
export const zFoo = z._default(z.nullable(z.object({
8-
foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/))),
8+
foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/, 'Must be a valid SSN format (###-##-####)'))),
99
bar: z.optional(z.lazy((): any => zBar)),
1010
baz: z.optional(z.array(z.lazy((): any => zFoo))),
1111
qux: z._default(z.optional(z.int().check(z.gt(0))), 0)

‎packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/validators/zod.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { z } from 'zod/v3';
55
export const zBaz = z.string().regex(/foo\nbar/).readonly().default('baz');
66

77
export const zFoo: z.ZodTypeAny = z.object({
8-
foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/).optional(),
8+
foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/, 'Must be a valid SSN format (###-##-####)').optional(),
99
bar: z.lazy(() => zBar).optional(),
1010
baz: z.array(z.lazy(() => zFoo)).optional(),
1111
qux: z.number().int().gt(0).optional().default(0)

‎packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/validators/zod.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as z from 'zod';
55
export const zBaz = z.string().regex(/foo\nbar/).readonly().default('baz');
66

77
export const zFoo = z.object({
8-
foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/).optional(),
8+
foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/, 'Must be a valid SSN format (###-##-####)').optional(),
99
bar: z.lazy((): any => zBar).optional(),
1010
baz: z.array(z.lazy((): any => zFoo)).optional(),
1111
qux: z.int().gt(0).optional().default(0)

‎packages/openapi-ts/src/plugins/valibot/v1/toAst/string.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ function patternNode(ctx: StringResolverContext): PipeResult {
6969
const { v } = ctx.plugin.imports;
7070
if (!schema.pattern) return;
7171
const flags = /\\[pP]\{/.test(schema.pattern) ? 'u' : undefined;
72-
return $(v).attr(identifiers.actions.regex).call($.regexp(schema.pattern, flags));
72+
const message = schema['x-pattern-message'];
73+
return $(v)
74+
.attr(identifiers.actions.regex)
75+
.call($.regexp(schema.pattern, flags), ...(message ? [$.literal(message as string)] : []));
7376
}
7477

7578
function stringResolver(ctx: StringResolverContext): Pipes {

‎packages/openapi-ts/src/plugins/zod/mini/toAst/string.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ function patternNode(ctx: StringResolverContext): ChainResult {
7979
const { z } = ctx.plugin.imports;
8080
if (!schema.pattern) return;
8181
const flags = /\\[pP]\{/.test(schema.pattern) ? 'u' : undefined;
82-
return $(z).attr(identifiers.regex).call($.regexp(schema.pattern, flags));
82+
const message = schema['x-pattern-message'];
83+
return $(z)
84+
.attr(identifiers.regex)
85+
.call($.regexp(schema.pattern, flags), ...(message ? [$.literal(message as string)] : []));
8386
}
8487

8588
function stringResolver(ctx: StringResolverContext): Chain {

‎packages/openapi-ts/src/plugins/zod/v3/toAst/string.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ function patternNode(ctx: StringResolverContext): ChainResult {
6868
const { chain, schema } = ctx;
6969
if (!schema.pattern) return;
7070
const flags = /\\[pP]\{/.test(schema.pattern) ? 'u' : undefined;
71-
return chain.current.attr(identifiers.regex).call($.regexp(schema.pattern, flags));
71+
const message = schema['x-pattern-message'];
72+
return chain.current
73+
.attr(identifiers.regex)
74+
.call($.regexp(schema.pattern, flags), ...(message ? [$.literal(message as string)] : []));
7275
}
7376

7477
function stringResolver(ctx: StringResolverContext): Chain {

0 commit comments

Comments
 (0)