minor fix in japanese custom error message handling

chrishoermann · May 4, 2023 · 9778132 · 9778132
1 parent 62ba58d
commit 9778132
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 6 deletions.
diff --git a/packages/generator/package.json b/packages/generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zod-prisma-types",
-  "version": "2.5.10",
+  "version": "2.5.11",
   "description": "Generates zod schemas from Prisma models with advanced validation",
   "author": "Chris Hörmann",
   "license": "MIT",

diff --git a/packages/generator/src/classes/extendedDMMFField/__tests__/extendedDMMFField.test.ts b/packages/generator/src/classes/extendedDMMFField/__tests__/extendedDMMFField.test.ts
@@ -8,6 +8,11 @@ import {
   ARRAY_VALIDATOR_NUMBER_OR_STRING_AND_MESSAGE_REGEX,
   ARRAY_VALIDATOR_WITH_MESSAGE_REGEX,
 } from '../extendedDMMFFieldArrayValidatorString';
+import {
+  VALIDATOR_CUSTOM_ERROR_MESSAGE_REGEX,
+  VALIDATOR_CUSTOM_ERROR_REGEX,
+  VALIDATOR_CUSTOM_ERROR_SPLIT_KEYS_REGEX,
+} from '../extendedDMMFFieldValidatorCustomErrors';
 import {
   STRING_VALIDATOR_NUMBER_AND_MESSAGE_REGEX,
   STRING_VALIDATOR_MESSAGE_REGEX,
@@ -329,6 +334,32 @@ describe(`ExtendedDMMFFieldDefaultValidators`, () => {
 // VALIDATOR CUSTOM ERRORS TESTS
 // ----------------------------------------------
 
+describe(`ExtendedDMMFFieldValidatorCustomErrors`, () => {
+  it(`array validator number should return match for regex with japanese chars`, async () => {
+    const result = VALIDATOR_CUSTOM_ERROR_REGEX.exec(
+      "({ invalid_type_error: 'カタカナ漢字ひらがな', required_error: 'カタカナ漢字ひらがな', description: 'カタカナ漢字ひらがな' })",
+    );
+    expect(result?.groups?.object).toBe(
+      "{ invalid_type_error: 'カタカナ漢字ひらがな', required_error: 'カタカナ漢字ひらがな', description: 'カタカナ漢字ひらがな' }",
+    );
+    expect(result?.groups?.messages).toBe(
+      " invalid_type_error: 'カタカナ漢字ひらがな', required_error: 'カタカナ漢字ひらがな', description: 'カタカナ漢字ひらがな' ",
+    );
+  });
+  it(`array validator number should return match for regex with japanese chars`, async () => {
+    const messageArray =
+      " invalid_type_error: 'カタカナ漢字ひらがな', required_error: 'カタカナ漢字ひらがな', description: 'カタカナ漢字ひらがな' "
+        .replace(VALIDATOR_CUSTOM_ERROR_MESSAGE_REGEX, '')
+        .match(VALIDATOR_CUSTOM_ERROR_SPLIT_KEYS_REGEX);
+
+    expect(messageArray).toEqual([
+      'invalid_type_error',
+      'required_error',
+      'description',
+    ]);
+  });
+});
+
 describe(`ExtendedDMMFFieldValidatorCustomErrors`, () => {
   it(`should load a class without docs`, async () => {
     const field = getField();

diff --git a/...or/src/classes/extendedDMMFField/__tests__/extendedDMMFFieldValidatorCustomErrors.test.ts b/...or/src/classes/extendedDMMFField/__tests__/extendedDMMFFieldValidatorCustomErrors.test.ts
@@ -2,7 +2,12 @@ import { DMMF } from '@prisma/generator-helper';
 import { it, expect, describe } from 'vitest';
 
 import { DEFAULT_GENERATOR_CONFIG, FIELD_BASE } from './setup';
-import { ExtendedDMMFFieldValidatorCustomErrors } from '../extendedDMMFFieldValidatorCustomErrors';
+import {
+  ExtendedDMMFFieldValidatorCustomErrors,
+  VALIDATOR_CUSTOM_ERROR_MESSAGE_REGEX,
+  VALIDATOR_CUSTOM_ERROR_REGEX,
+  VALIDATOR_CUSTOM_ERROR_SPLIT_KEYS_REGEX,
+} from '../extendedDMMFFieldValidatorCustomErrors';
 
 const getField = (field?: Partial<DMMF.Field>) =>
   new ExtendedDMMFFieldValidatorCustomErrors(
@@ -11,6 +16,32 @@ const getField = (field?: Partial<DMMF.Field>) =>
     'ModelName',
   );
 
+describe(`ExtendedDMMFFieldValidatorCustomErrors`, () => {
+  it(`array validator number should return match for regex with japanese chars`, async () => {
+    const result = VALIDATOR_CUSTOM_ERROR_REGEX.exec(
+      "({ invalid_type_error: 'カタカナ漢字ひらがな', required_error: 'カタカナ漢字ひらがな', description: 'カタカナ漢字ひらがな' })",
+    );
+    expect(result?.groups?.object).toBe(
+      "{ invalid_type_error: 'カタカナ漢字ひらがな', required_error: 'カタカナ漢字ひらがな', description: 'カタカナ漢字ひらがな' }",
+    );
+    expect(result?.groups?.messages).toBe(
+      " invalid_type_error: 'カタカナ漢字ひらがな', required_error: 'カタカナ漢字ひらがな', description: 'カタカナ漢字ひらがな' ",
+    );
+  });
+  it(`array validator number should return match for regex with japanese chars`, async () => {
+    const messageArray =
+      " invalid_type_error: 'カタカナ漢字ひらがな', required_error: 'カタカナ漢字ひらがな', description: 'カタカナ漢字ひらがな' "
+        .replace(VALIDATOR_CUSTOM_ERROR_MESSAGE_REGEX, '')
+        .match(VALIDATOR_CUSTOM_ERROR_SPLIT_KEYS_REGEX);
+
+    expect(messageArray).toEqual([
+      'invalid_type_error',
+      'required_error',
+      'description',
+    ]);
+  });
+});
+
 describe(`ExtendedDMMFFieldValidatorCustomErrors`, () => {
   it(`should load a class without docs`, async () => {
     const field = getField();

diff --git a/packages/generator/src/classes/extendedDMMFField/extendedDMMFFieldValidatorCustomErrors.ts b/packages/generator/src/classes/extendedDMMFField/extendedDMMFFieldValidatorCustomErrors.ts
@@ -17,12 +17,12 @@ export type ZodCustomErrorKey =
 /////////////////////////////////////////////////
 
 export const VALIDATOR_CUSTOM_ERROR_REGEX =
-  /(\()(?<object>\{(?<messages>[\w (),'":+\-*#!§$%&/{}[\]=?~><°^]+)\})(\))/;
+  /(\()(?<object>\{(?<messages>[\w\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Han} (),'":+\-*#!§$%&/{}[\]=?~><°^]+)\})(\))/u;
 
 export const VALIDATOR_CUSTOM_ERROR_MESSAGE_REGEX =
-  /[ ]?"[\w (),.':+\-*#!§$%&/{}[\]=?~><°^]+"[,]?[ ]?/g;
+  /[ ]?"[\w\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Han} (),.':+\-*#!§$%&/{}[\]=?~><°^]+"[,]?[ ]?/gu;
 
-export const VALIDATOR_CUSTOM_ERROR_SPLIT_KEYS_REGEX = /[\w]+(?=:)/g;
+export const VALIDATOR_CUSTOM_ERROR_SPLIT_KEYS_REGEX = /[\w]+(?=:)/gu;
 
 /////////////////////////////////////////////////
 // CONSTANTS

diff --git a/packages/usage/prisma/schema.prisma b/packages/usage/prisma/schema.prisma
@@ -315,7 +315,8 @@ model SelfReference {
 
 model JapaneseChars {
   id     Int    @id @default(autoincrement())
-  string String /// @zod.string.min(5, { message: "カタカナ漢字ひらがな" })
+  ///@zod.string({ invalid_type_error: "カタカナ漢字ひらがな", required_error: "カタカナ漢字ひらがな", description: "カタカナ漢字ひらがな" }).min(5, { message: "カタカナ漢字ひらがな" })
+  string String
 }
 
 // model Post {