Split the server API module into client, guards, form fields and action helpers

web-player/src/routes/(app)/+layout.server.ts

@@ -1,6 +1,7 @@
 import type { LayoutServerLoad } from './$types';
 import { getAllowAnonymousListening } from '$lib/server/playbackConfig';
-import { apiFor, loginRedirect } from '$lib/server/api';
+import { apiFor } from '$lib/server/api';
+import { loginRedirect } from '$lib/server/guards';
 import { toLikedTrack, toPlaylist, toTrack } from '$lib/server/mappers';
 import { authConfig } from '$lib/server/config';
 import { LIKED_TRACKS_PAGE_SIZE, PLAYLIST_PICKER_PAGE_SIZE } from '$lib/config';

web-player/src/routes/(app)/+page.server.ts

@@ -1,8 +1,9 @@
 import { redirect } from '@sveltejs/kit';
 import type { PageServerLoad, Actions } from './$types';
-import { apiFor, requireUser } from '$lib/server/api';
+import { apiFor } from '$lib/server/api';
+import { requireUser } from '$lib/server/guards';
 import { toMix, toPlaylist, toTrack } from '$lib/server/mappers';
-import { addTrackAction } from '$lib/server/playlistActions';
+import { addTrackAction } from '$lib/server/actions/playlist';
 import { HOME_MIXES_LIMIT, HOME_SHELF_LIMIT, HOME_SPOTLIGHT_TRACKS_LIMIT } from '$lib/config';
 import { pickGreeting } from '$lib/server/greeting';
 

web-player/src/routes/(app)/albums/+page.server.ts

@@ -1,6 +1,9 @@
 import type { PageServerLoad, Actions } from './$types';
 import { fail, redirect } from '@sveltejs/kit';
-import { apiFor, authedAction, formFile, requireUser, unwrapOrError } from '$lib/server/api';
+import { apiFor, unwrapOrError } from '$lib/server/api';
+import { requireUser } from '$lib/server/guards';
+import { formFile } from '$lib/server/forms/fields';
+import { authedAction } from '$lib/server/actions/authedAction';
 import { toAlbum, toPage } from '$lib/server/mappers';
 import { ALBUMS_PAGE_SIZE } from '$lib/config';
 import { parseAlbumForm } from '$lib/server/forms/albumForm';

web-player/src/routes/(app)/albums/[id]/+page.server.ts

@@ -1,14 +1,9 @@
 import type { PageServerLoad, Actions } from './$types';
 import { fail, redirect } from '@sveltejs/kit';
-import {
-	apiFor,
-	authedAction,
-	failOnError,
-	formFile,
-	formString,
-	optionalUser,
-	unwrapOrError
-} from '$lib/server/api';
+import { apiFor, failOnError, unwrapOrError } from '$lib/server/api';
+import { optionalUser } from '$lib/server/guards';
+import { formFile, formString } from '$lib/server/forms/fields';
+import { authedAction } from '$lib/server/actions/authedAction';
 import { toAlbum, toTrack } from '$lib/server/mappers';
 import { ALBUM_TRACKS_PAGE_SIZE, LIBRARY_PICKER_PAGE_SIZE } from '$lib/config';
 import { parseAlbumForm } from '$lib/server/forms/albumForm';

web-player/src/routes/(app)/explore/+page.server.ts

@@ -2,7 +2,7 @@ import type { PageServerLoad, Actions } from './$types';
 import { apiFor, unwrapOrError } from '$lib/server/api';
 import { getGenres } from '$lib/server/genres';
 import { toAlbum, toPage, toTrack } from '$lib/server/mappers';
