fix: schema.pattern when not wrapped with /xxx/

chore: run lint:fix
astahmer · Dec 7, 2022 · bda6ecb · bda6ecb
1 parent 8e8cb53
commit bda6ecb
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/lib/package.json b/lib/package.json
@@ -1,6 +1,6 @@
 {
     "name": "openapi-zod-client",
-    "version": "1.4.4",
+    "version": "1.4.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/astahmer/openapi-zod-client.git"

diff --git a/lib/src/makeSchemaResolver.ts b/lib/src/makeSchemaResolver.ts
@@ -1,5 +1,6 @@
 import type { OpenAPIObject, SchemaObject } from "openapi3-ts";
 import { get } from "pastable/server";
+
 import { normalizeString } from "./utils";
 
 const autocorrectRef = (ref: string) => (ref[1] === "/" ? ref : "#/" + ref.slice(1));
@@ -11,7 +12,10 @@ type RefInfo = {
 };
 
 export const makeSchemaResolver = (doc: OpenAPIObject) => {
+    // both used for debugging purpose
+    // eslint-disable-next-line sonarjs/no-unused-collection
     const nameByRef = new Map<string, string>();
+    // eslint-disable-next-line sonarjs/no-unused-collection
     const refByName = new Map<string, string>();
 
     const byRef = new Map<string, RefInfo>();
@@ -23,7 +27,7 @@ export const makeSchemaResolver = (doc: OpenAPIObject) => {
         const split = correctRef.split("/");
 
         // "#/components/schemas/Something.jsonld" -> #/components/schemas
-        const path = split.slice(1, split.length - 1).join("/")!;
+        const path = split.slice(1, -1).join("/")!;
         const map = get(doc, path.replace("#/", "").replace("#", "").replaceAll("/", ".")) ?? ({} as any);
 
         // "#/components/schemas/Something.jsonld" -> "Something.jsonld"

diff --git a/lib/src/openApiToZod.ts b/lib/src/openApiToZod.ts
@@ -226,6 +226,14 @@ const getZodChainableDefault = (schema: SchemaObject) => {
     return "";
 };
 
+const wrapPatternIfNeeded = (pattern: string) => {
+    if (pattern.startsWith("/") && pattern.endsWith("/")) {
+        return pattern;
+    }
+
+    return `/${pattern}/`;
+};
+
 const getZodChainableStringValidations = (schema: SchemaObject) => {
     const validations: string[] = [];
 
@@ -238,7 +246,7 @@ const getZodChainableStringValidations = (schema: SchemaObject) => {
     }
 
     if (schema.pattern) {
-        validations.push(`regex(${schema.pattern})`);
+        validations.push(`regex(${wrapPatternIfNeeded(schema.pattern)})`);
     }
 
     if (schema.format) {

diff --git a/lib/src/utils.ts b/lib/src/utils.ts
@@ -15,7 +15,7 @@ export function normalizeString(text: string) {
 }
 
 export const wrapWithQuotesIfNeeded = (str: string) => {
-    if (str.match(/^\w+$/)) {
+    if (/^\w+$/.test(str)) {
         return str;
     }
 

diff --git a/lib/tests/invalid-pattern-regex.test.ts b/lib/tests/invalid-pattern-regex.test.ts
@@ -0,0 +1,21 @@
+import { getZodSchema } from "../src";
+import { expect, test } from "vitest";
+import { getZodChain } from "../src/openApiToZod";
+import { SchemaObject } from "openapi3-ts";
+
+test("invalid-pattern-regex", () => {
+    const invalidSchema: SchemaObject = {
+        type: "string",
+        pattern: "[0-9]+",
+    };
+    const schema: SchemaObject = {
+        type: "string",
+        pattern: "/[0-9]+/",
+    };
+    expect(getZodSchema({ schema: schema }) + getZodChain(schema)).toMatchInlineSnapshot(
+        '"z.string().regex(/[0-9]+/).optional()"'
+    );
+    expect(getZodSchema({ schema: invalidSchema }) + getZodChain(invalidSchema)).toMatchInlineSnapshot(
+        '"z.string().regex(/[0-9]+/).optional()"'
+    );
+});