Move final functions and types into $lib/validate and $lib/server/validate

Author: Heliodex

Site/src/components/PostReply.svelte

@@ -1,9 +1,8 @@
 <script lang="ts">
 	import { page } from "$app/state"
 
-	const {
-		formData
-	}: { formData: import("sveltekit-superforms").SuperForm<any> } = $props()
+	const { formData }: { formData: import("$lib/validate").SuperForm<any> } =
+		$props()
 
 	const { form, errors, message, constraints, enhance, delayed } = formData
 </script>

Site/src/components/forms/Codearea.svelte

@@ -13,7 +13,7 @@
 		help?: string
 		placeholder?: string
 		rows?: number
-		formData: import("sveltekit-superforms").SuperForm<any>
+		formData: import("$lib/validate").SuperForm<any>
 	} = $props()
 
 	const { form, errors, constraints } = formData

Site/src/components/forms/Form.svelte

@@ -18,7 +18,7 @@
 		inline?: boolean
 		nopad?: boolean // Don't pad the icon on the submit button
 		// method?: HTMLFormAttributes["method"]
-		formData: import("sveltekit-superforms").SuperForm<any>
+		formData: import("$lib/validate").SuperForm<any>
 		children: Snippet
 	} & HTMLFormAttributes = $props()
 

Site/src/components/forms/Input.svelte

@@ -25,7 +25,7 @@
 		inline?: boolean
 		column?: boolean
 		disabled?: boolean
-		formData: import("sveltekit-superforms").SuperForm<any>
+		formData: import("$lib/validate").SuperForm<any>
 	} & HTMLInputAttributes = $props()
 
 	let { errors } = $derived(formData)

Site/src/components/forms/Select.svelte

@@ -24,7 +24,7 @@
 		// multiple?: boolean
 		options: string[]
 		selected?: string
-		formData: import("sveltekit-superforms").SuperForm<any>
+		formData: import("$lib/validate").SuperForm<any>
 	} = $props()
 
 	let { form, errors, constraints } = $derived(formData)

Site/src/components/forms/SubInput.svelte

@@ -15,7 +15,7 @@
 		name: string
 		disabled: boolean
 		type: HTMLInputTypeAttribute
-		formData: import("sveltekit-superforms").SuperForm<any>
+		formData: import("$lib/validate").SuperForm<any>
 	} & HTMLInputAttributes = $props()
 
 	let { form, errors, constraints } = $derived(formData)

Site/src/components/forms/Textarea.svelte

@@ -19,7 +19,7 @@
 		rows?: number
 		lowpad?: boolean
 		defaultValue?: string
-		formData: import("sveltekit-superforms").SuperForm<any>
+		formData: import("$lib/validate").SuperForm<any>
 	} & HTMLTextareaAttributes = $props()
 
 	let { form, errors, constraints } = $derived(formData)

Site/src/lib/server/formError.ts

@@ -1,7 +1,7 @@
 // Returns a custom error for a superForm
 
 import { fail } from "@sveltejs/kit"
-import type { SuperValidated } from "sveltekit-superforms"
+import type { SuperValidated } from "$lib/server/validate"
 
 /**
  * Returns a custom error for a superForm.

Site/src/lib/server/ratelimit.ts

@@ -1,8 +1,8 @@
 // TODO: Possibly move this to the database instead of server state
 
 import { fail } from "@sveltejs/kit"
-import type { SuperValidated } from "sveltekit-superforms"
-import { message } from "sveltekit-superforms/server"
+import type { SuperValidated } from "$lib/server/validate"
+import { message } from "$lib/server/validate"
 
 const ratelimitTimewindow = new Map<string, number>()
 const ratelimitRequests = new Map<string, number>()

Site/src/lib/server/validate.ts

@@ -1,4 +1,8 @@
 // I know barrel files suck but I'd like to wrap these functions in the near future
 
 export { arktype } from "sveltekit-superforms/adapters"
-export { message, superValidate } from "sveltekit-superforms/server"
+export {
+	message,
+	type SuperValidated,
+	superValidate,
+} from "sveltekit-superforms/server"