feat: enhance type safety and error handling across various components and routes

ashwin31 · ashwin31 · commit 0e3805a5b2da · 2025-08-01T20:48:12.000+05:30
diff --git a/src/hooks.server.js b/src/hooks.server.js
@@ -5,7 +5,7 @@ import { redirect } from '@sveltejs/kit';
 export async function handle({ event, resolve }) {
 	const sessionId = await event.cookies.get('session');
 	// console.log(sessionId, '-----------------sessionid')
-	let user = false
+	let user = null;
 	if(sessionId && sessionId!=''){
 	  user = await prisma.user.findFirst({
 		where: {
diff --git a/src/routes/(app)/app/cases/+page.server.js b/src/routes/(app)/app/cases/+page.server.js
@@ -46,7 +46,8 @@ export const actions = {
     const subject = form.get('title')?.toString().trim();
     const description = form.get('description')?.toString().trim();
     const accountId = form.get('accountId')?.toString();
-    const dueDate = form.get('dueDate') ? new Date(form.get('dueDate')) : null;
+    const dueDateValue = form.get('dueDate');
+    const dueDate = dueDateValue ? new Date(dueDateValue.toString()) : null;
     const priority = form.get('priority')?.toString() || 'Medium';
     const ownerId = form.get('assignedId')?.toString();
     if (!subject || !accountId || !ownerId) {
@@ -70,14 +71,16 @@ export const actions = {
     const subject = form.get('title')?.toString().trim();
     const description = form.get('description')?.toString().trim();
     const accountId = form.get('accountId')?.toString();
-    const dueDate = form.get('dueDate') ? new Date(form.get('dueDate')) : null;
+    const dueDateValue = form.get('dueDate');
+    const dueDate = dueDateValue ? new Date(dueDateValue.toString()) : null;
     const priority = form.get('priority')?.toString() || 'Medium';
     const ownerId = form.get('assignedId')?.toString();
-    if (!subject || !accountId || !ownerId) {
+    const caseId = form.get('caseId')?.toString();
+    if (!subject || !accountId || !ownerId || !caseId) {
       return fail(400, { error: 'Missing required fields.' });
     }
     await prisma.case.update({
-      where: { id: params.caseId },
+      where: { id: caseId, organizationId: locals.org.id },
       data: {
         subject,
         description,
@@ -87,22 +90,33 @@ export const actions = {
         ownerId
       }
     });
-    throw redirect(303, `/app/cases/${params.caseId}`);
+    throw redirect(303, `/app/cases/${caseId}`);
   },
-  delete: async ({ params }) => {
-    await prisma.case.delete({ where: { id: params.caseId } });
+  delete: async ({ request, locals }) => {
+    const form = await request.formData();
+    const caseId = form.get('caseId')?.toString();
+    if (!caseId) {
+      return fail(400, { error: 'Case ID is required.' });
+    }
+    await prisma.case.delete({ 
+      where: { 
+        id: caseId, 
+        organizationId: locals.org.id 
+      } 
+    });
     throw redirect(303, '/app/cases');
   },
-  comment: async ({ request, params, locals }) => {
+  comment: async ({ request, locals }) => {
     const form = await request.formData();
     const body = form.get('body')?.toString().trim();
-    if (!body) return fail(400, { error: 'Comment cannot be empty.' });
+    const caseId = form.get('caseId')?.toString();
+    if (!body || !caseId) return fail(400, { error: 'Comment and case ID are required.' });
     await prisma.comment.create({
       data: {
         body,
         authorId: locals.user.id,
         organizationId: locals.org.id,
-        caseId: params.caseId
+        caseId: caseId
       }
     });
     return { success: true };
diff --git a/src/routes/(app)/app/cases/new/+page.server.js b/src/routes/(app)/app/cases/new/+page.server.js
@@ -33,7 +33,8 @@ export const actions = {
     const subject = form.get('title')?.toString().trim();
     const description = form.get('description')?.toString().trim();
     const accountId = form.get('accountId')?.toString();
-    const dueDate = form.get('dueDate') ? new Date(form.get('dueDate')) : null;
+    const dueDateValue = form.get('dueDate');
+    const dueDate = dueDateValue ? new Date(dueDateValue.toString()) : null;
     const priority = form.get('priority')?.toString() || 'Medium';
     const ownerId = form.get('assignedId')?.toString();
     if (!subject || !accountId || !ownerId) {
diff --git a/src/routes/(app)/app/contacts/+page.server.js b/src/routes/(app)/app/contacts/+page.server.js
@@ -1,5 +1,6 @@
 import prisma from '$lib/prisma';
 import { error } from '@sveltejs/kit';
+import { Prisma } from '@prisma/client';
 
 
 /** @type {import('./$types').PageServerLoad} */
@@ -18,12 +19,12 @@ export async function load({ url, locals }) {
             organizationId: locals.org.id,
             ...(search && {
                 OR: [
-                    { firstName: { contains: search, mode: 'insensitive' } },
-                    { lastName: { contains: search, mode: 'insensitive' } },
-                    { email: { contains: search, mode: 'insensitive' } },
-                    { phone: { contains: search, mode: 'insensitive' } },
-                    { title: { contains: search, mode: 'insensitive' } },
-                    { department: { contains: search, mode: 'insensitive' } }
+                    { firstName: { contains: search, mode: Prisma.QueryMode.insensitive } },
+                    { lastName: { contains: search, mode: Prisma.QueryMode.insensitive } },
+                    { email: { contains: search, mode: Prisma.QueryMode.insensitive } },
+                    { phone: { contains: search, mode: Prisma.QueryMode.insensitive } },
+                    { title: { contains: search, mode: Prisma.QueryMode.insensitive } },
+                    { department: { contains: search, mode: Prisma.QueryMode.insensitive } }
                 ]
             }),
             ...(ownerId && { ownerId })
@@ -104,7 +105,7 @@ export const actions = {
         try {
 
             const data = await request.formData();
-            const contactId = data.get('contactId');
+            const contactId = data.get('contactId')?.toString();
 
             if (!contactId) {
                 throw error(400, 'Contact ID is required');
diff --git a/src/routes/(app)/app/contacts/+page.svelte b/src/routes/(app)/app/contacts/+page.svelte
@@ -58,21 +58,25 @@
     }
 
     // Pagination
+    /** @param {number} pageNum */
     function goToPage(pageNum) {
         const params = new URLSearchParams($page.url.searchParams);
         params.set('page', pageNum.toString());
         goto(`?${params.toString()}`);
     }
 
     // Modal functions
+    /** @param {any} contact */
     function editContact(contact) {
         goto(`/app/contacts/${contact.id}/edit`);
     }
 
+    /** @param {string | Date} dateString */
     function formatDate(dateString) {
         return new Date(dateString).toLocaleDateString();
     }
 
+    /** @param {string} phone */
     function formatPhone(phone) {
         if (!phone) return '';
         // Basic phone formatting - can be enhanced
diff --git a/src/routes/(app)/app/contacts/[contactId]/+page.server.js b/src/routes/(app)/app/contacts/[contactId]/+page.server.js
@@ -4,6 +4,15 @@ export async function load({ params, locals }) {
   const org = locals.org;
   const contact = await prisma.contact.findUnique({
     where: { id: params.contactId, organizationId: org.id },
+    include: {
+      owner: {
+        select: {
+          id: true,
+          name: true,
+          email: true
+        }
+      }
+    }
   });
 
   if (!contact) {
diff --git a/src/routes/(app)/app/contacts/[contactId]/+page.svelte b/src/routes/(app)/app/contacts/[contactId]/+page.svelte
@@ -1,31 +1,42 @@
 <script>
   import { ArrowLeft, Mail, Phone, Building2, Calendar, User, MapPin, Edit, Plus, ExternalLink, Clock, DollarSign, Target, CheckCircle, Circle, AlertCircle, Users, Star } from '@lucide/svelte';
-  export let data;
-  const { contact } = data;
+  
+  /** @type {{ data: import('./$types').PageData }} */
+  let { data } = $props();
+  
+  const contact = data.contact;
+  
+  if (!contact) {
+    throw new Error('Contact not found');
+  }
 
   // Get primary account relationship
   const primaryAccountRel = contact.accountRelationships?.find(rel => rel.isPrimary);
   const hasMultipleAccounts = contact.accountRelationships?.length > 1;
 
+  /** @param {string | Date} dateStr */
   function formatDate(dateStr) {
     if (!dateStr) return 'N/A';
     return new Date(dateStr).toLocaleDateString('en-US', {
       year: 'numeric', month: 'short', day: 'numeric'
     });
   }
 
+  /** @param {string | Date} dateStr */
   function formatDateTime(dateStr) {
     if (!dateStr) return 'N/A';
     return new Date(dateStr).toLocaleDateString('en-US', {
       year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: '2-digit'
     });
   }
 
+  /** @param {number} amount */
   function formatCurrency(amount) {
     if (!amount) return '$0';
     return new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(amount);
   }
 
+  /** @param {string} status */
   function getStatusColor(status) {
     const colors = {
       'Completed': 'text-green-600 bg-green-50 dark:bg-green-900/20',
@@ -36,16 +47,17 @@
       'NEGOTIATION': 'text-orange-600 bg-orange-50 dark:bg-orange-900/20',
       'PROPOSAL': 'text-purple-600 bg-purple-50 dark:bg-purple-900/20'
     };
-    return colors[status] || 'text-gray-600 bg-gray-50 dark:bg-gray-900/20';
+    return colors[/** @type {keyof typeof colors} */ (status)] || 'text-gray-600 bg-gray-50 dark:bg-gray-900/20';
   }
 
+  /** @param {string} priority */
   function getPriorityColor(priority) {
     const colors = {
       'High': 'text-red-600 bg-red-50 dark:bg-red-900/20',
       'Normal': 'text-blue-600 bg-blue-50 dark:bg-blue-900/20',
       'Low': 'text-gray-600 bg-gray-50 dark:bg-gray-900/20'
     };
-    return colors[priority] || 'text-gray-600 bg-gray-50 dark:bg-gray-900/20';
+    return colors[/** @type {keyof typeof colors} */ (priority)] || 'text-gray-600 bg-gray-50 dark:bg-gray-900/20';
   }
 </script>
 
@@ -256,7 +268,7 @@
                   <div class="text-right">
                     <p class="font-medium text-gray-900 dark:text-white flex items-center gap-1">
                       <DollarSign class="w-4 h-4" />
-                      {formatCurrency(opp.amount)}
+                      {formatCurrency(opp.amount || 0)}
                     </p>
                     <span class="inline-flex px-2 py-1 text-xs rounded-full {getStatusColor(opp.stage)}">
                       {opp.stage.replace('_', ' ')}
diff --git a/src/routes/(app)/app/contacts/[contactId]/edit/+page.svelte b/src/routes/(app)/app/contacts/[contactId]/edit/+page.svelte
@@ -6,28 +6,29 @@
   import { User, Mail, Phone, Building, MapPin, FileText, Star, Save, X, ArrowLeft } from '@lucide/svelte';
   import { validatePhoneNumber } from '$lib/utils/phone.js';
   
-  export let data;
+  /** @type {{ data: import('./$types').PageData }} */
+  let { data } = $props();
 
-  let contact = data.contact;
+  const { contact } = data;
   let account = data.account;
   let isPrimary = data.isPrimary;
   let role = data.role;
 
-  let firstName = contact.firstName;
-  let lastName = contact.lastName;
-  let email = contact.email || '';
-  let phone = contact.phone || '';
-  let title = contact.title || '';
-  let department = contact.department || '';
-  let street = contact.street || '';
-  let city = contact.city || '';
-  let state = contact.state || '';
-  let postalCode = contact.postalCode || '';
-  let country = contact.country || '';
-  let description = contact.description || '';
-  let submitting = false;
-  let errorMsg = '';
-  let phoneError = '';
+  let firstName = $state(contact?.firstName || '');
+  let lastName = $state(contact?.lastName || '');
+  let email = $state(contact?.email || '');
+  let phone = $state(contact?.phone || '');
+  let title = $state(contact?.title || '');
+  let department = $state(contact?.department || '');
+  let street = $state(contact?.street || '');
+  let city = $state(contact?.city || '');
+  let stateField = $state(contact?.state || ''); // Renamed to avoid conflict with Svelte's $state
+  let postalCode = $state(contact?.postalCode || '');
+  let country = $state(contact?.country || '');
+  let description = $state(contact?.description || '');
+  let submitting = $state(false);
+  let errorMsg = $state('');
+  let phoneError = $state('');
 
   // Validate phone number on input
   function validatePhone() {
@@ -44,6 +45,7 @@
     }
   }
 
+  /** @param {Event} e */
   async function handleSubmit(e) {
     e.preventDefault();
     submitting = true;
@@ -57,7 +59,7 @@
     formData.append('department', department);
     formData.append('street', street);
     formData.append('city', city);
-    formData.append('state', state);
+    formData.append('state', stateField);
     formData.append('postalCode', postalCode);
     formData.append('country', country);
     formData.append('description', description);
@@ -69,7 +71,7 @@
     });
     if (res.ok) {
       await invalidateAll();
-      goto(`/app/contacts/${contact.id}`);
+      goto(`/app/contacts/${contact?.id}`);
     } else {
       const data = await res.json();
       errorMsg = data?.message || 'Failed to update contact.';
@@ -84,7 +86,7 @@
     <div class="mb-8">
       <div class="flex items-center gap-4 mb-4">
         <button 
-          onclick={() => goto(`/app/contacts/${contact.id}`)}
+          onclick={() => goto(`/app/contacts/${contact?.id}`)}
           class="p-2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-800 rounded-lg transition-colors"
         >
           <ArrowLeft class="w-5 h-5" />
@@ -256,7 +258,7 @@
                 <input 
                   id="state" 
                   class="w-full px-4 py-3 border border-gray-300 dark:border-gray-600 rounded-lg focus:ring-2 focus:ring-blue-500 dark:focus:ring-blue-400 focus:border-transparent bg-white dark:bg-gray-700 text-gray-900 dark:text-white placeholder-gray-500 dark:placeholder-gray-400" 
-                  bind:value={state} 
+                  bind:value={stateField} 
                   placeholder="CA"
                 />
               </div>
@@ -367,7 +369,7 @@
       <div class="flex justify-end gap-3 pt-6 border-t border-gray-200 dark:border-gray-700">
         <button
           type="button"
-          onclick={() => goto(`/app/contacts/${contact.id}`)}
+          onclick={() => goto(`/app/contacts/${contact?.id}`)}
           class="px-6 py-3 text-sm font-medium text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 focus:ring-2 focus:ring-gray-500 dark:focus:ring-gray-400 transition-colors"
         >
           Cancel
diff --git a/src/routes/(app)/app/contacts/new/+page.server.js b/src/routes/(app)/app/contacts/new/+page.server.js
@@ -17,6 +17,7 @@ export async function load({ locals, url }) {
 
     // Get accounts for the account dropdown (if no specific accountId is provided)
     const accountId = url.searchParams.get('accountId');
+    /** @type {Array<{id: string, name: string, organizationId: string}>} */
     let accounts = [];
     
     if (!accountId) {
@@ -68,8 +69,8 @@ export const actions = {
         }
 
         const data = await request.formData();
-        const firstName = data.get('firstName')?.toString().trim();
-        const lastName = data.get('lastName')?.toString().trim();
+        const firstName = data.get('firstName')?.toString().trim() || '';
+        const lastName = data.get('lastName')?.toString().trim() || '';
         const email = data.get('email')?.toString().trim();
         const phone = data.get('phone')?.toString().trim();
         const title = data.get('title')?.toString().trim();
@@ -246,7 +247,7 @@ export const actions = {
                     description: `Created contact: ${firstName} ${lastName}${accountId ? ` and linked to account` : ''}`,
                     newValues: { contact, accountRelationship: accountId ? { accountId, role, isPrimary } : null },
                     userId: locals.user.id,
-                    organizationId: validatedOrganizationId || null
+                    organizationId: locals.org.id
                 }
             });
 
diff --git a/src/routes/(app)/app/contacts/new/+page.svelte b/src/routes/(app)/app/contacts/new/+page.svelte
@@ -33,6 +33,7 @@
         role: form?.values?.role || ''
     });
     
+    /** @type {Record<string, string>} */
     const errors = $derived(form?.errors || {});
     
     // Find the selected account for display
@@ -42,7 +43,7 @@
     
     function handleSubmit() {
         isSubmitting = true;
-        return async ({ update }) => {
+        return async (/** @type {{ update: Function }} */ { update }) => {
             await update();
             isSubmitting = false;
         };
diff --git a/src/routes/(app)/app/leads/[lead_id]/+page.server.js b/src/routes/(app)/app/leads/[lead_id]/+page.server.js
@@ -239,7 +239,7 @@ export const actions = {
     } catch (err) {
       console.error('Error adding comment:', err instanceof Error ? err.message : String(err));
       if (err instanceof z.ZodError) {
-        return fail(400, { status: 'error', message: err.errors[0].message });
+        return fail(400, { status: 'error', message: err.issues[0].message });
       }
       return fail(500, { status: 'error', message: 'Failed to add comment' });
     }
diff --git a/src/routes/(app)/app/users/+page.server.js b/src/routes/(app)/app/users/+page.server.js

Original file line number	Diff line number	Diff line change
`@@ -58,21 +58,25 @@`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// Pagination`
	`61`	`+ /** @param {number} pageNum */`
`61`	`62`	`function goToPage(pageNum) {`
`62`	`63`	`const params = new URLSearchParams($page.url.searchParams);`
`63`	`64`	`params.set('page', pageNum.toString());`
`64`	`65`	goto(`?${params.toString()}`);
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`// Modal functions`
	`69`	`+ /** @param {any} contact */`
`68`	`70`	`function editContact(contact) {`
`69`	`71`	goto(`/app/contacts/${contact.id}/edit`);
`70`	`72`	`}`
`71`	`73`
	`74`	`+ /** @param {string \| Date} dateString */`
`72`	`75`	`function formatDate(dateString) {`
`73`	`76`	`return new Date(dateString).toLocaleDateString();`
`74`	`77`	`}`
`75`	`78`
	`79`	`+ /** @param {string} phone */`
`76`	`80`	`function formatPhone(phone) {`
`77`	`81`	`if (!phone) return '';`
`78`	`82`	`// Basic phone formatting - can be enhanced`