fix: update zod dependency version and simplify schema validations in forms

Author: gustaavik

bun.lock

@@ -41,6 +41,6 @@
 	},
 	"dependencies": {
 		"lucide-svelte": "^0.515.0",
-		"zod": "^3.25.71"
+		"zod": "3.25.67"
 	}
 }

package.json

@@ -1,60 +1,11 @@
 import { z } from 'zod';
 
-// Category schema
+// Simple category schema for forms
 export const categorySchema = z.object({
-	name: z
-		.string()
-		.min(1, 'Category name is required')
-		.max(100, 'Category name must be 100 characters or less'),
-	description: z.string().max(500, 'Description must be 500 characters or less'),
-	parentId: z.string().optional()
-});
-
-export const updateCategorySchema = categorySchema
-	.extend({
-		name: z
-			.string()
-			.min(1, 'Category name is required')
-			.max(100, 'Category name must be 100 characters or less'),
-		description: z.string().max(500, 'Description must be 500 characters or less').optional(),
-		parentId: z.string()
-	})
-	.partial()
-	.refine((data) => {
-		// Ensure at least one field is provided for update
-		return data.name || data.description || data.parentId !== undefined;
-	});
-
-// Discount schema
-export const discountSchema = z.object({
-	code: z
-		.string()
-		.min(1, 'Discount code is required')
-		.transform((val) => val.toUpperCase()),
+	name: z.string().min(1, 'Category name is required').max(100),
 	description: z.string().optional(),
-	type: z.enum(['percentage', 'fixed'], { required_error: 'Discount type is required' }),
-	method: z.enum(['basket', 'product'], { required_error: 'Discount method is required' }),
-	value: z.number().min(0, 'Value must be 0 or greater'),
-	minimumOrderAmount: z.number().min(0, 'Minimum order amount must be 0 or greater').optional(),
-	usageLimit: z.number().int().min(1, 'Usage limit must be at least 1').optional(),
-	expiresAt: z.string().optional(),
-	isActive: z.boolean().default(true)
-});
-
-// Currency schema
-export const currencySchema = z.object({
-	code: z
-		.string()
-		.min(3, 'Currency code must be 3 characters')
-		.max(3, 'Currency code must be 3 characters')
-		.transform((val) => val.toUpperCase()),
-	name: z.string().min(1, 'Currency name is required'),
-	symbol: z.string().min(1, 'Currency symbol is required'),
-	exchangeRate: z.number().min(0.000001, 'Exchange rate must be greater than 0'),
-	isEnabled: z.boolean().default(true)
+	parentId: z.string().optional()
 });
 
 // Type exports for use in components
 export type CategoryValidation = z.infer<typeof categorySchema>;
-export type DiscountValidation = z.infer<typeof discountSchema>;
-export type CurrencyValidation = z.infer<typeof currencySchema>;

src/lib/schemas/admin.ts

@@ -1,35 +1,27 @@
 import { z } from 'zod';
 
-// Product variant schema
+// Product variant schema for form validation (simplified)
 export const productVariantSchema = z.object({
 	sku: z.string().min(1, 'SKU is required'),
-	price: z.number().min(1, 'Price must be 0 or greater'),
+	price: z.number().min(0, 'Price must be 0 or greater'),
 	stock: z.number().int().min(0, 'Stock must be 0 or greater'),
 	weight: z.number().min(0, 'Weight must be 0 or greater').optional(),
-	attributes: z.record(z.string(), z.string()).default({}),
-	images: z.array(z.string().url('Invalid image URL')).default([]),
-	isDefault: z.boolean().default(false)
+	attributes: z.record(z.string(), z.string()),
+	images: z.array(z.string()),
+	isDefault: z.boolean()
 });
 
-// Product schema (requires at least one variant)
+// Product schema for form validation (simplified)
 export const productSchema = z.object({
 	name: z.string().min(1, 'Product name is required'),
-	description: z.string().optional(),
+	description: z.string(),
 	currency: z.string().min(3, 'Currency is required').max(3, 'Currency must be 3 characters'),
 	categoryId: z.string().min(1, 'Category ID is required'),
-	images: z.array(z.string().url('Invalid image URL')).default([]),
-	isActive: z.boolean().default(true),
+	images: z.array(z.string()),
+	isActive: z.boolean(),
 	variants: z.array(productVariantSchema).min(1, 'At least one variant is required')
 });
 
-export const updateProductSchema = productSchema.partial().extend({
-	variants: z.array(productVariantSchema).optional()
-});
-
-export const updateProductVariantSchema = productVariantSchema.partial();
-
-export type ProductVariantSchema = z.infer<typeof productVariantSchema>;
-export type ProductSchema = z.infer<typeof productSchema>;
-
-export type UpdateProductSchema = z.infer<typeof updateProductSchema>;
-export type UpdateProductVariantSchema = z.infer<typeof updateProductVariantSchema>;
+// Type exports
+export type ProductVariantSchema = typeof productVariantSchema;
+export type ProductSchema = typeof productSchema;

src/lib/schemas/product.schema.ts

@@ -10,7 +10,7 @@
 		TableHeader,
 		TableRow
 	} from '$lib/components/ui/table';
-	import { ArrowLeft, Edit, Eye, Package } from 'lucide-svelte';
+	import { ArrowLeft, Edit, Eye } from 'lucide-svelte';
 	import { formatCurrency, getStockStatus } from '$lib';
 
 	let { data } = $props();

src/routes/admin/products/[id]/+page.svelte

