Merge pull request #2692 from hey-api/copilot/fix-4811abf9-2ebf-43bc-b1cd-2fde0f579207

Author: mrlubos

.changeset/lazy-ties-cross.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+fix(validators): escaping slashes in regular expressions

packages/openapi-ts/src/tsc/__tests__/types.test.ts

@@ -0,0 +1,76 @@
+import { describe, expect, it } from 'vitest';
+
+import { createRegularExpressionLiteral } from '../types';
+
+describe('createRegularExpressionLiteral', () => {
+  it('should escape forward slashes in regex patterns', () => {
+    const result = createRegularExpressionLiteral({
+      text: '^data:image/svg\\+xml;base64,[A-Za-z0-9+/]+=*$',
+    });
+
+    expect(result.text).toBe(
+      '/^data:image\\/svg\\+xml;base64,[A-Za-z0-9+\\/]+=*$/',
+    );
+  });
+
+  it('should handle patterns without forward slashes', () => {
+    const result = createRegularExpressionLiteral({
+      text: '^[a-zA-Z0-9_]*$',
+    });
+
+    expect(result.text).toBe('/^[a-zA-Z0-9_]*$/');
+  });
+
+  it('should handle patterns that already have slashes at start and end', () => {
+    const result = createRegularExpressionLiteral({
+      text: '/^[a-zA-Z0-9_]*$/',
+    });
+
+    expect(result.text).toBe('/^[a-zA-Z0-9_]*$/');
+  });
+
+  it('should handle patterns with slashes at start/end and internal slashes', () => {
+    const result = createRegularExpressionLiteral({
+      text: '/^data:image/svg\\+xml;base64,[A-Za-z0-9+/]+=*$/',
+    });
+
+    expect(result.text).toBe(
+      '/^data:image\\/svg\\+xml;base64,[A-Za-z0-9+\\/]+=*$/',
+    );
+  });
+
+  it('should preserve flags', () => {
+    const result = createRegularExpressionLiteral({
+      flags: ['g', 'i'],
+      text: '^[a-zA-Z]*$',
+    });
+
+    expect(result.text).toBe('/^[a-zA-Z]*$/gi');
+  });
+
+  it('should handle patterns with multiple forward slashes', () => {
+    const result = createRegularExpressionLiteral({
+      text: '^path/to/file/name$',
+    });
+
+    expect(result.text).toBe('/^path\\/to\\/file\\/name$/');
+  });
+
+  it('should handle empty pattern', () => {
+    const result = createRegularExpressionLiteral({
+      text: '',
+    });
+
+    expect(result.text).toBe('//');
+  });
+
+  it('should handle patterns with already correctly escaped slashes', () => {
+    const result = createRegularExpressionLiteral({
+      text: '^data:image\\/svg\\+xml;base64,[A-Za-z0-9+\\/]+=*$',
+    });
+
+    expect(result.text).toBe(
+      '/^data:image\\/svg\\+xml;base64,[A-Za-z0-9+\\/]+=*$/',
+    );
+  });
+});

packages/openapi-ts/src/tsc/types.ts

@@ -1080,8 +1080,16 @@ export const createRegularExpressionLiteral = ({
   flags?: ReadonlyArray<'g' | 'i' | 'm' | 's' | 'u' | 'y'>;
   text: string;
 }) => {
-  const textWithSlashes =
-    text.startsWith('/') && text.endsWith('/') ? text : `/${text}/`;
+  // Extract pattern content, removing outer slashes if present
+  const patternContent =
+    text.startsWith('/') && text.endsWith('/') ? text.slice(1, -1) : text;
+
+  // Escape forward slashes in the pattern content, but only if they're not already escaped
+  const escapedPattern = patternContent.replace(/(?<!\\)\//g, '\\/');
+
+  // Wrap with forward slashes
+  const textWithSlashes = `/${escapedPattern}/`;
+
   return ts.factory.createRegularExpressionLiteral(
     `${textWithSlashes}${flags.join('')}`,
   );