Attempt custom implementations of some Superforms functions

Author: Heliodex

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 "$lib/server/validate"
+import type { Form } from "$lib/validate"
 
 /**
  * Returns a custom error for a superForm.
@@ -12,13 +12,9 @@ import type { SuperValidated } from "$lib/server/validate"
  * @example
  * return formError(form, ["password"], ["Username or password is incorrect"])
  */
-export default (
-	form: SuperValidated<
-		{ [_: string]: unknown },
-		unknown,
-		{ [_: string]: unknown }
-	>,
-	fields?: string[],
+export default <T>(
+	form: Form<T>,
+	fields?: (keyof T)[],
 	messages?: string[]
 ) => {
 	form.valid = false

Site/src/lib/server/validate.ts

@@ -1,13 +1,15 @@
 // I know barrel files suck but I'd like to wrap these functions in the near future
 
 import type { ActionFailure } from "@sveltejs/kit"
+import type { Type } from "arktype"
 import { message as ogMessage, type SuperValidated } from "sveltekit-superforms"
+import type { Form } from "$lib/validate"
 
-export { arktype } from "sveltekit-superforms/adapters"
+// export { arktype } from "sveltekit-superforms/adapters"
 export {
 	message,
 	type SuperValidated,
-	superValidate,
+	// superValidate,
 } from "sveltekit-superforms/server"
 
 export function errMessage<
@@ -23,3 +25,26 @@ export function errMessage<
 	form.valid = false
 	return ogMessage(form, message)
 }
+
+export function arktype<T>(schema: T) {
+	return schema
+}
+
+export async function superValidate<T>(
+	request: Request | null,
+	schema: Type<T>
+): Promise<Form<T>> {
+	if (!request) {
+		return {
+			valid: true,
+			errors: {},
+			data: schema as T,
+		}
+	}
+
+	return {
+		valid: false,
+		errors: {},
+		data: {} as T,
+	}
+}

Site/src/lib/validate.ts

@@ -1,3 +1,11 @@
 // client version of $lib/server/validate
 
 export { type SuperForm, superForm } from "sveltekit-superforms/client"
+
+type FormErrors<T> = { [K in keyof T]?: string[] }
+
+export type Form<T> = {
+	valid: boolean
+	errors: FormErrors<T>
+	data: T
+}

Site/src/routes/(legal)/report/+page.server.ts

@@ -40,7 +40,7 @@ export async function load({ locals, url }) {
 	return {
 		reportee,
 		url: reportedUrl,
-		form: await superValidate(arktype(schema)),
+		form: await superValidate(null, arktype(schema)),
 	}
 }
 

Site/src/routes/(main)/admin/accounts/+page.server.ts

@@ -25,7 +25,7 @@ export async function load({ locals }) {
 	const [users] = await db.query<BasicUser[][]>(usersQuery)
 
 	return {
-		form: await superValidate(arktype(schema)),
+		form: await superValidate(null, arktype(schema)),
 		users,
 	}
 }
@@ -47,8 +47,7 @@ actions.changePassword = async ({ locals, request, getClientAddress }) => {
 			npassword: Bun.password.hashSync(password),
 			username: username,
 		})
-		if (!ok)
-			return errMessage(form, "No user found with given username")
+		if (!ok) return errMessage(form, "No user found with given username")
 	} catch (e) {
 		console.error(e)
 		return errMessage(form, "An error occurred")

Site/src/routes/(main)/admin/banners/+page.server.ts

@@ -34,7 +34,7 @@ export async function load({ locals }) {
 	await authorise(locals, 5)
 
 	const [banners] = await db.query<BannerType[][]>(bannersQuery)
-	return { banners, form: await superValidate(arktype(schema)) }
+	return { banners, form: await superValidate(null, arktype(schema)) }
 }
 
 async function bannerActiveCount() {

Site/src/routes/(main)/admin/create/+page.server.ts

@@ -30,7 +30,7 @@ export async function load({ locals }) {
 	await authorise(locals, 3)
 
 	return {
-		form: await superValidate(arktype(schema)),
+		form: await superValidate(null, arktype(schema)),
 	}
 }
 

Site/src/routes/(main)/admin/moderation/+page.server.ts

@@ -30,7 +30,8 @@ export async function load({ locals, url }) {
 	await authorise(locals, 4)
 
 	const associatedReport = url.searchParams.get("report")
-	if (!associatedReport) return { form: await superValidate(arktype(schema)) }
+	if (!associatedReport)
+		return { form: await superValidate(null, arktype(schema)) }
 
 	const [report] = await db.query<
 		({ note: string; reportee: string } | undefined)[]

Site/src/routes/(main)/admin/regkeys/+page.server.ts

@@ -39,7 +39,7 @@ export async function load({ locals }) {
 
 	const [regKeys] = await db.query<RegKey[][]>(regkeysQuery)
 	return {
-		form: await superValidate(arktype(schema)),
+		form: await superValidate(null, arktype(schema)),
 		regKeys,
 		prefix: config.Registration.Keys.Prefix,
 	}

Site/src/routes/(main)/catalog/[id=asset]/[name]/+page.server.ts

@@ -70,7 +70,7 @@ export async function load({ fetch: f, locals, params }) {
 	return {
 		noText: noTexts[Math.floor(Math.random() * noTexts.length)],
 		failText: failTexts[Math.floor(Math.random() * failTexts.length)],
-		form: await superValidate(arktype(schema)),
+		form: await superValidate(null, arktype(schema)),
 		slug,
 		asset,
 		balance: balance.value,