Superminaren/hackerspace.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(types): regenerate database types from canonical schema; drop TODO(types) join casts

Browse Source 
Regenerate types/database.ts from a local Supabase built from the canonical
scripts/schema.sql. The running dev DB was stale (missing the 'stripe'
payment_platform value, members_with_permission, spaces.host_requires_card,
payments.link_status, dues_payment_methods.space_id), so it was rebuilt from
schema.sql first.

With real relationship metadata the 11 `as unknown as … // TODO(types)` join
casts are no longer needed:
- me portal, session-attendance, member-certifications, equipment-reservations:
  narrow the action result with `'data' in res` instead of a blanket cast.
- stripe / door embeds read the now-typed relation directly.
- completeSession + listEquipmentReservations route the embedded-select query
  through the fully-typed createClient() rather than the wide ServerSupabase gate
  client (the pattern documented in auth-helpers.ts); equipment disambiguates its
  two space_members FKs with an explicit !fkey hint.

Collapse the hand-maintained governance rows/enums in types/domain/governance.ts
into Tables<>/Enums<> aliases.

Tighten duesPaymentMethodSchema.platform to the DUES_LINK_PLATFORMS literal union
(the old `as unknown as [string,...]` erased it), which the now-correct
payment_platform enum requires.

The hand-added class_signup_tx / class_cancel_tx RPC entries are now generated
natively.

