From 1b7a1585c2661034d71d6f1d6ed39c3d992f5eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B6derlund?= Date: Tue, 13 Aug 2024 07:15:01 +0200 Subject: [PATCH] Added test for zod-i18n-map --- package.json | 4 +- pnpm-lock.yaml | 31 +++++-- src/routes/(v2)/v2/issue-455/+page.server.ts | 23 ++++++ src/routes/(v2)/v2/issue-455/+page.svelte | 87 ++++++++++++++++++++ src/routes/(v2)/v2/issue-455/schema.ts | 22 +++++ 5 files changed, 161 insertions(+), 6 deletions(-) create mode 100644 src/routes/(v2)/v2/issue-455/+page.server.ts create mode 100644 src/routes/(v2)/v2/issue-455/+page.svelte create mode 100644 src/routes/(v2)/v2/issue-455/schema.ts diff --git a/package.json b/package.json index a06c9bc5..57dcd419 100644 --- a/package.json +++ b/package.json @@ -180,6 +180,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-dci-lint": "^0.3.2", "eslint-plugin-svelte": "2.36.0-next.13", + "i18next": "^23.12.3", "only-allow": "^1.2.1", "prettier": "^3.3.3", "prettier-plugin-svelte": "^3.2.6", @@ -195,7 +196,8 @@ "typescript": "^5.5.4", "uuid": "^9.0.1", "vite": "^5.4.0", - "vitest": "^1.6.0" + "vitest": "^1.6.0", + "zod-i18n-map": "^2.27.0" }, "svelte": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 191af2d5..9943acca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -106,6 +106,9 @@ importers: eslint-plugin-svelte: specifier: 2.36.0-next.13 version: 2.36.0-next.13(eslint@8.57.0)(svelte@5.0.0-next.216) + i18next: + specifier: ^23.12.3 + version: 23.12.3 only-allow: specifier: ^1.2.1 version: 1.2.1 @@ -154,6 +157,9 @@ importers: vitest: specifier: ^1.6.0 version: 1.6.0(@types/node@20.14.15)(sass@1.77.8) + zod-i18n-map: + specifier: ^2.27.0 + version: 2.27.0(i18next@23.12.3)(zod@3.23.8) packages: @@ -1171,6 +1177,9 @@ packages: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} + i18next@23.12.3: + resolution: {integrity: sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==} + ignore-walk@5.0.1: resolution: {integrity: sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -1948,6 +1957,12 @@ packages: zimmerframe@1.1.2: resolution: {integrity: sha512-rAbqEGa8ovJy4pyBxZM70hg4pE6gDgaQ0Sl9M3enG3I0d6H4XSAM3GeNGLKnsBpuijUow064sf7ww1nutC5/3w==} + zod-i18n-map@2.27.0: + resolution: {integrity: sha512-ORu9XpiVh3WDiEUs5Cr9siGgnpeODoBsTIgSD8sQCH9B//f9KowlzqHUEdPYb3vFonaSH8yPvPCOFM4niwp3Sg==} + peerDependencies: + i18next: '>=21.3.0' + zod: '>=3.17.0' + zod-to-json-schema@3.23.2: resolution: {integrity: sha512-uSt90Gzc/tUfyNqxnjlfBs8W6WSGpNBv0rVsNxP/BVSMHMKGdthPYff4xtCHYloJGM0CFxFsb3NbC0eqPhfImw==} peerDependencies: @@ -1974,7 +1989,6 @@ snapshots: '@babel/runtime@7.25.0': dependencies: regenerator-runtime: 0.14.1 - optional: true '@esbuild/aix-ppc64@0.21.5': optional: true @@ -2949,6 +2963,10 @@ snapshots: human-signals@5.0.0: {} + i18next@23.12.3: + dependencies: + '@babel/runtime': 7.25.0 + ignore-walk@5.0.1: dependencies: minimatch: 5.1.6 @@ -3267,8 +3285,7 @@ snapshots: dependencies: picomatch: 2.3.1 - regenerator-runtime@0.14.1: - optional: true + regenerator-runtime@0.14.1: {} resolve-from@4.0.0: {} @@ -3653,10 +3670,14 @@ snapshots: zimmerframe@1.1.2: {} + zod-i18n-map@2.27.0(i18next@23.12.3)(zod@3.23.8): + dependencies: + i18next: 23.12.3 + zod: 3.23.8 + zod-to-json-schema@3.23.2(zod@3.23.8): dependencies: zod: 3.23.8 optional: true - zod@3.23.8: - optional: true + zod@3.23.8: {} diff --git a/src/routes/(v2)/v2/issue-455/+page.server.ts b/src/routes/(v2)/v2/issue-455/+page.server.ts new file mode 100644 index 00000000..1af4c8b2 --- /dev/null +++ b/src/routes/(v2)/v2/issue-455/+page.server.ts @@ -0,0 +1,23 @@ +import type { Actions, PageServerLoad } from './$types.js'; + +import { superValidate, message } from '$lib/index.js'; +import { zod } from '$lib/adapters/zod.js'; +import { fail } from '@sveltejs/kit'; +import { schema } from './schema.js'; + +export const load: PageServerLoad = async () => { + return { + form: await superValidate(zod(schema)) + }; +}; + +export const actions: Actions = { + default: async ({ request }) => { + const form = await superValidate(request, zod(schema)); + console.log(form); + + if (!form.valid) return fail(400, { form }); + + return message(form, 'Form posted successfully!'); + } +}; diff --git a/src/routes/(v2)/v2/issue-455/+page.svelte b/src/routes/(v2)/v2/issue-455/+page.svelte new file mode 100644 index 00000000..13794eba --- /dev/null +++ b/src/routes/(v2)/v2/issue-455/+page.svelte @@ -0,0 +1,87 @@ + + + + +

when using zod-i18n-map, field errors are [undefined]

+ +

Submit to see localized errors.

+ +{#if $message} + +
= 400} class:success={$page.status == 200}> + {$message} +
+{/if} + +
+ + + + + +
+ +
+

+ 💥 Created with Superforms for SvelteKit 💥 +

+ + diff --git a/src/routes/(v2)/v2/issue-455/schema.ts b/src/routes/(v2)/v2/issue-455/schema.ts new file mode 100644 index 00000000..36acbe46 --- /dev/null +++ b/src/routes/(v2)/v2/issue-455/schema.ts @@ -0,0 +1,22 @@ +import i18next from 'i18next'; +import { z } from 'zod'; +import { zodI18nMap } from 'zod-i18n-map'; +import translation from 'zod-i18n-map/locales/es/zod.json'; + +i18next.init({ + lng: 'es', + resources: { + es: { zod: translation } + } +}); +z.setErrorMap(zodI18nMap); + +export const schema = z.object({ + name: z.string().min(2), + email: z.string().email() +}); + +const data = schema.safeParse({ name: '', email: '' }); +if (!data.success) { + console.dir(data.error.flatten(), { depth: 10 }); //debug +}