Regex check fix

Author: monikaboz

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./dist/index.js",
   "bin": {
     "openapi-codegen": "./dist/sh.js"

src/generators/core/zod/getZodChain.ts

@@ -1,6 +1,6 @@
 import { OpenAPIV3 } from "openapi-types";
 import { GenerateOptions } from "src/generators/types/options";
-import { unwrapQuotesIfNeeded } from "src/generators/utils/openapi.utils";
+import { escapeControlCharacters, unwrapQuotesIfNeeded } from "src/generators/utils/openapi.utils";
 import { match } from "ts-pattern";
 import { ZodSchemaMetaData } from "./ZodSchema.class";
 
@@ -88,9 +88,23 @@ function getZodChainableStringValidations(schema: OpenAPIV3.SchemaObject) {
     }
   }
 
+  if (schema.pattern) {
+    validations.push(`regex(${formatPatternIfNeeded(schema.pattern)})`);
+  }
+
   return validations.join(".");
 }
 
+function formatPatternIfNeeded(pattern: string) {
+  if (pattern.startsWith("/") && pattern.endsWith("/")) {
+    pattern = pattern.slice(1, -1);
+  }
+
+  pattern = escapeControlCharacters(pattern);
+
+  return `/${pattern}/`;
+}
+
 function getZodChainableNumberValidations(schema: OpenAPIV3.SchemaObject) {
   const validations: string[] = [];
 

src/generators/core/zod/getZodSchema.ts

@@ -19,7 +19,7 @@ import {
   isReferenceObject,
   isSchemaObject,
 } from "src/generators/utils/openapi-schema.utils";
-import { escapeControlCharacters, isPrimitiveType, wrapWithQuotesIfNeeded } from "src/generators/utils/openapi.utils";
+import { isPrimitiveType, wrapWithQuotesIfNeeded } from "src/generators/utils/openapi.utils";
 import { match } from "ts-pattern";
 import { getParentRef, ZodSchema, ZodSchemaMetaData } from "./ZodSchema.class";
 import { getZodChain } from "./getZodChain";
@@ -345,33 +345,20 @@ function getPrimitiveZodSchema({ schema, zodSchema, resolver, meta, tag }: GetPa
             .with("integer", () => INT_SCHEMA)
             .otherwise(() => NUMBER_SCHEMA),
         )
-        .with("string", () => {
-          if (schema.pattern) {
-            return `z.regex(${formatPatternIfNeeded(schema.pattern)})`;
-          }
-          return match(schema.format)
+        .with("string", () =>
+          match(schema.format)
             .with("binary", () => BLOB_SCHEMA)
             .with("email", () => EMAIL_SCHEMA)
             .with("hostname", "uri", () => URL_SCHEMA)
             .with("uuid", () => UUID_SCHEMA)
             .with("date-time", () => DATETIME_SCHEMA)
-            .otherwise(() => STRING_SCHEMA);
-        })
+            .otherwise(() => STRING_SCHEMA),
+        )
         .otherwise((type) => `z.${type}()`),
     );
   }
 }
 
-function formatPatternIfNeeded(pattern: string) {
-  if (pattern.startsWith("/") && pattern.endsWith("/")) {
-    pattern = pattern.slice(1, -1);
-  }
-
-  pattern = escapeControlCharacters(pattern);
-
-  return `/${pattern}/`;
-}
-
 function getEnumZodSchema({ resolver, schema, zodSchema, meta, tag }: GetPartialZodSchemaParams) {
   if (!isSchemaObject(schema)) {
     return;