typecheck 0 · lint 0 errors · 645 tests · build ok
This commit is contained in:
Moheeb Zara
2026-08-04 22:21:29 -07:00
parent 4f4e3096ca
commit b2b463491a
13 changed files with 2055 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/(app)/me/page.tsx
+2 -4
View File
@@ -98,12 +98,10 @@ export default async function MePage() {
}))
const signupRes = await getMyClassSignups()
// TODO(types): remove after regenerating types/database.ts (missing FK relationship metadata)
const classSignups: ClassSignup[] = 'data' in signupRes ? (signupRes.data as unknown as ClassSignup[]) : []
const classSignups: ClassSignup[] = 'data' in signupRes ? (signupRes.data ?? []) : []
const reservationRes = await getMyReservations()
// TODO(types): remove after regenerating types/database.ts (missing FK relationship metadata)
const reservations: Reservation[] = 'data' in reservationRes ? (reservationRes.data as unknown as Reservation[]) : []
const reservations: Reservation[] = 'data' in reservationRes ? (reservationRes.data ?? []) : []
const cardsRes = await getMyCards()
const myCards: MyCard[] = 'data' in cardsRes ? (cardsRes.data as MyCard[]) : []
components/certifications/member-certifications-dialog.tsx
+1 -2
View File
@@ -68,8 +68,7 @@ export function MemberCertificationsDialog({
if ('error' in g && g.error) {
toast.error(g.error)
} else {
// TODO(types): remove after regenerating types/database.ts (missing FK relationship metadata)
setGrants(((g as unknown as { data: Grant[] }).data) ?? [])
setGrants(('data' in g ? g.data : []) ?? [])
}
if (!('error' in t) || !t.error) {
setTypes(((t as { data: CertType[] }).data ?? []).filter(c => c.is_active))
components/classes/session-attendance.tsx
+1 -2
View File
@@ -35,8 +35,7 @@ export function SessionAttendance({
toast.error(res.error)
return
}
// TODO(types): remove after regenerating types/database.ts (missing FK relationship metadata)
setRows(((res as unknown as { data: Signup[] }).data) ?? [])
setRows(('data' in res ? res.data : []) ?? [])
}, [sessionId])
useEffect(() => {
components/equipment/equipment-reservations.tsx
+1 -2
View File
@@ -33,8 +33,7 @@ export function EquipmentReservations({ equipmentId }: { equipmentId: string })
toast.error(res.error)
return
}
// TODO(types): remove after regenerating types/database.ts (missing FK relationship metadata)
setRows(((res as unknown as { data: Reservation[] }).data) ?? [])
setRows(('data' in res ? res.data : []) ?? [])
}, [equipmentId])
useEffect(() => {
lib/actions/classes/instructor.ts
+3 -3
View File
@@ -80,7 +80,8 @@ export async function markAttendance(input: unknown) {
export async function completeSession(input: unknown) {
const gate = await requirePermission('classes.instruct')
if (!gate.ok) return { error: gate.error }
const { supabase, member } = gate
const { member } = gate
const supabase = await createClient()
const v = parseInput(sessionIdSchema, input)
if (!v.ok) return { error: v.error }
@@ -105,8 +106,7 @@ export async function completeSession(input: unknown) {
.eq('space_id', member.space_id)
if (upErr) return { error: upErr.message }
// TODO(types): remove after regenerating types/database.ts (missing FK relationship metadata)
const cls = (session as unknown as { classes?: { title: string; grants_certification_id: string | null } | null }).classes
const cls = session.classes
let issued = 0
let certSkipped = false
if (cls?.grants_certification_id) {
lib/actions/classes/sessions.ts
+2 -21
View File
@@ -212,27 +212,8 @@ export async function listUpcomingSessions() {
.order('starts_at', { ascending: true })
if (error) return { error: error.message }
// TODO(types): remove after regenerating types/database.ts (missing FK relationship metadata)
const rows = ((sessions ?? []) as unknown as Array<{
id: string
class_id: string
starts_at: string
ends_at: string | null
location: string | null
capacity: number | null
status: string
notes: string | null
classes: {
title: string
description: string | null
payment_link: string | null
capacity: number | null
is_active: boolean
grants_certification_id: string | null
required_form_id: string | null
} | null
}>).filter(
(s: { classes?: { is_active?: boolean } | null }) => s.classes?.is_active !== false,
const rows = (sessions ?? []).filter(
(s) => s.classes?.is_active !== false,
)
const ids = rows.map((s: { id: string }) => s.id)
lib/actions/classes/signups.ts
+1 -4
View File
@@ -43,10 +43,7 @@ export async function signUpForClass(input: unknown) {
.eq('space_id', member.space_id)
.maybeSingle()
if (!session) return { error: 'Session not found' }
// TODO(types): remove after regenerating types/database.ts (missing FK relationship metadata)
const cls = (session as unknown as {
classes?: { title: string | null; capacity: number | null; is_active: boolean; required_form_id: string | null } | null
}).classes
const cls = session.classes
if (cls && cls.is_active === false) return { error: 'This class is no longer available.' }
const { data: isMgr } = await supabase.rpc('user_has_permission', {
lib/actions/door/operate.ts
+1 -2
View File
@@ -225,8 +225,7 @@ export async function listDoorCards(input: unknown) {
return {
data: (cards ?? []).map(c => {
// TODO(types): remove after regenerating types/database.ts (missing FK relationship metadata)
const sm = c.space_members as unknown as { display_name: string | null } | { display_name: string | null }[] | null
const sm = c.space_members
const name = Array.isArray(sm) ? sm[0]?.display_name : sm?.display_name
return {
cardId: c.id as string,
lib/actions/equipment.ts
+3 -2
View File
@@ -450,14 +450,15 @@ export async function cancelReservation(input: unknown) {
export async function listEquipmentReservations(input: unknown) {
const gate = await requireEquipmentManager()
if (!gate.ok) return { error: gate.error }
const { supabase, member } = gate
const { member } = gate
const supabase = await createClient()
const v = parseInput(listEquipmentReservationsSchema, input)
if (!v.ok) return { error: v.error }
const { data, error } = await supabase
.from('equipment_reservations')
.select('id, member_id, starts_at, ends_at, status, notes, space_members(display_name, email)')
.select('id, member_id, starts_at, ends_at, status, notes, space_members!equipment_reservations_member_id_fkey(display_name, email)')
.eq('space_id', member.space_id)
.eq('equipment_id', v.data.equipmentId)
.order('starts_at', { ascending: true })
lib/actions/stripe.ts
+1 -2
View File
@@ -257,8 +257,7 @@ export async function listMemberBilling() {
if (error) return { error: error.message }
return {
data: (data ?? []).map(r => {
// TODO(types): remove after regenerating types/database.ts (missing FK relationship metadata)
const sm = r.space_members as unknown as { display_name: string | null; email: string | null; tier: string | null } | { display_name: string | null; email: string | null; tier: string | null }[] | null
const sm = r.space_members
const mem = Array.isArray(sm) ? sm[0] : sm
return {
memberId: r.member_id as string,
lib/validations/dues.ts
+1 -1
View File
@@ -6,7 +6,7 @@ import { DUES_LINK_PLATFORMS, isSafeDuesUrl } from '../dues-payments-logic'
// member-clickable anchor. instructions is an optional memo hint (e.g. "put
// your member name in the note") to help the treasurer reconcile later.
export const duesPaymentMethodSchema = z.object({
platform: z.enum(DUES_LINK_PLATFORMS as unknown as [string, ...string[]]),
platform: z.enum(DUES_LINK_PLATFORMS),
url: z
.string()
.trim()
types/database.ts
+2013 -264
View File
File diff suppressed because it is too large Load Diff
types/domain/governance.ts
+25 -156
View File
@@ -1,161 +1,30 @@
/**
* Hand-written governance-kernel domain types (proposals, votes, incidents,
* policies, areas) and their enums.
* Governance-kernel domain types (proposals, votes, incidents, policies,
* areas) and their enums.
*
* NOTE: the underlying tables and enums now ALSO exist in the generated
* `types/database.ts` (proposals, proposal_votes, incidents, incident_updates,
* policies, space_areas; proposal_type, incident_status, etc.). These shapes
* were hand-authored before that regeneration and are kept verbatim here to
* avoid a behavior change. Follow-up: after verifying field parity, replace the
* row types with `Tables<'proposals'>` etc. and the enums with
* `Enums<'proposal_type'>` etc., and delete the duplication.
* These are thin aliases over the generated database types (`types/database.ts`,
* regenerated from the canonical schema). Keep them as `Tables<>` / `Enums<>`
* aliases — do NOT hand-maintain the row shapes here; regenerate the database
* types instead.
*/
import type { Tables, Enums } from '@/types/database'
export type ProposalType =
| 'bylaw_change'
| 'board_action'
| 'membership_vote'
| 'advisory_poll'
| 'recall'
| 'budget'
// Enums
export type ProposalType = Enums<'proposal_type'>
export type ProposalStatus = Enums<'proposal_status'>
export type ThresholdRule = Enums<'threshold_rule'>
export type VotePosition = Enums<'vote_position'>
export type IncidentStatus = Enums<'incident_status'>
export type IncidentSeverity = Enums<'incident_severity'>
export type IncidentUpdateVisibility = Enums<'incident_update_visibility'>
export type PolicyStatus = Enums<'policy_status'>
export type FinancialVisibility = Enums<'financial_visibility'>
export type DirectoryVisibility = Enums<'directory_visibility'>
export type ProposalStatus =
| 'draft'
| 'open'
| 'decided'
| 'withdrawn'
| 'expired'
export type ThresholdRule =
| 'simple_majority'
| 'two_thirds'
| 'three_fourths'
| 'unanimous'
export type VotePosition = 'yes' | 'no' | 'abstain' | 'recused'
export type IncidentStatus =
| 'received'
| 'under_review'
| 'decided'
| 'appealed'
| 'closed'
export type IncidentSeverity = 'low' | 'medium' | 'high' | 'critical'
export type IncidentUpdateVisibility =
| 'reporter_only'
| 'all_parties'
| 'board_only'
export type PolicyStatus = 'draft' | 'active' | 'deprecated' | 'superseded'
export type SpaceArea = {
id: string
space_id: string
code: string
name: string
icon: string | null
sort_order: number
is_archived: boolean
created_at: string
updated_at: string
}
export type FinancialVisibility = 'treasurer_only' | 'board_visible' | 'all_members_visible'
export type DirectoryVisibility =
| 'board_only'
| 'member_count_visible'
| 'members_visible'
| 'public_members_visible'
export type Proposal = {
id: string
space_id: string
proposer_id: string | null
proposer_name: string | null
title: string
body: string
proposal_type: ProposalType
status: ProposalStatus
quorum_required: number
quorum_percent: number
quorum_floor: number
threshold: ThresholdRule
voting_opens_at: string | null
voting_closes_at: string | null
policy_ref_id: string | null
parent_incident_id: string | null
outcome_yes: number
outcome_no: number
outcome_abstain: number
outcome_recused: number
total_voters: number
quorum_met: boolean | null
passed: boolean | null
created_at: string
updated_at: string
decided_at: string | null
}
export type ProposalVote = {
id: string
proposal_id: string
member_id: string
position: VotePosition
recusal_reason: string | null
comment: string | null
voted_at: string
}
export type Incident = {
id: string
space_id: string
reporter_id: string | null
reporter_token: string | null
is_anonymous: boolean
subjects: string[]
category: string
severity: IncidentSeverity
title: string
body: string
status: IncidentStatus
disposition: string | null
decision_maker_ids: string[]
appeal_proposal_id: string | null
sla_response_by: string | null
created_at: string
updated_at: string
acknowledged_at: string | null
decided_at: string | null
closed_at: string | null
}
export type IncidentUpdateRow = {
id: string
incident_id: string
author_id: string | null
author_name: string | null
body: string
visibility: IncidentUpdateVisibility
created_at: string
}
export type Policy = {
id: string
space_id: string
slug: string
section_ref: string | null
parent_policy_id: string | null
title: string
body_formal: string
body_plain: string | null
version: number
prior_version_id: string | null
status: PolicyStatus
effective_at: string | null
adopted_by_proposal_id: string | null
created_at: string
updated_at: string
}
// Rows
export type SpaceArea = Tables<'space_areas'>
export type Proposal = Tables<'proposals'>
export type ProposalVote = Tables<'proposal_votes'>
export type Incident = Tables<'incidents'>
export type IncidentUpdateRow = Tables<'incident_updates'>
export type Policy = Tables<'policies'>