Fix up code

Author: oliverturner

package-lock.json

@@ -1 +1,6 @@
 export const PAGE_FIELDS = "offset,limit,total,previous,next";
+
+export const DEFAULT_PARAMS = {
+	offset: 0,
+	limit: 20,
+};

src/lib/constants.ts

@@ -5,11 +5,11 @@ import { json } from "@sveltejs/kit";
 import { queryApiFn } from "$lib/server/api";
 import { mergeParams } from "$lib/utils/data";
 import { getEndpoint } from "$lib/utils/spotify.js";
+import { DEFAULT_PARAMS } from "$lib/constants.js";
 
 const getDefaultParams = () => ({
+	...DEFAULT_PARAMS,
 	market: "from_token",
-	limit: 50,
-	offset: 0,
 });
 
 export async function GET({ locals, url }) {

src/routes/api/albums/+server.ts

@@ -5,11 +5,11 @@ import { json } from "@sveltejs/kit";
 import { mergeParams } from "$lib/utils/data.js";
 import { getEndpoint } from "$lib/utils/spotify.js";
 import { queryApiFn } from "$lib/server/api";
+import { DEFAULT_PARAMS } from "$lib/constants.js";
 
 const getDefaultParams = () => ({
+	...DEFAULT_PARAMS,
 	time_range: "short_term",
-	limit: 25,
-	offset: 0,
 });
 
 export async function GET({ locals, url }) {

src/routes/api/artists/top/+server.ts

@@ -5,10 +5,10 @@ import { json } from "@sveltejs/kit";
 import { queryApiFn } from "$lib/server/api";
 import { mergeParams } from "$lib/utils/data";
 import { getEndpoint } from "$lib/utils/spotify.js";
+import { DEFAULT_PARAMS } from "$lib/constants.js";
 
 const getDefaultParams = () => ({
-	limit: 50,
-	offset: 0,
+	...DEFAULT_PARAMS,
 });
 
 export async function GET({ locals, url }) {

src/routes/api/playlists/+server.ts

@@ -6,12 +6,12 @@ import { json } from "@sveltejs/kit";
 import { queryApiFn } from "$lib/server/api.js";
 import { mergeParams } from "$lib/utils/data.js";
 import { getEndpoint } from "$lib/utils/spotify.js";
+import { DEFAULT_PARAMS } from "$lib/constants.js";
 
 const getDefaultParams = () => ({
+	...DEFAULT_PARAMS,
 	fields: `id,name,description,images`,
 	market: "from_token",
-	limit: 50,
-	offset: 0,
 });
 
 export async function GET({ locals, params, fetch, url }) {

src/routes/api/playlists/[id]/+server.ts

@@ -6,6 +6,7 @@ import { queryApiFn } from "$lib/server/api";
 import { mergeParams } from "$lib/utils/data.js";
 import { getEndpoint } from "$lib/utils/spotify.js";
 import { injectAudio } from "$lib/utils/track.js";
+import { DEFAULT_PARAMS } from "$lib/constants.js";
 
 const trackFields = [
 	"id",
@@ -20,8 +21,7 @@ const trackFields = [
 ].join(",");
 
 const getDefaultParams = () => ({
-	offset: 0,
-	limit: 50,
+	...DEFAULT_PARAMS,
 	market: "from_token",
 	fields: `limit,offset,total,next,previous,items(track(${trackFields}))`,
 });

src/routes/api/playlists/[id]/tracks/+server.ts

@@ -7,11 +7,11 @@ import { queryApiFn } from "$lib/server/api.js";
 import { injectAudio } from "$lib/utils/track.js";
 import { mergeParams } from "$lib/utils/data.js";
 import { getEndpoint } from "$lib/utils/spotify.js";
+import { DEFAULT_PARAMS } from "$lib/constants.js";
 
 const getDefaultParams = () => ({
+	...DEFAULT_PARAMS,
 	time_range: "long_term",
-	limit: 50,
-	offset: 0,
 });
 
 export async function GET({ locals, url }) {

src/routes/api/tracks/+server.ts

@@ -3,8 +3,9 @@ import type { LayoutLoad } from "./$types";
 
 export const load: LayoutLoad = async ({ fetch }) => {
 	const res = await fetch("/api/albums?offset=0");
+	const albums: Page<SavedAlbum> = await res.json();
 
 	return {
-		albums: res.json() as Promise<Page<SavedAlbum>>,
+		albums,
 	};
 };

src/routes/app/albums/+layout.ts

@@ -5,8 +5,9 @@ import type { PageLoad } from "./$types";
 
 export const load: PageLoad = async ({ fetch, params }) => {
 	const res = await fetch(`/api/albums/${params.id}`);
+	const album: Album = await res.json();
 
 	return {
-		album: res.json() as Promise<Album>,
+		album,
 	};
 };