Extract server Superforms utilities into $lib/server/validate for future modification

Heliodex · Heliodex · commit 1500e825a60d · 2025-12-26T18:40:06.000Z
diff --git a/Site/src/lib/server/validate.ts b/Site/src/lib/server/validate.ts
@@ -0,0 +1,4 @@
+// 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"
diff --git a/Site/src/routes/(legal)/report/+page.server.ts b/Site/src/routes/(legal)/report/+page.server.ts
@@ -1,11 +1,10 @@
 import { error } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { message, superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import { db, Record, type RecordId } from "$lib/server/surreal"
+import { arktype, message, superValidate } from "$lib/server/validate"
 import getReporteeQuery from "./getReportee.surql"
 import reportQuery from "./report.surql"
 import reports from "./reports"
diff --git a/Site/src/routes/(main)/admin/accounts/+page.server.ts b/Site/src/routes/(main)/admin/accounts/+page.server.ts
@@ -1,10 +1,9 @@
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { message, superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, message, superValidate } from "$lib/server/validate"
 import { usernameTest } from "$lib/typeTests"
 import updatePasswordQuery from "./updatePassword.surql"
 import usersQuery from "./users.surql"
diff --git a/Site/src/routes/(main)/admin/banners/+page.server.ts b/Site/src/routes/(main)/admin/banners/+page.server.ts
@@ -1,10 +1,9 @@
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { message, superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, message, superValidate } from "$lib/server/validate"
 import type { RequestEvent } from "./$types.d"
 import activeCountQuery from "./activeCount.surql"
 import bannersQuery from "./banners.surql"
diff --git a/Site/src/routes/(main)/admin/create/+page.server.ts b/Site/src/routes/(main)/admin/create/+page.server.ts
@@ -1,12 +1,11 @@
 import fs from "node:fs"
 import { redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import types, { typeToNumber } from "$lib/assetTypes"
 import { authorise } from "$lib/server/auth"
 import formError from "$lib/server/formError"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import createQuery from "./create.surql"
 
 const schema = type({
@@ -46,7 +45,7 @@ actions.default = async ({ locals, request }) => {
 	if (!fs.existsSync("../data/thumbnails")) fs.mkdirSync("../data/thumbnails")
 
 	const { asset, description, name, price, type: assetType } = data
-	form.data.asset = null as unknown as File// make sure to return as a POJO
+	form.data.asset = null as unknown as File // make sure to return as a POJO
 
 	const [, id] = await db.query<string[]>(createQuery, {
 		description,
diff --git a/Site/src/routes/(main)/admin/moderation/+page.server.ts b/Site/src/routes/(main)/admin/moderation/+page.server.ts
@@ -1,11 +1,10 @@
 import { error } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { message, superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import { db, findWhere, Record } from "$lib/server/surreal"
+import { arktype, message, superValidate } from "$lib/server/validate"
 import assocreportQuery from "./assocreport.surql"
 import moderateQuery from "./moderate.surql"
 import moderateeQuery from "./moderatee.surql"
diff --git a/Site/src/routes/(main)/admin/regkeys/+page.server.ts b/Site/src/routes/(main)/admin/regkeys/+page.server.ts
@@ -1,12 +1,11 @@
 import { error } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { message, superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import config from "$lib/server/config"
 import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, message, superValidate } from "$lib/server/validate"
 import type { RequestEvent } from "./$types"
 import createQuery from "./create.surql"
 import disabledQuery from "./disabled.surql"
diff --git a/Site/src/routes/(main)/catalog/[id=asset]/[name]/+page.server.ts b/Site/src/routes/(main)/catalog/[id=asset]/[name]/+page.server.ts
@@ -1,7 +1,5 @@
 import { error, fail, redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import type { Comment } from "$lib/comment"
 import { authorise } from "$lib/server/auth"
 import createCommentQuery from "$lib/server/createComment.surql"
@@ -16,6 +14,7 @@ import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import requestRender from "$lib/server/requestRender"
 import { db, find, Record } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import { couldMatch, encode } from "$lib/urlName"
 import type { RequestEvent } from "./$types"
 import assetQuery from "./asset.surql"
diff --git a/Site/src/routes/(main)/catalog/[id=asset]/[name]/settings/+page.server.ts b/Site/src/routes/(main)/catalog/[id=asset]/[name]/settings/+page.server.ts
@@ -1,10 +1,9 @@
 import { error } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { message, superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import formError from "$lib/server/formError"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, message, superValidate } from "$lib/server/validate"
 import { encode } from "$lib/urlName"
 import assetQuery from "./asset.surql"
 import assetCheckQuery from "./assetCheck.surql"
diff --git a/Site/src/routes/(main)/comment/[comment=strid]/+page.server.ts b/Site/src/routes/(main)/comment/[comment=strid]/+page.server.ts
@@ -1,7 +1,5 @@
 import { error } from "@sveltejs/kit"
 import { type } from "arktype"
-import { superValidate } from "sveltekit-superforms"
-import { arktype } from "sveltekit-superforms/adapters"
 import type { Comment } from "$lib/comment"
 import { authorise } from "$lib/server/auth"
 import commentType from "$lib/server/commentType"
@@ -10,6 +8,7 @@ import filter from "$lib/server/filter"
 import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import removeCommentQuery from "./removeComment.surql"
 
 const schema = type({
diff --git a/Site/src/routes/(main)/develop/create/+page.server.ts b/Site/src/routes/(main)/develop/create/+page.server.ts
@@ -1,8 +1,6 @@
 import fs from "node:fs"
 import { error, redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import { createAsset, getAssetPrice } from "$lib/server/economy"
 import formError from "$lib/server/formError"
@@ -17,6 +15,7 @@ import {
 import ratelimit from "$lib/server/ratelimit"
 import requestRender from "$lib/server/requestRender"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import { graphicAsset } from "$lib/server/xmlAsset"
 import { encode } from "$lib/urlName"
 import assetTypes from "./assetTypes"
diff --git a/Site/src/routes/(main)/forum/create/+page.server.ts b/Site/src/routes/(main)/forum/create/+page.server.ts
@@ -1,14 +1,13 @@
 import { error, redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import createCommentQuery from "$lib/server/createComment.surql"
 import exclude from "$lib/server/exclude"
 import filter from "$lib/server/filter"
 import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 
 const schema = type({
 	// title: "1 <= string <= 50",
diff --git a/Site/src/routes/(main)/forum/create/category/+page.server.ts b/Site/src/routes/(main)/forum/create/category/+page.server.ts
@@ -1,12 +1,11 @@
 import { redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import exclude from "$lib/server/exclude"
 import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import { db } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import createQuery from "./create.surql"
 
 const schema = type({
diff --git a/Site/src/routes/(main)/games/create/+page.server.ts b/Site/src/routes/(main)/games/create/+page.server.ts
@@ -1,13 +1,12 @@
 import { redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 // import { createPlace, getPlacePrice } from "$lib/server/economy"
 import filter from "$lib/server/filter"
 import formError from "$lib/server/formError"
 import { randomAssetId } from "$lib/server/id"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import {
 	maxPlayersTest,
 	serverAddressTest,
diff --git a/Site/src/routes/(main)/groups/create/+page.server.ts b/Site/src/routes/(main)/groups/create/+page.server.ts
@@ -1,12 +1,11 @@
 import { error, redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import { createGroup, getGroupPrice } from "$lib/server/economy"
 import exclude from "$lib/server/exclude"
 import formError from "$lib/server/formError"
 import { db, findWhere, Record } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import createQuery from "./create.surql"
 
 const schema = type({
diff --git a/Site/src/routes/(main)/home/+page.server.ts b/Site/src/routes/(main)/home/+page.server.ts
@@ -1,12 +1,11 @@
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import createCommentQuery from "$lib/server/createComment.surql"
 import filter from "$lib/server/filter"
 import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import homeQuery from "./home.surql"
 
 const schema = type({
diff --git a/Site/src/routes/(main)/place/[id=asset]/[name]/settings/+page.server.ts b/Site/src/routes/(main)/place/[id=asset]/[name]/settings/+page.server.ts
@@ -2,12 +2,11 @@ import fs from "node:fs"
 import { error } from "@sveltejs/kit"
 import { type } from "arktype"
 import sharp from "sharp"
-import { arktype } from "sveltekit-superforms/adapters"
-import { message, superValidate } from "sveltekit-superforms/server"
 import { authorise } from "$lib/server/auth"
 import filter from "$lib/server/filter"
 import formError from "$lib/server/formError"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, message, superValidate } from "$lib/server/validate"
 import {
 	maxPlayersTest,
 	serverAddressTest,
diff --git a/Site/src/routes/(main)/settings/+page.server.ts b/Site/src/routes/(main)/settings/+page.server.ts
@@ -1,11 +1,10 @@
 import { redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { message, superValidate } from "sveltekit-superforms/server"
 import { authorise, cookieName, invalidateAllSessions } from "$lib/server/auth"
 import config from "$lib/server/config"
 import formError from "$lib/server/formError"
 import { db, Record } from "$lib/server/surreal"
+import { arktype, message, superValidate } from "$lib/server/validate"
 import passwordQuery from "./password.surql"
 import updateProfileQuery from "./updateProfile.surql"
 
diff --git a/Site/src/routes/(plain)/login/+page.server.ts b/Site/src/routes/(plain)/login/+page.server.ts
@@ -1,11 +1,10 @@
 import { redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import { cookieName, cookieOptions, createSession } from "$lib/server/auth"
 import config from "$lib/server/config"
 import formError from "$lib/server/formError"
 import { db, type RecordId } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import { usernameTest } from "$lib/typeTests"
 import accountRegistered from "../accountRegistered"
 import userQuery from "./user.surql"
diff --git a/Site/src/routes/(plain)/recover/+page.server.ts b/Site/src/routes/(plain)/recover/+page.server.ts
@@ -1,13 +1,12 @@
 import { redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import { dev } from "$app/environment"
 import config from "$lib/server/config"
 import { sendEmail } from "$lib/server/email"
 import formError from "$lib/server/formError"
 import ratelimit from "$lib/server/ratelimit"
 import { db } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import recoveryQuery from "./recovery.surql"
 
 const schema = type({
@@ -45,8 +44,8 @@ actions.default = async ({ cookies, request, getClientAddress }) => {
 	const form = await superValidate(request, arktype(schema))
 	if (!form.valid) return formError(form)
 
-	// const limit = ratelimit(form, "recover", getClientAddress, 30)
-	// if (limit) return limit
+	const limit = ratelimit(form, "recover", getClientAddress, 30)
+	if (limit) return limit
 
 	const { email } = form.data
 	cookies.set("recoverEmail", email, cookieOptions)
diff --git a/Site/src/routes/(plain)/recover/code/+page.server.ts b/Site/src/routes/(plain)/recover/code/+page.server.ts
@@ -1,10 +1,9 @@
 import { redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import { cookieName, cookieOptions, createSession } from "$lib/server/auth"
 import formError from "$lib/server/formError"
 import { db, type RecordId } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import findUserQuery from "./findUser.surql"
 
 const schema = type({
diff --git a/Site/src/routes/(plain)/register/+page.server.ts b/Site/src/routes/(plain)/register/+page.server.ts
@@ -1,12 +1,11 @@
 import { redirect } from "@sveltejs/kit"
 import { type } from "arktype"
-import { arktype } from "sveltekit-superforms/adapters"
-import { superValidate } from "sveltekit-superforms/server"
 import { cookieName, cookieOptions, createSession } from "$lib/server/auth"
 import config from "$lib/server/config"
 import formError from "$lib/server/formError"
 import requestRender from "$lib/server/requestRender"
 import { db, findWhere, Record, type RecordId } from "$lib/server/surreal"
+import { arktype, superValidate } from "$lib/server/validate"
 import { usernameTest } from "$lib/typeTests"
 import accountRegistered from "../accountRegistered"
 import createUserQuery from "./createUser.surql"
