simplify tools imports

app/AppContext.tsx

@@ -2,6 +2,7 @@
 
 import { createContext, useContext, useEffect, useState } from 'react';
 import useSocket from '@/hooks/useSocket';
+import { reduceTilts } from '@/tools';
 
 import { GAME_START, LOCAL_DEFAULTS } from '@/constants';
 import type { Dispatch, ReactNode, SetStateAction } from 'react';
@@ -15,7 +16,7 @@ export interface AppContext {
 	noGame: boolean;
 	selectCardIndex: number;
 	settings: Settings;
-	tilt: Tilt[];
+	tilts: Tilt[];
 	emitFlip: (cardIndex: number) => void;
 	emitSettings: (gameData: GameUpdate) => void;
 	emitRedraw: (cardIndex: number) => void;
@@ -23,7 +24,7 @@ export interface AppContext {
 	setGameID: (gameID: string) => void;
 	setLocalSettings: Dispatch<SetStateAction<LocalSettings>>;
 	setSelectCardIndex: (cardIndex: number) => void;
-	setTilt: (tilt: Tilt[]) => void;
+	setLocalTilt: (tilt: Tilt[]) => void;
 }
 
 export function AppProvider({ children }: { children: ReactNode }) {
@@ -32,7 +33,7 @@ export function AppProvider({ children }: { children: ReactNode }) {
 	const [gameID, setGameID] = useState('');
 	const [noGame, setNoGame] = useState(false);
 	const [selectCardIndex, setSelectCardIndex] = useState(-1);
-	const [tilt, setTilt] = useState<Tilt[]>([]);
+	const [localTilt, setLocalTilt] = useState<Tilt[]>([]);
 
 	const { emitFlip, emitRedraw, emitSelect, emitSettings, emitTilt } = useSocket({
 		gameID,
@@ -42,17 +43,17 @@ export function AppProvider({ children }: { children: ReactNode }) {
 
 	useEffect(() => {
 		if (localSettings.remoteTilt) {
-			const cardIndex = tilt.findIndex((tilt) => !!tilt);
+			const cardIndex = localTilt.findIndex((tilt) => !!tilt);
 
-			if (tilt[cardIndex]) {
+			if (localTilt[cardIndex]) {
-				emitTilt(cardIndex, tilt[cardIndex]);
+				emitTilt(cardIndex, localTilt[cardIndex]);
 			} else {
 				// cardIndex does not matter
 				// all tilts for this user will be cleared
-				emitTilt(0, { rotateX: 0, rotateY: 0 });
+				emitTilt(0, { percentX: -1, percentY: -1, rotateX: 0, rotateY: 0 });
 			}
 		}
-	}, [tilt, localSettings]);
+	}, [localTilt, localSettings]);
 
 	const handleSelect = (cardID: string) => {
 		setSelectCardIndex(-1);
@@ -69,7 +70,7 @@ export function AppProvider({ children }: { children: ReactNode }) {
 		noGame,
 		selectCardIndex,
 		settings: { ...gameData.settings, ...localSettings },
-		tilt,
+		tilts: reduceTilts(gameData, localTilt),
 		emitFlip,
 		emitSettings,
 		emitRedraw,
@@ -77,7 +78,7 @@ export function AppProvider({ children }: { children: ReactNode }) {
 		setGameID,
 		setLocalSettings,
 		setSelectCardIndex,
-		setTilt,
+		setLocalTilt,
 	};
 
 	return <AppContext.Provider value={appInterface}>{children}</AppContext.Provider>;

components/Card.tsx

@@ -6,8 +6,7 @@ import TiltCard from '@/components/TiltCard';
 import ToolTip from '@/components/ToolTip';
 import StackTheDeck from '@/components/StackTheDeck';
 import Sheen from '@/components/Sheen';
-import getCardInfo from '@/tools/getCardInfo';
+import { getCardInfo, getURL } from '@/tools';
-import getURL from '@/tools/getURL';
 
 import tarokkaCards from '@/constants/tarokkaCards';
 import { layout } from '@/constants/tarokka';

components/CardSelect.tsx

@@ -3,7 +3,7 @@
 import { CircleX } from 'lucide-react';
 import { useAppContext } from '@/app/AppContext';
 import TarokkaDeck from '@/lib/TarokkaDeck';
-import getURL from '@/tools/getURL';
+import { getURL } from '@/tools';
 
 import { Deck } from '@/types';
 

components/Notes.tsx

@@ -6,7 +6,7 @@ import { CircleX, ScrollText } from 'lucide-react';
 import { useAppContext } from '@/app/AppContext';
 import CopyButton from '@/components/CopyButton';
 import Scrim from '@/components/Scrim';
-import getCardInfo from '@/tools/getCardInfo';
+import { getCardInfo } from '@/tools';
 import { cardMap, layout } from '@/constants/tarokka';
 
 export default function Notes() {

components/Sheen.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useRef, useState } from 'react';
 import { useAppContext } from '@/app/AppContext';
+import { validTilt } from '@/tools';
 
 const tiltSheen = (sheen: HTMLDivElement, x: number, y: number) => {
 	const rect = sheen.getBoundingClientRect();
@@ -20,48 +21,21 @@ const tiltSheen = (sheen: HTMLDivElement, x: number, y: number) => {
 export default function Sheen({ cardIndex, className }: { cardIndex: number; className?: string }) {
 	const sheenRef = useRef<HTMLDivElement>(null);
 	const [untilt, setUntilt] = useState(false);
-	const {
+	const { tilts } = useAppContext();
-		gameData,
-		settings: { tilt, remoteTilt },
-		tilt: localTilts,
-	} = useAppContext();
 
 	useEffect(() => {
 		const sheen = sheenRef.current;
 		if (!sheen) return;
 
-		if (tilt) {
+		const tilt = tilts[cardIndex];
-			const percentX = localTilts[cardIndex]?.percentX || -1;
-			const percentY = localTilts[cardIndex]?.percentY || -1;
 
-			const percentages = remoteTilt
+		if (validTilt(tilt)) {
-				? [...gameData.tilts[cardIndex], { percentX, percentY }]
-				: [{ percentX, percentY }];
-
-			const { totalX, totalY, count } = percentages
-				.filter(({ percentX, percentY }) => percentX >= 0 && percentY >= 0)
-				.reduce(
-					({ totalX, totalY, count }, { percentX, percentY }) => ({
-						totalX: totalX + percentX,
-						totalY: totalY + percentY,
-						count: ++count,
-					}),
-					{ totalX: 0, totalY: 0, count: 0 },
-				);
-
-			if (count && totalX >= 0 && totalY >= 0) {
-				const x = totalX / count;
-				const y = totalY / count;
-
-				tiltSheen(sheen, x, y);
 			setUntilt(false);
+			tiltSheen(sheen, tilt.percentX, tilt.percentY);
 		} else {
 			setUntilt(true);
 		}
-		} else {
+	}, [tilts]);
-			setUntilt(true);
-		}
-	}, [tilt, localTilts, gameData]);
 
 	useEffect(() => {
 		const sheen = sheenRef.current;

components/TiltCard.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from 'react';
 import { useAppContext } from '@/app/AppContext';
-import throttle from '@/tools/throttle';
+import { throttle, validTilt } from '@/tools';
 
 import { thirtyFPS } from '@/constants/time';
 import type { Tilt } from '@/types';
@@ -18,50 +18,21 @@ export default function TiltCard({
 }) {
 	const cardRef = useRef<HTMLDivElement>(null);
 	const [untilt, setUntilt] = useState(false);
-	const {
+	const { settings, tilts, setLocalTilt } = useAppContext();
-		gameData,
-		settings: { tilt, remoteTilt },
-		setTilt,
-		tilt: localTilts,
-	} = useAppContext();
 
 	useEffect(() => {
 		const card = cardRef.current;
 		if (!card) return;
 
-		if (tilt) {
+		const tilt = tilts[cardIndex];
-			const rotateX = localTilts[cardIndex]?.rotateX || 0;
-			const rotateY = localTilts[cardIndex]?.rotateY || 0;
 
-			const tilts = remoteTilt
+		if (validTilt(tilt)) {
-				? [...gameData.tilts[cardIndex], { rotateX, rotateY }]
-				: [{ rotateX, rotateY }];
-
-			const { totalX, totalY, count } = tilts
-				.filter(({ rotateX, rotateY }) => !!rotateX && !!rotateY)
-				.reduce(
-					({ totalX, totalY, count }, { rotateX, rotateY }) => ({
-						totalX: totalX + rotateX,
-						totalY: totalY + rotateY,
-						count: ++count,
-					}),
-					{ totalX: 0, totalY: 0, count: 0 },
-				);
-
-			if (count && (totalX || totalY)) {
 			setUntilt(false);
-
+			card.style.transform = `rotateX(${tilt.rotateX}deg) rotateY(${tilt.rotateY}deg)`;
-				const x = totalX / count;
-				const y = totalY / count;
-
-				card.style.transform = `rotateX(${x}deg) rotateY(${y}deg)`;
 		} else {
 			setUntilt(true);
 		}
-		} else if (card.style.transform !== ZERO_ROTATION) {
+	}, [tilts]);
-			setUntilt(true);
-		}
-	}, [tilt, localTilts, gameData]);
 
 	useEffect(() => {
 		const card = cardRef.current;
@@ -93,17 +64,17 @@ export default function TiltCard({
 			rotateY,
 		};
 
-		setTilt(newTilt);
+		setLocalTilt(newTilt);
 	}, thirtyFPS);
 
 	const handleMouseLeave = () => {
-		setTilt([]);
+		setLocalTilt([]);
 	};
 
 	return (
 		<div
 			className={`group ${className}`}
-			onMouseMove={tilt ? handleMouseMove : undefined}
+			onMouseMove={settings.tilt ? handleMouseMove : undefined}
 			onMouseLeave={handleMouseLeave}
 		>
 			<div

lib/GameStore.ts

@@ -1,6 +1,5 @@
 import Deck from '@/lib/TarokkaDeck';
-import generateID from '@/tools/simpleID';
+import { generateID, parseMilliseconds } from '@/tools';
-import parseMilliseconds from '@/tools/parseMilliseconds';
 
 import { HOUR, DAY, SETTINGS } from '@/constants';
 import { GameState, GameUpdate, Settings, Tilt } from '@/types';

lib/StandardDeck.ts

@@ -1,4 +1,4 @@
-import getRandomItems from '@/tools/getRandomItems';
+import { getRandomItems } from '@/tools';
 import cards from '@/constants/standardCards';
 import type { StandardCard } from '@/types';
 

lib/TarokkaDeck.ts

@@ -1,4 +1,4 @@
-import getRandomItems from '@/tools/getRandomItems';
+import { getRandomItems } from '@/tools';
 import cards from '@/constants/tarokkaCards';
 import type { TarokkaCard, TarokkaGameCard } from '@/types';
 

server.ts

@@ -3,7 +3,7 @@ import { createServer } from 'http';
 import { Server as SocketIOServer, type Socket } from 'socket.io';
 
 import GameStore from '@/lib/GameStore';
-import omit from '@/tools/omit';
+import { omit } from '@/tools';
 
 import { thirtyFPS } from '@/constants/time';
 import type { ClientUpdate, GameUpdate, Tilt } from '@/types';

tools/getCardInfo.ts

@@ -1,12 +1,12 @@
-import { isHighCard, isLowCard } from '@/tools/cardTypes';
+import { isHighCard, isLowCard } from '@/tools';
 import { Layout, Settings, TarokkaGameCard } from '@/types';
 
-export default function getTooltip(
+export const getCardInfo = (
 	card: TarokkaGameCard,
 	position: Layout,
 	dm: boolean,
 	settings: Settings,
-) {
+) => {
 	const { card: cardName, description, flipped } = card;
 
 	let text: string[] = [];
@@ -39,4 +39,4 @@ export default function getTooltip(
 	}
 
 	return text;
-}
+};

tools/getRandomItems.ts

@@ -1,4 +1,4 @@
-export default function getRandomItems<T>(items: T[], count: number): T[] {
+export const getRandomItems = <T>(items: T[], count: number): T[] => {
 	const shuffled = [...items];
 
 	// Fisher-Yates shuffle
@@ -8,4 +8,4 @@ export default function getRandomItems<T>(items: T[], count: number): T[] {
 	}
 
 	return count > shuffled.length ? shuffled : shuffled.slice(0, count);
-}
+};

tools/getURL.ts

@@ -1,8 +1,8 @@
 import { cardStyles, standardMap } from '@/constants/tarokka';
 import { Settings, TarokkaCard, TarokkaGameCard } from '@/types';
 
-export default function getURL(card: TarokkaCard | TarokkaGameCard, settings: Settings) {
+export const getURL = (card: TarokkaCard | TarokkaGameCard, settings: Settings) => {
 	const styleConfig = cardStyles[settings.cardStyle];
 	const fileBase = settings.cardStyle === 'standard' ? standardMap[card.id] : card.id;
 	return `${styleConfig.baseURL}${fileBase}${card.extension || styleConfig.extension}`;
-}
+};

tools/index.ts

@@ -0,0 +1,11 @@
+export * from '@/tools/cardTypes';
+export * from '@/tools/getCardInfo';
+export * from '@/tools/getRandomItems';
+export * from '@/tools/getURL';
+export * from '@/tools/log';
+export * from '@/tools/omit';
+export * from '@/tools/parseMilliseconds';
+export * from '@/tools/reduceTilts';
+export * from '@/tools/simpleID';
+export * from '@/tools/throttle';
+export * from '@/tools/validTilt';

tools/log.tsx

@@ -0,0 +1,19 @@
+/**
+ * A logging utility designed to be inserted into functional chains.
+ * Logs all parameters with an optional prefix, then returns the first argument unchanged.
+ *
+ * @param {string} [prefix=''] - A label or message to prepend to the logged output.
+ * @returns {(value: any, ...rest: any[]) => any} - A function that logs its arguments and returns the first one.
+ *
+ * @example
+ * const result = [1, 2, 3]
+ *   .map((n) => n * 2)
+ *   .map(log('doubled:'))
+ *   .filter((n) => n > 2);
+ */
+export const log =
+	(prefix: string = ''): ((value: any, ...rest: any[]) => any) =>
+	(...args: any[]) => {
+		console.log(prefix, ...args);
+		return args[0];
+	};

tools/omit.ts

@@ -1,7 +1,7 @@
-export default function omit<T extends Record<string, any>>(
+export const omit = <T extends Record<string, any>>(
 	obj: T,
 	propToRemove: keyof T,
-): Omit<T, typeof propToRemove> {
+): Omit<T, typeof propToRemove> => {
 	const { [propToRemove]: _, ...rest } = obj;
 	return rest;
-}
+};

tools/parseMilliseconds.ts

@@ -7,7 +7,7 @@ export interface ParsedMilliseconds {
 	seconds: number;
 }
 
-export default function parseMilliseconds(timestamp: number): ParsedMilliseconds {
+export const parseMilliseconds = (timestamp: number): ParsedMilliseconds => {
 	const days = Math.floor(timestamp / DAY);
 	timestamp %= DAY;
 
@@ -21,4 +21,4 @@ export default function parseMilliseconds(timestamp: number): ParsedMilliseconds
 	timestamp %= SECOND;
 
 	return { days, hours, minutes, seconds };
-}
+};

tools/reduceTilts.ts

@@ -0,0 +1,34 @@
+import { log, validTilt } from '@/tools';
+import { GameUpdate, Tilt } from '@/types';
+
+const combineTilts = (tilts: Tilt[]) =>
+	tilts.reduce(
+		({ pX, pY, rX, rY, count }, { percentX, percentY, rotateX, rotateY }) => ({
+			pX: pX + percentX,
+			pY: pY + percentY,
+			rX: rX + rotateX,
+			rY: rY + rotateY,
+			count: count + 1,
+		}),
+		{ pX: 0, pY: 0, rX: 0, rY: 0, count: 0 },
+	);
+
+export function reduceTilts(gameData: GameUpdate, localTilt: Tilt[]): Tilt[] {
+	const remoteTilts = gameData.tilts;
+	const tiltEnabled = gameData.settings.tilt;
+	const remoteTiltEnabled = gameData.settings.remoteTilt;
+
+	if (!tiltEnabled) return [];
+	if (!remoteTiltEnabled) return Array.from({ length: 5 }, (_, i) => localTilt[i]);
+
+	return Array.from({ length: 5 }, (_, i) => (localTilt[i] ? [localTilt[i]] : []))
+		.map((cardTilts, cardIndex) => [...remoteTilts[cardIndex], ...cardTilts])
+		.map((cardTilts) => cardTilts.filter(validTilt))
+		.map(combineTilts)
+		.map(({ pX, pY, rX, rY, count }) => ({
+			percentX: count ? pX / count : -1,
+			percentY: count ? pY / count : -1,
+			rotateX: count ? rX / count : 0,
+			rotateY: count ? rY / count : 0,
+		}));
+}

tools/simpleID.ts

@@ -1,9 +1,7 @@
-import getRandomItems from '@/tools/getRandomItems';
+import { getRandomItems } from '@/tools';
 
 const alphabet = '0123456789abcdefghijklmnopqrstuvwxyz';
 
-const generateID = (length: number = 6) => {
+export const generateID = (length: number = 6) => {
 	return getRandomItems(alphabet.split(''), length).join('');
 };
-
-export default generateID;

tools/throttle.ts

@@ -1,4 +1,4 @@
-export default function throttle(func: Function, threshold: number) {
+export function throttle(func: Function, threshold: number) {
 	let lastCall = 0;
 
 	return (...args: any[]) => {

tools/validTilt.ts

@@ -0,0 +1,4 @@
+import { Tilt } from '@/types';
+
+export const validTilt = ({ percentX, percentY, rotateX, rotateY }: Tilt) =>
+	percentX >= 0 && percentY >= 0 && !!rotateX && !!rotateY;