Merge pull request #275 from flo-bit/fix-formatting-once-again

fix formatting

Author: flo-bit

.gitignore

@@ -24,4 +24,6 @@ vite.config.ts.timestamp-*
 
 references
 
-sveltekit-cloudflare-workers
+sveltekit-cloudflare-workers
+
+inlay

.prettierignore

@@ -2,3 +2,6 @@
 package-lock.json
 pnpm-lock.yaml
 yarn.lock
+
+# Unrelated sub-project
+inlay

eslint.config.js

@@ -44,6 +44,7 @@ export default [
 			'svelte/no-at-html-tags': 'off',
 			'@typescript-eslint/no-explicit-any': 'off',
 			'no-unused-vars': 'off',
+			'no-useless-assignment': 'off',
 			'@typescript-eslint/no-unused-vars': [
 				'warn',
 				{

scripts/simulate-load.ts

@@ -4,19 +4,21 @@
  *
  * Usage: npx tsx scripts/atproto.ts listRecords <handle> app.blento.card 2>/dev/null | npx tsx scripts/simulate-load.ts
  */
-import {
-	correctBounds,
-	verticalCompactor,
-	type LayoutItem
-} from 'react-grid-layout/core';
+import { correctBounds, verticalCompactor, type LayoutItem } from 'react-grid-layout/core';
 import * as fs from 'fs';
 
 const COLUMNS = 8;
 
 type Item = {
 	id: string;
-	x: number; y: number; w: number; h: number;
-	mobileX: number; mobileY: number; mobileW: number; mobileH: number;
+	x: number;
+	y: number;
+	w: number;
+	h: number;
+	mobileX: number;
+	mobileY: number;
+	mobileW: number;
+	mobileH: number;
 	cardType: string;
 };
 
@@ -33,8 +35,13 @@ function applyLayout(items: Item[], layout: LayoutItem[], mobile: boolean) {
 	for (const l of layout) {
 		const item = map.get(l.i);
 		if (!item) continue;
-		if (mobile) { item.mobileX = l.x; item.mobileY = l.y; }
-		else { item.x = l.x; item.y = l.y; }
+		if (mobile) {
+			item.mobileX = l.x;
+			item.mobileY = l.y;
+		} else {
+			item.x = l.x;
+			item.y = l.y;
+		}
 	}
 }
 
@@ -60,9 +67,14 @@ const cards: Item[] = records
 	.filter((r: any) => r.value.cardType && (!r.value.page || r.value.page === 'blento.self'))
 	.map((r: any) => ({
 		id: r.value.id,
-		x: r.value.x, y: r.value.y, w: r.value.w, h: r.value.h,
-		mobileX: r.value.mobileX, mobileY: r.value.mobileY,
-		mobileW: r.value.mobileW, mobileH: r.value.mobileH,
+		x: r.value.x,
+		y: r.value.y,
+		w: r.value.w,
+		h: r.value.h,
+		mobileX: r.value.mobileX,
+		mobileY: r.value.mobileY,
+		mobileW: r.value.mobileW,
+		mobileH: r.value.mobileH,
 		cardType: r.value.cardType
 	}));
 
@@ -86,7 +98,9 @@ for (const card of cards) {
 		console.log(
 			`${orig.cardType.padEnd(20)} id=${orig.id}` +
 				(dChanged ? `  DESKTOP: (${orig.x},${orig.y}) → (${card.x},${card.y})` : '') +
-				(mChanged ? `  MOBILE: (${orig.mobileX},${orig.mobileY}) → (${card.mobileX},${card.mobileY})` : '')
+				(mChanged
+					? `  MOBILE: (${orig.mobileX},${orig.mobileY}) → (${card.mobileX},${card.mobileY})`
+					: '')
 		);
 		if (dChanged) desktopChanges++;
 		if (mChanged) mobileChanges++;
@@ -101,8 +115,9 @@ if (desktopChanges === 0 && mobileChanges === 0) {
 
 // Check for ORDER changes in mobile layout
 console.log('\n=== Mobile reading order (y, then x) ===');
-const sortByMobile = (items: { id: string; mobileX: number; mobileY: number; cardType: string }[]) =>
-	[...items].sort((a, b) => a.mobileY - b.mobileY || a.mobileX - b.mobileX);
+const sortByMobile = (
+	items: { id: string; mobileX: number; mobileY: number; cardType: string }[]
+) => [...items].sort((a, b) => a.mobileY - b.mobileY || a.mobileX - b.mobileX);
 
 const origOrder = sortByMobile(originals);
 const newOrder = sortByMobile(cards);
@@ -111,13 +126,13 @@ let orderChanges = 0;
 for (let i = 0; i < origOrder.length; i++) {
 	const same = origOrder[i].id === newOrder[i].id;
 	if (!same) orderChanges++;
-	const orig = originals.find(o => o.id === newOrder[i].id)!;
-	const card = cards.find(c => c.id === newOrder[i].id)!;
+	const orig = originals.find((o) => o.id === newOrder[i].id)!;
+	const card = cards.find((c) => c.id === newOrder[i].id)!;
 	console.log(
 		`${i.toString().padStart(2)}: ${same ? '  ' : '!!'} ` +
-		`${card.cardType.padEnd(20)} ` +
-		`was (${orig.mobileX},${orig.mobileY}) → now (${card.mobileX},${card.mobileY})` +
-		(!same ? `  [was #${origOrder.findIndex(o => o.id === newOrder[i].id)}]` : '')
+			`${card.cardType.padEnd(20)} ` +
+			`was (${orig.mobileX},${orig.mobileY}) → now (${card.mobileX},${card.mobileY})` +
+			(!same ? `  [was #${origOrder.findIndex((o) => o.id === newOrder[i].id)}]` : '')
 	);
 }
 console.log(`\n${orderChanges} order changes in mobile layout.`);

src/lib/cards/media/SecretImageCard/EditingSecretImageCard.svelte

@@ -102,5 +102,4 @@
 			</div>
 		{/if}
 	</button>
-
 </div>

src/lib/cards/media/StatusphereCard/EditStatusphereCard.svelte

@@ -29,9 +29,7 @@
 	let mode = $derived(item.cardData?.mode ?? 'emoji');
 	// Emoji mode: use cardData. Statusphere mode: use latest record or preview.
 	let emoji = $derived(
-		mode === 'statusphere'
-			? (item.cardData?.emoji ?? record?.value?.status)
-			: item.cardData?.emoji
+		mode === 'statusphere' ? (item.cardData?.emoji ?? record?.value?.status) : item.cardData?.emoji
 	);
 
 	let showPopover = $state(false);

src/lib/cards/media/StatusphereCard/StatusphereCard.svelte

@@ -11,9 +11,7 @@
 
 	let mode = $derived(item.cardData?.mode ?? 'emoji');
 	// Emoji mode: use cardData. Statusphere mode: use latest record from PDS.
-	let emoji = $derived(
-		mode === 'statusphere' ? record?.value?.status : item.cardData?.emoji
-	);
+	let emoji = $derived(mode === 'statusphere' ? record?.value?.status : item.cardData?.emoji);
 	let animated = $derived(emojiToNotoAnimatedWebp(emoji));
 </script>
 

src/lib/cards/social/KichRecipeCard/KichRecipeCard.svelte

@@ -121,7 +121,7 @@
 				<img
 					src={imageUrl}
 					alt={title}
-					class="recipe-image rounded-t-xl aspect-16/9 w-full object-cover"
+					class="recipe-image aspect-16/9 w-full rounded-t-xl object-cover"
 				/>
 				<div class="image-overlay pointer-events-none absolute inset-0"></div>
 				<div class="compact-overlay pointer-events-none absolute right-0 bottom-0 left-0 p-4">

src/lib/cards/social/KichRecipeCollectionCard/KichRecipeCollectionCard.svelte

@@ -84,10 +84,10 @@
 			class="relative block min-h-0 flex-1"
 		>
 			{#if imageUrl}
-				<img src={imageUrl} alt={title} class="rounded-t-xl h-full w-full object-cover" />
+				<img src={imageUrl} alt={title} class="h-full w-full rounded-t-xl object-cover" />
 			{:else}
 				<div
-					class="rounded-t-xl from-base-300 to-base-200 dark:from-base-800 dark:to-base-900 h-full w-full bg-gradient-to-br"
+					class="from-base-300 to-base-200 dark:from-base-800 dark:to-base-900 h-full w-full rounded-t-xl bg-gradient-to-br"
 				></div>
 			{/if}
 

src/lib/website/EditableWebsite.svelte

@@ -586,8 +586,8 @@
 			<p class="text-base-700 dark:text-base-300 text-xl font-bold">Layout Auto-Fixed</p>
 			<p class="text-base-500 dark:text-base-400 text-sm">
 				Your card layout had overlapping cards from an older version. This has been automatically
-				fixed, but some cards may have moved. Please check your layout and rearrange if needed,
-				then save to keep the changes.
+				fixed, but some cards may have moved. Please check your layout and rearrange if needed, then
+				save to keep the changes.
 			</p>
 			<Button class="w-full" onclick={acknowledgeLayoutFix}>Got it</Button>
 		</div>