-import { addAlbumToPlaylistAction, addTrackAction } from '$lib/server/playlistActions';
+import { addAlbumToPlaylistAction, addTrackAction } from '$lib/server/actions/playlist';
 import { EXPLORE_ALBUMS_PAGE_SIZE, EXPLORE_PAGE_SIZE, EXPLORE_USERS_LIMIT } from '$lib/config';
 
 export const load: PageServerLoad = async ({ url, locals, fetch }) => {

web-player/src/routes/(app)/library/+page.server.ts

@@ -1,14 +1,10 @@
 import type { PageServerLoad, Actions } from './$types';
 import { fail } from '@sveltejs/kit';
 import { toDatedTrack, toPage } from '$lib/server/mappers';
-import {
-	apiFor,
-	authedAction,
-	failOnError,
-	formString,
-	requireUser,
-	unwrapOrError
-} from '$lib/server/api';
+import { apiFor, failOnError, unwrapOrError } from '$lib/server/api';
+import { requireUser } from '$lib/server/guards';
+import { formString } from '$lib/server/forms/fields';
+import { authedAction } from '$lib/server/actions/authedAction';
 import { LIBRARY_PAGE_SIZE } from '$lib/config';
 
 export const load: PageServerLoad = async ({ locals, url, fetch }) => {

web-player/src/routes/(app)/mixes/[id]/+page.server.ts

@@ -1,7 +1,8 @@
 import type { PageServerLoad, Actions } from './$types';
-import { apiFor, requireUser, unwrapOrError } from '$lib/server/api';
+import { apiFor, unwrapOrError } from '$lib/server/api';
+import { requireUser } from '$lib/server/guards';
 import { toMix } from '$lib/server/mappers';
-import { addTrackAction } from '$lib/server/playlistActions';
+import { addTrackAction } from '$lib/server/actions/playlist';
 
 export const load: PageServerLoad = async ({ params, locals, url, fetch }) => {
 	requireUser(locals, url);

web-player/src/routes/(app)/playlists/+page.server.ts

@@ -1,6 +1,8 @@
 import type { PageServerLoad, Actions } from './$types';
 import { fail, redirect } from '@sveltejs/kit';
-import { apiFor, authedAction, requireUser, unwrapOrError } from '$lib/server/api';
+import { apiFor, unwrapOrError } from '$lib/server/api';
+import { requireUser } from '$lib/server/guards';
+import { authedAction } from '$lib/server/actions/authedAction';
 import { PLAYLISTS_PAGE_SIZE } from '$lib/config';
 import { toPlaylist } from '$lib/server/mappers';
 import { parsePlaylistForm } from '$lib/server/forms/playlistForm';

web-player/src/routes/(app)/playlists/[id]/+page.server.ts

@@ -1,13 +1,9 @@
 import type { PageServerLoad, Actions } from './$types';
 import { fail, redirect } from '@sveltejs/kit';
-import {
-	apiFor,
-	authedAction,
-	failOnError,
-	formString,
-	optionalUser,
-	unwrapOrError
-} from '$lib/server/api';
+import { apiFor, failOnError, unwrapOrError } from '$lib/server/api';
+import { optionalUser } from '$lib/server/guards';
+import { formString } from '$lib/server/forms/fields';
+import { authedAction } from '$lib/server/actions/authedAction';
 import { PLAYLIST_TRACKS_PAGE_SIZE } from '$lib/config';
 import { toDatedTrack, toPlaylist } from '$lib/server/mappers';
 import { parsePlaylistForm } from '$lib/server/forms/playlistForm';

web-player/src/routes/(app)/upload/+page.server.ts

@@ -1,6 +1,8 @@
 import type { Actions, PageServerLoad } from './$types';
 import { fail } from '@sveltejs/kit';
-import { apiFor, authedAction, requireData, requireUser } from '$lib/server/api';
+import { apiFor, requireData } from '$lib/server/api';
+import { requireUser } from '$lib/server/guards';
+import { authedAction } from '$lib/server/actions/authedAction';
 import { parseTrackUploadForm } from '$lib/server/forms/trackUploadForm';
 import { putPresigned, extOf, contentTypeOf, AUDIO_TYPES, IMAGE_TYPES } from '$lib/server/upload';
 import { findConflict, genreInfo } from '$lib/data/genres';

web-player/src/routes/(app)/user/[id]/+page.server.ts

@@ -1,8 +1,9 @@
 import type { PageServerLoad, Actions } from './$types';
-import { apiFor, optionalUser, unwrapOrError } from '$lib/server/api';
+import { apiFor, unwrapOrError } from '$lib/server/api';
+import { optionalUser } from '$lib/server/guards';
 import { toPlaylist } from '$lib/server/mappers';
 import { PROFILE_PLAYLISTS_PAGE_SIZE } from '$lib/config';
-import { followUserAction, unfollowUserAction } from '$lib/server/followActions';
+import { followUserAction, unfollowUserAction } from '$lib/server/actions/follow';
 
 export const load: PageServerLoad = async ({ params, locals, url, fetch, parent }) => {
 	const { allowAnonymousListening } = await parent();

web-player/src/routes/(app)/user/[id]/[list=followList]/+page.server.ts

@@ -1,5 +1,6 @@
 import type { PageServerLoad } from './$types';
-import { apiFor, optionalUser, unwrapOrError } from '$lib/server/api';
+import { apiFor, unwrapOrError } from '$lib/server/api';
+import { optionalUser } from '$lib/server/guards';
 import { toPage } from '$lib/server/mappers';
 import { fetchFollowList } from '$lib/server/follows';
 import { FOLLOW_LIST_PAGE_SIZE } from '$lib/config';