From ab04b2e43da8e22bcfc0f1e910f69c7c438fe839 Mon Sep 17 00:00:00 2001 From: bchanot Date: Thu, 8 Oct 2026 22:46:37 +0200 Subject: [PATCH] style(supabase): prettier pass on the new TypeScript files --- apps/app/src/config/env.ts | 22 +++++++--- apps/app/src/lib/supabase.ts | 4 +- apps/app/tests/unit/config.env.test.ts | 5 ++- packages/supabase/eslint.config.js | 5 ++- packages/supabase/src/client.ts | 4 +- packages/supabase/tests/client.test.ts | 6 +-- packages/supabase/tests/db/harness.ts | 5 ++- packages/supabase/tests/db/pgtap.test.ts | 6 +-- .../supabase/tests/db/schema-types.test.ts | 40 ++++++++++++++----- 9 files changed, 70 insertions(+), 27 deletions(-) diff --git a/apps/app/src/config/env.ts b/apps/app/src/config/env.ts index 630032aa..05cfa2ad 100644 --- a/apps/app/src/config/env.ts +++ b/apps/app/src/config/env.ts @@ -54,17 +54,29 @@ export function resolveSupabaseConnection( const cleanKey = nonEmpty(anonKey) if (cleanUrl && cleanKey) return { url: cleanUrl, anonKey: cleanKey } if ((cleanUrl || cleanKey) && import.meta.env.DEV) { - console.warn('[config] supabaseUrl and supabaseAnonKey must be set together; Supabase disabled') + console.warn( + '[config] supabaseUrl and supabaseAnonKey must be set together; Supabase disabled', + ) } return null } export function resolveConfig(runtime: RuntimeConfig = {}): AppConfig { return { - siteName: runtime.siteName ?? import.meta.env.VITE_APP_SITE_NAME ?? DEFAULTS.siteName, - brandName: runtime.brandName ?? import.meta.env.VITE_APP_BRAND_NAME ?? DEFAULTS.brandName, - footerName: runtime.footerName ?? import.meta.env.VITE_APP_FOOTER_NAME ?? DEFAULTS.footerName, - tagline: runtime.tagline ?? import.meta.env.VITE_APP_TAGLINE ?? DEFAULTS.tagline, + siteName: + runtime.siteName ?? + import.meta.env.VITE_APP_SITE_NAME ?? + DEFAULTS.siteName, + brandName: + runtime.brandName ?? + import.meta.env.VITE_APP_BRAND_NAME ?? + DEFAULTS.brandName, + footerName: + runtime.footerName ?? + import.meta.env.VITE_APP_FOOTER_NAME ?? + DEFAULTS.footerName, + tagline: + runtime.tagline ?? import.meta.env.VITE_APP_TAGLINE ?? DEFAULTS.tagline, supabase: resolveSupabaseConnection( runtime.supabaseUrl ?? import.meta.env.VITE_SUPABASE_URL, runtime.supabaseAnonKey ?? import.meta.env.VITE_SUPABASE_ANON_KEY, diff --git a/apps/app/src/lib/supabase.ts b/apps/app/src/lib/supabase.ts index d278c5b4..f0e473cf 100644 --- a/apps/app/src/lib/supabase.ts +++ b/apps/app/src/lib/supabase.ts @@ -8,7 +8,9 @@ let cached: { connectionUrl: string; client: FaunosteoClient } | null = null * configured. Callers must handle null: the current local-only flows do not * depend on Supabase. No UI uses this yet (foundation step). */ -export function getSupabaseClient(config: AppConfig = appConfig): FaunosteoClient | null { +export function getSupabaseClient( + config: AppConfig = appConfig, +): FaunosteoClient | null { if (!config.supabase) return null if (cached?.connectionUrl !== config.supabase.url) { cached = { diff --git a/apps/app/tests/unit/config.env.test.ts b/apps/app/tests/unit/config.env.test.ts index 7f41f567..5f57a985 100644 --- a/apps/app/tests/unit/config.env.test.ts +++ b/apps/app/tests/unit/config.env.test.ts @@ -13,7 +13,10 @@ describe('resolveConfig', () => { supabaseUrl: 'http://127.0.0.1:54321', supabaseAnonKey: 'anon', }) - expect(config.supabase).toEqual({ url: 'http://127.0.0.1:54321', anonKey: 'anon' }) + expect(config.supabase).toEqual({ + url: 'http://127.0.0.1:54321', + anonKey: 'anon', + }) }) it('still resolves identity strings injected at runtime', () => { diff --git a/packages/supabase/eslint.config.js b/packages/supabase/eslint.config.js index 023d72da..242d5a31 100644 --- a/packages/supabase/eslint.config.js +++ b/packages/supabase/eslint.config.js @@ -11,7 +11,10 @@ export default tseslint.config( }, rules: { '@typescript-eslint/no-explicit-any': 'warn', - '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }], + '@typescript-eslint/no-unused-vars': [ + 'error', + { argsIgnorePattern: '^_' }, + ], }, }, ) diff --git a/packages/supabase/src/client.ts b/packages/supabase/src/client.ts index e626126c..953523de 100644 --- a/packages/supabase/src/client.ts +++ b/packages/supabase/src/client.ts @@ -17,7 +17,9 @@ export interface SupabaseConnection { * Browser client: session persisted in localStorage, tokens refreshed in the * background, PKCE for OAuth and magic-link redirects. */ -export function createBrowserClient(connection: SupabaseConnection): FaunosteoClient { +export function createBrowserClient( + connection: SupabaseConnection, +): FaunosteoClient { return createClient(connection.url, connection.anonKey, { auth: { persistSession: true, diff --git a/packages/supabase/tests/client.test.ts b/packages/supabase/tests/client.test.ts index 15949b1d..94991d5a 100644 --- a/packages/supabase/tests/client.test.ts +++ b/packages/supabase/tests/client.test.ts @@ -9,9 +9,9 @@ describe('createBrowserClient', () => { expect(typeof client.from).toBe('function') expect(client.auth).toBeDefined() // supabase-js keeps the resolved REST URL on the client instance. - expect(String((client as unknown as { supabaseUrl: string }).supabaseUrl)).toContain( - '127.0.0.1:54321', - ) + expect( + String((client as unknown as { supabaseUrl: string }).supabaseUrl), + ).toContain('127.0.0.1:54321') }) it('exposes the platform roles as runtime constants', () => { diff --git a/packages/supabase/tests/db/harness.ts b/packages/supabase/tests/db/harness.ts index 6fdf8085..f4be7604 100644 --- a/packages/supabase/tests/db/harness.ts +++ b/packages/supabase/tests/db/harness.ts @@ -64,7 +64,10 @@ function collectTapLines(results: Array<{ rows: unknown[] }>): string[] { * Runs one pgTAP file (which must wrap itself in begin/rollback) and reports * every `not ok` line plus plan mismatches announced by finish(). */ -export async function runPgTapFile(db: PGlite, file: string): Promise { +export async function runPgTapFile( + db: PGlite, + file: string, +): Promise { const sql = await readFile(join(pgTapTestsDir, file), 'utf8') let lines: string[] try { diff --git a/packages/supabase/tests/db/pgtap.test.ts b/packages/supabase/tests/db/pgtap.test.ts index 12cbf4b3..f8c06205 100644 --- a/packages/supabase/tests/db/pgtap.test.ts +++ b/packages/supabase/tests/db/pgtap.test.ts @@ -4,11 +4,7 @@ * assertion message, so a red test names the exact pgTAP check. */ import type { PGlite } from '@electric-sql/pglite' -import { - createMigratedDatabase, - listPgTapTests, - runPgTapFile, -} from './harness' +import { createMigratedDatabase, listPgTapTests, runPgTapFile } from './harness' const files = await listPgTapTests() diff --git a/packages/supabase/tests/db/schema-types.test.ts b/packages/supabase/tests/db/schema-types.test.ts index 52d39074..75f48b3a 100644 --- a/packages/supabase/tests/db/schema-types.test.ts +++ b/packages/supabase/tests/db/schema-types.test.ts @@ -15,7 +15,9 @@ import { createMigratedDatabase } from './harness' type Tables = Database['public']['Tables'] type Functions = Database['public']['Functions'] -type ColumnMap = { readonly [T in keyof Tables]: readonly (keyof Tables[T]['Row'] & string)[] } +type ColumnMap = { + readonly [T in keyof Tables]: readonly (keyof Tables[T]['Row'] & string)[] +} const expectedColumns = { profile_roles: [ @@ -45,18 +47,27 @@ const expectedColumns = { // Compile-time: a column present in the type but absent from the list is an error. type MissingColumns = { - [T in keyof Tables]: Exclude + [T in keyof Tables]: Exclude< + keyof Tables[T]['Row'], + (typeof expectedColumns)[T][number] + > }[keyof Tables] const noMissingColumn: MissingColumns extends never ? true : never = true -type FunctionArgs = { readonly [F in keyof Functions]: readonly (keyof Functions[F]['Args'] & string)[] } +type FunctionArgs = { + readonly [F in keyof Functions]: readonly (keyof Functions[F]['Args'] & + string)[] +} const expectedFunctionArgs = { grant_platform_role: ['role', 'target_user_id'], revoke_platform_role: ['reason', 'role', 'target_user_id'], } as const satisfies FunctionArgs type MissingArgs = { - [F in keyof Functions]: Exclude + [F in keyof Functions]: Exclude< + keyof Functions[F]['Args'], + (typeof expectedFunctionArgs)[F][number] + > }[keyof Functions] const noMissingArg: MissingArgs extends never ? true : never = true @@ -100,9 +111,13 @@ describe('database.types.ts matches the migrated schema', () => { order by table_name, column_name`, ) const actual: Record = {} - for (const row of rows) (actual[row.table_name] ??= []).push(row.column_name) + for (const row of rows) + (actual[row.table_name] ??= []).push(row.column_name) const expected = Object.fromEntries( - Object.entries(expectedColumns).map(([table, cols]) => [table, [...cols].sort()]), + Object.entries(expectedColumns).map(([table, cols]) => [ + table, + [...cols].sort(), + ]), ) expect(actual).toEqual(expected) }) @@ -115,7 +130,9 @@ describe('database.types.ts matches the migrated schema', () => { where n.nspname = 'public' and t.typname = 'platform_role' order by e.enumsortorder`, ) - expect(rows.map((r) => r.name)).toEqual([...Constants.public.Enums.platform_role]) + expect(rows.map((r) => r.name)).toEqual([ + ...Constants.public.Enums.platform_role, + ]) }) it('lists exactly the public functions and their argument names', async () => { @@ -128,9 +145,14 @@ describe('database.types.ts matches the migrated schema', () => { ) order by p.proname`, ) - const actual = Object.fromEntries(rows.map((r) => [r.name, [...r.args].sort()])) + const actual = Object.fromEntries( + rows.map((r) => [r.name, [...r.args].sort()]), + ) const expected = Object.fromEntries( - Object.entries(expectedFunctionArgs).map(([fn, args]) => [fn, [...args].sort()]), + Object.entries(expectedFunctionArgs).map(([fn, args]) => [ + fn, + [...args].sort(), + ]), ) expect(actual).toEqual(expected) })