@axium/server 0.3.2 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.3.2",
+	"version": "0.3.4",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"funding": {
 		"type": "individual",

package/web/routes/email/+page.server.ts

@@ -1,8 +1,9 @@
 import { fail, redirect, type Actions } from '@sveltejs/kit';
 import * as z from 'zod';
 import { adapter } from '../../../dist/auth.js';
-import type { PageServerLoadEvent } from './$types.js';
 import { web } from '../../../dist/config.js';
+import { tryZod } from '../../utils.js';
+import type { PageServerLoadEvent } from './$types.js';
 
 export async function load(event: PageServerLoadEvent) {
 	const session = await event.locals.auth();
@@ -15,13 +16,8 @@ export const actions = {
 		const session = await event.locals.auth();
 
 		const rawEmail = (await event.request.formData()).get('email');
-		const { data: email, success, error } = z.string().email().safeParse(rawEmail);
-
-		if (!success)
-			return fail(400, {
-				email,
-				error: error.flatten().formErrors[0] || Object.values(error.flatten().fieldErrors).flat()[0],
-			});
+		const [email, error] = tryZod(z.string().email().safeParse(rawEmail));
+		if (error) return error;
 
 		const user = await adapter.getUserByEmail(session.user.email);
 		if (!user) return fail(500, { email, error: 'User does not exist' });

package/web/routes/name/+page.server.ts

@@ -2,6 +2,7 @@ import { Name } from '@axium/core/schemas';
 import { fail, redirect, type Actions } from '@sveltejs/kit';
 import { adapter } from '../../../dist/auth.js';
 import { web } from '../../../dist/config.js';
+import { tryZod } from '../../utils.js';
 import type { PageServerLoadEvent } from './$types.js';
 
 export async function load(event: PageServerLoadEvent) {
@@ -15,13 +16,8 @@ export const actions = {
 		const session = await event.locals.auth();
 
 		const rawName = (await event.request.formData()).get('name');
-		const { data: name, success, error } = Name.safeParse(rawName);
-
-		if (!success)
-			return fail(400, {
-				name,
-				error: error.flatten().formErrors[0] || Object.values(error.flatten().fieldErrors).flat()[0],
-			});
+		const [name, error] = tryZod(Name.safeParse(rawName));
+		if (error) error;
 
 		const user = await adapter.getUserByEmail(session.user.email);
 		if (!user) return fail(500, { name, error: 'User does not exist' });

package/web/utils.ts

@@ -0,0 +1,13 @@
+import { fail, type ActionFailure } from '@sveltejs/kit';
+import type * as z from 'zod';
+
+export function failZod(error: z.ZodError): ActionFailure<{ error: string }> {
+	return fail(400, {
+		error: error.flatten().formErrors[0] || Object.values(error.flatten().fieldErrors).flat()[0],
+	});
+}
+
+export function tryZod<Input, Output>(result: z.SafeParseReturnType<Input, Output>): [Output, null] | [null, ActionFailure<{ error: string }>] {
+	if (result.success) return [result.data, null];
+	return [null, failZod(result.error)];
+}