Merge pull request #1728 from georgesmith46/fix/zod-pattern-escape

Author: mrlubos

.changeset/twenty-dryers-fly.md

@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: correctly generate zod regex expressions when using patterns

packages/openapi-ts/src/plugins/zod/plugin.ts

@@ -527,21 +527,12 @@ const stringTypeToZodSchema = ({
   }
 
   if (schema.pattern) {
-    const text = schema.pattern
-      .replace(/\\/g, '\\\\') // backslashes
-      .replace(/\n/g, '\\n') // newlines
-      .replace(/\r/g, '\\r') // carriage returns
-      .replace(/\t/g, '\\t') // tabs
-      .replace(/\f/g, '\\f') // form feeds
-      .replace(/\v/g, '\\v') // vertical tabs
-      .replace(/'/g, "\\'") // single quotes
-      .replace(/"/g, '\\"'); // double quotes
     stringExpression = compiler.callExpression({
       functionName: compiler.propertyAccessExpression({
         expression: stringExpression,
         name: regexIdentifier,
       }),
-      parameters: [compiler.regularExpressionLiteral({ text })],
+      parameters: [compiler.regularExpressionLiteral({ text: schema.pattern })],
     });
   }
 

packages/openapi-ts/test/__snapshots__/2.0.x/plugins/@hey-api/schemas/default/schemas.gen.ts

@@ -604,8 +604,7 @@ export const ModelWithPatternSchema = {
         },
         patternWithNewline: {
             type: 'string',
-            pattern: `aaa
-bbb`
+            pattern: 'aaa\\nbbb'
         },
         patternWithBacktick: {
             type: 'string',

packages/openapi-ts/test/__snapshots__/2.0.x/plugins/zod/default/zod.gen.ts

@@ -227,9 +227,9 @@ export const zModelWithPattern = z.object({
     name: z.string().max(255),
     enabled: z.boolean().readonly().optional(),
     modified: z.string().datetime().readonly().optional(),
-    id: z.string().regex(/^\\d{2}-\\d{3}-\\d{4}$/).optional(),
-    text: z.string().regex(/^\\w+$/).optional(),
-    patternWithSingleQuotes: z.string().regex(/^[a-zA-Z0-9\']*$/).optional(),
+    id: z.string().regex(/^\d{2}-\d{3}-\d{4}$/).optional(),
+    text: z.string().regex(/^\w+$/).optional(),
+    patternWithSingleQuotes: z.string().regex(/^[a-zA-Z0-9']*$/).optional(),
     patternWithNewline: z.string().regex(/aaa\nbbb/).optional(),
     patternWithBacktick: z.string().regex(/aaa`bbb/).optional()
 });

packages/openapi-ts/test/__snapshots__/3.0.x/plugins/@hey-api/schemas/default/schemas.gen.ts

@@ -1204,8 +1204,7 @@ export const ModelWithPatternSchema = {
         },
         patternWithNewline: {
             type: 'string',
-            pattern: `aaa
-bbb`
+            pattern: 'aaa\\nbbb'
         },
         patternWithBacktick: {
             type: 'string',

packages/openapi-ts/test/__snapshots__/3.0.x/plugins/zod/default/zod.gen.ts

@@ -462,9 +462,9 @@ export const zModelWithPattern = z.object({
     name: z.string().max(255),
     enabled: z.boolean().readonly().optional(),
     modified: z.string().datetime().readonly().optional(),
-    id: z.string().regex(/^\\d{2}-\\d{3}-\\d{4}$/).optional(),
-    text: z.string().regex(/^\\w+$/).optional(),
-    patternWithSingleQuotes: z.string().regex(/^[a-zA-Z0-9\']*$/).optional(),
+    id: z.string().regex(/^\d{2}-\d{3}-\d{4}$/).optional(),
+    text: z.string().regex(/^\w+$/).optional(),
+    patternWithSingleQuotes: z.string().regex(/^[a-zA-Z0-9']*$/).optional(),
     patternWithNewline: z.string().regex(/aaa\nbbb/).optional(),
     patternWithBacktick: z.string().regex(/aaa`bbb/).optional()
 });

packages/openapi-ts/test/__snapshots__/3.0.x/validators/zod.gen.ts

@@ -4,7 +4,7 @@ import { z } from 'zod';
 
 export const zFoo: z.ZodTypeAny = z.union([
     z.object({
-        foo: z.string().regex(/^\\d{3}-\\d{2}-\\d{4}$/).optional(),
+        foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/).optional(),
         bar: z.object({
             foo: z.lazy(() => {
                 return zFoo;

packages/openapi-ts/test/__snapshots__/3.1.x/plugins/@hey-api/schemas/default/schemas.gen.ts

@@ -1194,8 +1194,7 @@ export const ModelWithPatternSchema = {
         },
         patternWithNewline: {
             type: 'string',
-            pattern: `aaa
-bbb`
+            pattern: 'aaa\\nbbb'
         },
         patternWithBacktick: {
             type: 'string',

packages/openapi-ts/test/__snapshots__/3.1.x/plugins/zod/default/zod.gen.ts

@@ -457,9 +457,9 @@ export const zModelWithPattern = z.object({
     name: z.string().max(255),
     enabled: z.boolean().readonly().optional(),
     modified: z.string().datetime().readonly().optional(),
-    id: z.string().regex(/^\\d{2}-\\d{3}-\\d{4}$/).optional(),
-    text: z.string().regex(/^\\w+$/).optional(),
-    patternWithSingleQuotes: z.string().regex(/^[a-zA-Z0-9\']*$/).optional(),
+    id: z.string().regex(/^\d{2}-\d{3}-\d{4}$/).optional(),
+    text: z.string().regex(/^\w+$/).optional(),
+    patternWithSingleQuotes: z.string().regex(/^[a-zA-Z0-9']*$/).optional(),
     patternWithNewline: z.string().regex(/aaa\nbbb/).optional(),
     patternWithBacktick: z.string().regex(/aaa`bbb/).optional()
 });

packages/openapi-ts/test/__snapshots__/3.1.x/validators/zod.gen.ts

@@ -4,7 +4,7 @@ import { z } from 'zod';
 
 export const zFoo: z.ZodTypeAny = z.union([
     z.object({
-        foo: z.string().regex(/^\\d{3}-\\d{2}-\\d{4}$/).optional(),
+        foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/).optional(),
         bar: z.object({
             foo: z.lazy(() => {
                 return zFoo;