@@ -2,11 +2,8 @@ import type { Actions } from '@sveltejs/kit';
 import { fail, redirect } from '@sveltejs/kit';
 import { superValidate } from 'sveltekit-superforms';
 import { zod } from 'sveltekit-superforms/adapters';
-import {
-	productSchema,
-	productVariantSchema,
-	updateProductSchema
-} from '$lib/schemas/product.schema';
+import { productSchema, productVariantSchema } from '$lib/schemas/product.schema';
+import type { CreateProductVariantInput } from '$lib/types/product.js';
 
 export const load = async ({ params, locals }) => {
 	const productId = params.id;
@@ -94,7 +91,7 @@ export const actions: Actions = {
 		}
 
 		const { commercify } = locals;
-		const form = await superValidate(request, zod(updateProductSchema));
+		const form = await superValidate(request, zod(productSchema));
 
 		if (!form.valid) {
 			return fail(400, { form });
@@ -153,7 +150,17 @@ export const actions: Actions = {
 		}
 		console.log('Adding product variant with data:', form.data);
 
-		const result = await commercify.addProductVariant(productId, form.data);
+		const input: CreateProductVariantInput = {
+			sku: form.data.sku,
+			price: form.data.price,
+			stock: form.data.stock || 0,
+			weight: form.data.weight || 0,
+			attributes: form.data.attributes || {},
+			images: form.data.images || [],
+			isDefault: form.data.isDefault || false
+		};
+
+		const result = await commercify.addProductVariant(productId, input);
 		if (!result.success) {
 			console.error('Error adding product variant:', result.error);
 			return fail(400, {

src/routes/admin/products/[id]/edit/+page.server.ts

@@ -10,8 +10,8 @@
 	import { Checkbox } from '$lib/components/ui/checkbox';
 	import { productSchema, type ProductSchema } from '$lib/schemas/product.schema';
 	import { toast } from 'svelte-sonner';
-	import SuperDebug, { superForm, type SuperValidated } from 'sveltekit-superforms';
-	import { zodClient } from 'sveltekit-superforms/adapters';
+	import { superForm, type SuperValidated } from 'sveltekit-superforms';
+	import { zodClient, type Infer } from 'sveltekit-superforms/adapters';
 	import { generateSKU } from '$lib/utils/admin';
 	import { ArrowLeft, Save, Plus, Trash2, Wand2, Upload, X, Settings } from 'lucide-svelte';
 	import { cn } from '$lib/utils';
@@ -21,7 +21,7 @@
 		data
 	}: {
 		data: {
-			form: SuperValidated<ProductSchema>;
+			form: SuperValidated<Infer<ProductSchema>>;
 			currencies: Currency[];
 			categories: Category[];
 			product: any;
@@ -106,14 +106,14 @@
 		const url = prompt('Enter image URL:');
 		if (url && url.trim()) {
 			$formData.variants[variantIndex].images = [
-				...$formData.variants[variantIndex].images,
+				...($formData.variants[variantIndex].images || []),
 				url.trim()
 			];
 		}
 	}
 
 	function removeImageFromVariant(variantIndex: number, imageIndex: number) {
-		$formData.variants[variantIndex].images = $formData.variants[variantIndex].images.filter(
+		$formData.variants[variantIndex].images = $formData.variants[variantIndex].images?.filter(
 			(_, i) => i !== imageIndex
 		);
 	}

src/routes/admin/products/[id]/edit/+page.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { page } from '$app/stores';
 	import { enhance } from '$app/forms';
 	import { invalidateAll } from '$app/navigation';
 	import { Button } from '$lib/components/ui/button';

src/routes/admin/products/categories/+page.svelte

@@ -1,7 +1,7 @@
 import { redirect, error } from '@sveltejs/kit';
 import type { PageServerLoad, Actions } from './$types';
 import { fail } from '@sveltejs/kit';
-import { categorySchema, updateCategorySchema } from '$lib/schemas/admin';
+import { categorySchema } from '$lib/schemas/admin';
 import { zod } from 'sveltekit-superforms/adapters';
 import { superValidate } from 'sveltekit-superforms';
 
@@ -31,7 +31,7 @@ export const load: PageServerLoad = async ({ params, locals }) => {
 			description: category.description || '',
 			parentId: category.parentId?.toString()
 		},
-		zod(updateCategorySchema)
+		zod(categorySchema)
 	);
 
 	return {
@@ -46,7 +46,7 @@ export const actions: Actions = {
 		const { commercify } = locals;
 
 		const categoryId = params.id;
-		const form = await superValidate(request, zod(updateCategorySchema));
+		const form = await superValidate(request, zod(categorySchema));
 
 		if (!form.valid) {
 			return fail(400, { form });

src/routes/admin/products/categories/[id]/edit/+page.server.ts

@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { superForm } from 'sveltekit-superforms';
 	import { zodClient } from 'sveltekit-superforms/adapters';
-	import { updateCategorySchema } from '$lib/schemas/admin';
 	import { Button } from '$lib/components/ui/button';
 	import {
 		Card,
@@ -15,11 +14,12 @@
 	import * as Form from '$lib/components/ui/form';
 	import * as Select from '$lib/components/ui/select';
 	import { ArrowLeft, Save } from 'lucide-svelte';
+	import { categorySchema } from '$lib/schemas/admin.js';
 
 	let { data } = $props();
 
 	const form = superForm(data.form, {
-		validators: zodClient(updateCategorySchema)
+		validators: zodClient(categorySchema)
 	});
 
 	const { form: formData, enhance } = form;