mirror of
https://github.com/jcreek/LivingDexTracker.git
synced 2026-09-16 02:22:17 +00:00
fix: repair defects surfaced by gating CI on lint and typecheck
`npm run check` reported 15 errors and `npm run lint` 20, all pre-existing, so
neither gate could pass. Fixing them turned up three real bugs:
- SignOut destructured `{ error }` off `.then(() => {})`, which resolves to
undefined, so every sign-out threw a TypeError - after the signed-out event had
already been emitted. Sign-out also left the user on the protected page they
were on, still showing its content; it now returns them to the home page and
re-runs the server loads.
- SignUp passed `redirectTo`, which is not a signUp option and was silently
ignored, so the confirmation link has always used Supabase's configured site
URL. Documented rather than changed, since pointing it elsewhere needs an
absolute allow-listed URL.
- The Pokédex page tracked totalRecordsCreated but never passed it to the box
view, so the "Processed N entries so far" progress message never rendered.
The rest is typing and dead code: cookie callback parameters in hooks.server.ts
and +layout.ts, the untyped supabase props, a query-builder type that made
PostgREST rows untyped downstream, an unused session destructure, and
`while (true)` paging loops rewritten as `for (;;)`.
This commit is contained in:
+4
-3
@@ -1,21 +1,22 @@
|
||||
import { PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY } from '$env/static/public';
|
||||
import { createServerClient } from '@supabase/ssr';
|
||||
import type { Handle } from '@sveltejs/kit';
|
||||
import type { CookieSerializeOptions } from 'cookie';
|
||||
|
||||
export const handle: Handle = async ({ event, resolve }) => {
|
||||
event.locals.supabase = createServerClient(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
|
||||
cookies: {
|
||||
get: (key) => event.cookies.get(key),
|
||||
get: (key: string) => event.cookies.get(key),
|
||||
/**
|
||||
* Note: You have to add the `path` variable to the
|
||||
* set and remove method due to sveltekit's cookie API
|
||||
* requiring this to be set, setting the path to an empty string
|
||||
* will replicate previous/standard behaviour (https://kit.svelte.dev/docs/types#public-types-cookies)
|
||||
*/
|
||||
set: (key, value, options) => {
|
||||
set: (key: string, value: string, options: CookieSerializeOptions) => {
|
||||
event.cookies.set(key, value, { ...options, path: '/' });
|
||||
},
|
||||
remove: (key, options) => {
|
||||
remove: (key: string, options: CookieSerializeOptions) => {
|
||||
event.cookies.delete(key, { ...options, path: '/' });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
currentPage = Math.max(currentPage - 1, 1);
|
||||
}
|
||||
|
||||
function setItemsPerPage(event: any) {
|
||||
itemsPerPage = parseInt(event.target.value, 10);
|
||||
function setItemsPerPage(event: Event) {
|
||||
itemsPerPage = parseInt((event.target as HTMLSelectElement).value, 10);
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import type { SupabaseClient } from '@supabase/supabase-js';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
const dispatch = createEventDispatcher();
|
||||
|
||||
@@ -12,7 +13,7 @@
|
||||
let errorMessage = '';
|
||||
|
||||
// Access the supabase client from the layout data
|
||||
export let supabase: any;
|
||||
export let supabase: SupabaseClient;
|
||||
|
||||
async function signInWithEmail() {
|
||||
isLoading = true;
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<script lang="ts">
|
||||
import type { SupabaseClient } from '@supabase/supabase-js';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
import { goto } from '$app/navigation';
|
||||
const dispatch = createEventDispatcher();
|
||||
|
||||
function emitSignedOutEvent() {
|
||||
@@ -7,13 +9,17 @@
|
||||
}
|
||||
|
||||
// Access the supabase client from the layout data
|
||||
export let supabase: any;
|
||||
export let supabase: SupabaseClient;
|
||||
|
||||
async function signOut() {
|
||||
// TODO use the error from the response
|
||||
const { error } = await supabase.auth.signOut().then(() => {
|
||||
emitSignedOutEvent();
|
||||
});
|
||||
// `.then(() => {...})` resolved to undefined, so destructuring `error` off it threw a
|
||||
// TypeError on every sign-out - after the event had already been emitted.
|
||||
const { error } = await supabase.auth.signOut();
|
||||
if (error) console.error('Sign out failed', error);
|
||||
emitSignedOutEvent();
|
||||
// Signing out used to leave the user sitting on the protected page they were on, still
|
||||
// showing its content. Send them to the public home page and re-run the server loads.
|
||||
await goto('/', { invalidateAll: true });
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import type { SupabaseClient } from '@supabase/supabase-js';
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
const dispatch = createEventDispatcher();
|
||||
|
||||
@@ -6,17 +7,16 @@
|
||||
let password = '';
|
||||
|
||||
// Access the supabase client from the layout data
|
||||
export let supabase: any;
|
||||
export let supabase: SupabaseClient;
|
||||
|
||||
async function signUpNewUser() {
|
||||
try {
|
||||
// `redirectTo` is not a signUp option - it was silently ignored, so the confirmation
|
||||
// link has always used Supabase's configured site URL. Sending the user to /welcome
|
||||
// would need `emailRedirectTo` with an absolute, allow-listed URL.
|
||||
const { data, error } = await supabase.auth.signUp({
|
||||
email: email,
|
||||
password: password,
|
||||
options: {
|
||||
// Redirect URL after successful sign-up
|
||||
redirectTo: '/welcome'
|
||||
}
|
||||
password: password
|
||||
});
|
||||
|
||||
if (error) {
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
export let creatingRecords = false;
|
||||
export let totalRecordsCreated = 0;
|
||||
export let failedToLoad = false;
|
||||
export let markBoxAsNotCaught = (boxNumber: number) => {};
|
||||
export let markBoxAsCaught = (boxNumber: number) => {};
|
||||
export let markBoxAsNeedsToEvolve = (boxNumber: number) => {};
|
||||
export let markBoxAsInHome = (boxNumber: number) => {};
|
||||
export let markBoxAsNotInHome = (boxNumber: number) => {};
|
||||
export let markBoxAsNotCaught: (boxNumber: number) => void = () => {};
|
||||
export let markBoxAsCaught: (boxNumber: number) => void = () => {};
|
||||
export let markBoxAsNeedsToEvolve: (boxNumber: number) => void = () => {};
|
||||
export let markBoxAsInHome: (boxNumber: number) => void = () => {};
|
||||
export let markBoxAsNotInHome: (boxNumber: number) => void = () => {};
|
||||
export let createCatchRecords = () => {};
|
||||
export let onPokemonClick: (pokemon: CombinedData) => void = () => {};
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@ class CombinedDataRepository {
|
||||
let start = 0;
|
||||
const maxRows = CombinedDataRepository.MAX_ROWS_PER_REQUEST;
|
||||
|
||||
while (true) {
|
||||
for (;;) {
|
||||
const end = start + maxRows - 1;
|
||||
let query = this.supabase.from('pokedex_entries').select('*').not('form', 'is', null);
|
||||
|
||||
@@ -167,7 +167,7 @@ class CombinedDataRepository {
|
||||
let start = 0;
|
||||
const maxRows = CombinedDataRepository.MAX_ROWS_PER_REQUEST;
|
||||
|
||||
while (true) {
|
||||
for (;;) {
|
||||
const end = start + maxRows - 1;
|
||||
const { data, error } = await this.buildDexEntriesQuery(dexScopes, enableForms, region).range(
|
||||
start,
|
||||
@@ -312,7 +312,7 @@ class CombinedDataRepository {
|
||||
let start = 0;
|
||||
const maxRows = CombinedDataRepository.MAX_ROWS_PER_REQUEST;
|
||||
|
||||
while (true) {
|
||||
for (;;) {
|
||||
const end = start + maxRows - 1;
|
||||
const { data, error } = await this.buildEntriesQuery(enableForms, region, game).range(
|
||||
start,
|
||||
|
||||
@@ -4,6 +4,10 @@ import type {
|
||||
PokedexExportIntegrationDB
|
||||
} from '$lib/models/PokedexExportIntegration';
|
||||
|
||||
// `from()` returns a table builder; only `select()` yields the filter builder that `eq`/`is`
|
||||
// live on. Typing the scope helper with the table builder made `data` untyped downstream.
|
||||
type IntegrationQuery = ReturnType<ReturnType<SupabaseClient['from']>['select']>;
|
||||
|
||||
class PokedexExportIntegrationRepository {
|
||||
constructor(
|
||||
private supabase: SupabaseClient,
|
||||
@@ -34,7 +38,7 @@ class PokedexExportIntegrationRepository {
|
||||
return this.supabase.from('pokedex_export_integrations').select('*').eq('userId', this.userId);
|
||||
}
|
||||
|
||||
private addPokedexScope(query: ReturnType<SupabaseClient['from']>) {
|
||||
private addPokedexScope(query: IntegrationQuery): IntegrationQuery {
|
||||
if (this.pokedexId) {
|
||||
return query.eq('pokedexId', this.pokedexId);
|
||||
}
|
||||
@@ -49,7 +53,8 @@ class PokedexExportIntegrationRepository {
|
||||
throw new Error(`Failed to load export integrations: ${error.message}`);
|
||||
}
|
||||
if (!data) return [];
|
||||
return data.map((row) => this.transform(row));
|
||||
// PostgREST rows are untyped without generated database types.
|
||||
return (data as PokedexExportIntegrationDB[]).map((row) => this.transform(row));
|
||||
}
|
||||
|
||||
async listAll(): Promise<PokedexExportIntegration[]> {
|
||||
@@ -60,12 +65,12 @@ class PokedexExportIntegrationRepository {
|
||||
throw new Error(`Failed to load export integrations: ${error.message}`);
|
||||
}
|
||||
if (!data) return [];
|
||||
return data.map((row) => this.transform(row));
|
||||
// PostgREST rows are untyped without generated database types.
|
||||
return (data as PokedexExportIntegrationDB[]).map((row) => this.transform(row));
|
||||
}
|
||||
|
||||
async upsert(
|
||||
data: Partial<PokedexExportIntegrationDB> &
|
||||
Pick<PokedexExportIntegrationDB, 'provider'>
|
||||
data: Partial<PokedexExportIntegrationDB> & Pick<PokedexExportIntegrationDB, 'provider'>
|
||||
): Promise<PokedexExportIntegration> {
|
||||
const payload: Partial<PokedexExportIntegrationDB> = {
|
||||
userId: this.userId,
|
||||
@@ -105,7 +110,8 @@ class PokedexExportIntegrationRepository {
|
||||
throw new Error(`Failed to load export integrations: ${error.message}`);
|
||||
}
|
||||
if (!data) return [];
|
||||
return data.map((row) => this.transform(row));
|
||||
// PostgREST rows are untyped without generated database types.
|
||||
return (data as PokedexExportIntegrationDB[]).map((row) => this.transform(row));
|
||||
}
|
||||
|
||||
async updateTokens(
|
||||
|
||||
@@ -21,7 +21,7 @@ export async function requireAuth(event: RequestEvent): Promise<string> {
|
||||
*/
|
||||
export async function getOptionalUserId(event: RequestEvent): Promise<string | null> {
|
||||
try {
|
||||
const { session, user } = await event.locals.safeGetSession();
|
||||
const { user } = await event.locals.safeGetSession();
|
||||
return user?.id || null;
|
||||
} catch {
|
||||
return null;
|
||||
|
||||
@@ -13,7 +13,6 @@ export function calculateBoxPlacement(index: number): {
|
||||
} {
|
||||
const POKEMON_PER_BOX = 30;
|
||||
const COLUMNS_PER_BOX = 6;
|
||||
const ROWS_PER_BOX = 5;
|
||||
|
||||
// Calculate which box this Pokémon belongs to (1-indexed)
|
||||
const box = Math.floor(index / POKEMON_PER_BOX) + 1;
|
||||
|
||||
@@ -10,7 +10,7 @@ export const load: LayoutLoad = async ({ fetch, data, depends }) => {
|
||||
fetch
|
||||
},
|
||||
cookies: {
|
||||
get(key) {
|
||||
get(key: string) {
|
||||
if (!isBrowser()) {
|
||||
return JSON.stringify(data.session);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { onDestroy, onMount } from 'svelte';
|
||||
import { user } from '$lib/stores/user.js';
|
||||
import { type User } from '@supabase/auth-js';
|
||||
import { onMount } from 'svelte';
|
||||
import SignUp from '$lib/components/SignUp.svelte';
|
||||
import { goto } from '$app/navigation';
|
||||
|
||||
@@ -9,12 +7,7 @@
|
||||
let { supabase, stats } = data;
|
||||
$: ({ supabase, stats } = data);
|
||||
|
||||
let localUser: User | null;
|
||||
const unsubscribe = user.subscribe((value) => {
|
||||
localUser = value;
|
||||
});
|
||||
onDestroy(unsubscribe);
|
||||
|
||||
// Redirection is decided from the live session below, so the user store is not needed here.
|
||||
let isCheckingSession = true;
|
||||
|
||||
onMount(() => {
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
import type { Pokedex } from '$lib/models/Pokedex';
|
||||
import type { PageData } from './$types';
|
||||
|
||||
|
||||
export let data: PageData;
|
||||
|
||||
// Get pokédex from server load (guarded for transient undefined during navigation/HMR)
|
||||
@@ -38,7 +37,10 @@
|
||||
// Box view requires the full dataset for correct box numbering/placement.
|
||||
// If/when a paginated list view is introduced, this can be lowered and paired with UI controls.
|
||||
let itemsPerPage = 9999 as number;
|
||||
let totalPages = 0 as number;
|
||||
type CatchUpdateEvent = CustomEvent<{
|
||||
catchRecord: CatchRecord;
|
||||
source: 'toggle' | 'notes' | 'notes-blur';
|
||||
}>;
|
||||
let creatingRecords = false;
|
||||
let totalRecordsCreated = 0;
|
||||
let failedToLoad = false;
|
||||
@@ -128,7 +130,6 @@
|
||||
}, 250);
|
||||
}
|
||||
|
||||
|
||||
// Derive from pokedex config
|
||||
$: showOrigins = !!pokedex?.isOriginDex;
|
||||
$: showShiny = !!pokedex?.isShinyDex;
|
||||
@@ -190,8 +191,6 @@
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
function applyOptimisticCatchRecordUpdate(next: CatchRecord) {
|
||||
if (!combinedData) return;
|
||||
const idx = combinedData.findIndex((cd) => cd.pokedexEntry._id === next.pokemonId);
|
||||
@@ -212,7 +211,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function handleModalCatchUpdate(event: any) {
|
||||
async function handleModalCatchUpdate(event: CatchUpdateEvent) {
|
||||
await updateACatch(event);
|
||||
}
|
||||
|
||||
@@ -243,20 +242,16 @@
|
||||
return;
|
||||
}
|
||||
combinedData = fetchedData.combinedData;
|
||||
totalPages = fetchedData.totalPages || 0;
|
||||
// Always extract box numbers for box view
|
||||
if (combinedData) {
|
||||
boxNumbers = calculateBoxNumbers(combinedData.length);
|
||||
}
|
||||
}
|
||||
|
||||
async function updateACatch(event: any) {
|
||||
async function updateACatch(event: CatchUpdateEvent) {
|
||||
if (!pokedexId) return;
|
||||
ensureCatchWriteQueue();
|
||||
const { catchRecord, source } = event.detail as {
|
||||
catchRecord: CatchRecord;
|
||||
source: 'toggle' | 'notes' | 'notes-blur';
|
||||
};
|
||||
const { catchRecord, source } = event.detail;
|
||||
// Enforce mutual exclusivity (should be impossible to have both true).
|
||||
const sanitizedCatchRecord: CatchRecord = { ...catchRecord };
|
||||
if (sanitizedCatchRecord.caught) {
|
||||
@@ -464,7 +459,6 @@
|
||||
window.clearInterval(reconcileInterval);
|
||||
};
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
@@ -599,7 +593,6 @@
|
||||
{#if pokedex.description}
|
||||
<p class="text-sm text-base-content/70 mt-3">{pokedex.description}</p>
|
||||
{/if}
|
||||
|
||||
</div>
|
||||
|
||||
<!-- Right side: Actions -->
|
||||
@@ -637,6 +630,7 @@
|
||||
bind:combinedData
|
||||
bind:boxNumbers
|
||||
bind:creatingRecords
|
||||
{totalRecordsCreated}
|
||||
bind:failedToLoad
|
||||
{markBoxAsNotCaught}
|
||||
{markBoxAsCaught}
|
||||
|
||||
Reference in New Issue
Block a user