fitzroy 1.2.0 → 1.3.0

package/dist/cli.js

@@ -10,6 +10,12 @@ var __export = (target, all) => {
 };
 
 // src/lib/errors.ts
+function aflwUnsupportedError(source) {
+  return new UnsupportedSourceError(
+    `AFLW data is not available from ${source}. Use --source afl-api for AFLW data.`,
+    source
+  );
+}
 var AflApiError, ScrapeError, UnsupportedSourceError, ValidationError;
 var init_errors = __esm({
   "src/lib/errors.ts"() {
@@ -45,6 +51,47 @@ var init_errors = __esm({
   }
 });
 
+// src/cli/error-boundary.ts
+import pc from "picocolors";
+function formatError(error) {
+  if (error instanceof ValidationError && error.issues) {
+    const issueLines = error.issues.map((i) => `  ${pc.yellow(i.path)}: ${i.message}`);
+    return `${pc.red("Validation error:")}
+${issueLines.join("\n")}`;
+  }
+  if (error instanceof AflApiError) {
+    const status = error.statusCode ? ` (HTTP ${error.statusCode})` : "";
+    return `${pc.red("AFL API error:")} ${error.message}${status}`;
+  }
+  if (error instanceof ScrapeError) {
+    const source = error.source ? ` [${error.source}]` : "";
+    return `${pc.red("Scrape error:")} ${error.message}${source}`;
+  }
+  if (error instanceof UnsupportedSourceError) {
+    return `${pc.red("Unsupported source:")} ${error.message}`;
+  }
+  if (error instanceof Error) {
+    return `${pc.red("Error:")} ${error.message}`;
+  }
+  return `${pc.red("Error:")} ${String(error)}`;
+}
+function withErrorBoundary(fn) {
+  return async (ctx) => {
+    try {
+      await fn(ctx);
+    } catch (error) {
+      console.error(formatError(error));
+      process.exit(1);
+    }
+  };
+}
+var init_error_boundary = __esm({
+  "src/cli/error-boundary.ts"() {
+    "use strict";
+    init_errors();
+  }
+});
+
 // src/lib/result.ts
 function ok(data) {
   return { success: true, data };
@@ -117,6 +164,10 @@ function parseAflTablesDate(dateStr) {
   }
   return null;
 }
+function resolveDefaultSeason(competition = "AFLM") {
+  const year = (/* @__PURE__ */ new Date()).getFullYear();
+  return competition === "AFLW" ? year - 1 : year;
+}
 function buildUtcDate(year, monthStr, day) {
   const monthIndex = MONTH_ABBREV_TO_INDEX.get(monthStr.toLowerCase());
   if (monthIndex === void 0) {
@@ -168,7 +219,7 @@ function normaliseTeamName(raw) {
   const trimmed = raw.trim();
   return ALIAS_MAP.get(trimmed.toLowerCase()) ?? trimmed;
 }
-var TEAM_ALIASES, AFL_SENIOR_TEAMS, ALIAS_MAP;
+var TEAM_ALIASES, AFL_SENIOR_TEAMS, ALIAS_MAP, AFL_API_TEAM_IDS;
 var init_team_mapping = __esm({
   "src/lib/team-mapping.ts"() {
     "use strict";
@@ -241,6 +292,26 @@ var init_team_mapping = __esm({
       }
       return map;
     })();
+    AFL_API_TEAM_IDS = /* @__PURE__ */ new Map([
+      ["CD_T10", "Adelaide Crows"],
+      ["CD_T20", "Brisbane Lions"],
+      ["CD_T30", "Carlton"],
+      ["CD_T40", "Collingwood"],
+      ["CD_T50", "Essendon"],
+      ["CD_T60", "Fremantle"],
+      ["CD_T70", "Geelong Cats"],
+      ["CD_T1000", "Gold Coast Suns"],
+      ["CD_T1010", "GWS Giants"],
+      ["CD_T80", "Hawthorn"],
+      ["CD_T90", "Melbourne"],
+      ["CD_T100", "North Melbourne"],
+      ["CD_T110", "Port Adelaide"],
+      ["CD_T120", "Richmond"],
+      ["CD_T130", "St Kilda"],
+      ["CD_T160", "Sydney Swans"],
+      ["CD_T150", "West Coast Eagles"],
+      ["CD_T140", "Western Bulldogs"]
+    ]);
   }
 });
 
@@ -506,6 +577,14 @@ var init_footywire_player_stats = __esm({
 function inferRoundType(roundName) {
   return FINALS_PATTERN.test(roundName) ? "Finals" : "HomeAndAway";
 }
+function finalsRoundNumber(headerText, lastHARound) {
+  const lower = headerText.toLowerCase();
+  if (lower.includes("qualifying") || lower.includes("elimination")) return lastHARound + 1;
+  if (lower.includes("semi")) return lastHARound + 2;
+  if (lower.includes("preliminary")) return lastHARound + 3;
+  if (lower.includes("grand")) return lastHARound + 4;
+  return lastHARound + 1;
+}
 function toMatchStatus(raw) {
   switch (raw) {
     case "CONCLUDED":
@@ -595,6 +674,7 @@ function parseMatchList(html, year) {
   const $ = cheerio2.load(html);
   const results = [];
   let currentRound = 0;
+  let lastHARound = 0;
   let currentRoundType = "HomeAndAway";
   $("tr").each((_i, row) => {
     const roundHeader = $(row).find("td[colspan='7']");
@@ -604,6 +684,11 @@ function parseMatchList(html, year) {
       const roundMatch = /Round\s+(\d+)/i.exec(text);
       if (roundMatch?.[1]) {
         currentRound = Number.parseInt(roundMatch[1], 10);
+        if (currentRoundType === "HomeAndAway") {
+          lastHARound = currentRound;
+        }
+      } else if (currentRoundType === "Finals") {
+        currentRound = finalsRoundNumber(text, lastHARound);
       }
       return;
     }
@@ -674,6 +759,7 @@ function parseFixtureList(html, year) {
   const $ = cheerio2.load(html);
   const fixtures = [];
   let currentRound = 0;
+  let lastHARound = 0;
   let currentRoundType = "HomeAndAway";
   let gameNumber = 0;
   $("tr").each((_i, row) => {
@@ -684,6 +770,11 @@ function parseFixtureList(html, year) {
       const roundMatch = /Round\s+(\d+)/i.exec(text);
       if (roundMatch?.[1]) {
         currentRound = Number.parseInt(roundMatch[1], 10);
+        if (currentRoundType === "HomeAndAway") {
+          lastHARound = currentRound;
+        }
+      } else if (currentRoundType === "Finals") {
+        currentRound = finalsRoundNumber(text, lastHARound);
       }
       return;
     }
@@ -1431,7 +1522,14 @@ var init_validation = __esm({
       captain: z.boolean().optional(),
       playerJumperNumber: z.number().optional()
     }).passthrough();
-    statNum = z.number().nullable().optional();
+    statNum = z.union([
+      z.number(),
+      z.string().transform((s) => {
+        if (s === "" || s === "-") return null;
+        const n = Number(s);
+        return Number.isNaN(n) ? null : n;
+      })
+    ]).nullable().optional();
     PlayerGameStatsSchema = z.object({
       goals: statNum,
       behinds: statNum,
@@ -1509,8 +1607,8 @@ var init_validation = __esm({
       teamId: z.string(),
       playerStats: z.object({
         stats: PlayerGameStatsSchema,
-        timeOnGroundPercentage: z.number().nullable().optional()
-      }).passthrough()
+        timeOnGroundPercentage: statNum
+      }).passthrough().nullable().optional()
     }).passthrough();
     PlayerStatsListSchema = z.object({
       homeTeamPlayerStats: z.array(PlayerStatsItemSchema),
@@ -2221,12 +2319,14 @@ function toFixture(item, season, fallbackRoundNumber, competition) {
 async function fetchFixture(query) {
   const competition = query.competition ?? "AFLM";
   if (query.source === "squiggle") {
+    if (competition === "AFLW") return err(aflwUnsupportedError("squiggle"));
     const client2 = new SquiggleClient();
     const result = await client2.fetchGames(query.season, query.round ?? void 0);
     if (!result.success) return result;
     return ok(transformSquiggleGamesToFixture(result.data.games, query.season));
   }
   if (query.source === "footywire") {
+    if (competition === "AFLW") return err(aflwUnsupportedError("footywire"));
     const fwClient = new FootyWireClient();
     const result = await fwClient.fetchSeasonFixture(query.season);
     if (!result.success) return result;
@@ -2417,6 +2517,7 @@ function parseSeasonPage(html, year) {
   const results = [];
   let currentRound = 0;
   let currentRoundType = "HomeAndAway";
+  let lastHARound = 0;
   let matchCounter = 0;
   $("table").each((_i, table) => {
     const $table = $(table);
@@ -2426,10 +2527,14 @@ function parseSeasonPage(html, year) {
     if (roundMatch?.[1] && border !== "1") {
       currentRound = Number.parseInt(roundMatch[1], 10);
       currentRoundType = inferRoundType(text);
+      if (currentRoundType === "HomeAndAway") {
+        lastHARound = currentRound;
+      }
       return;
     }
     if (border !== "1" && inferRoundType(text) === "Finals") {
       currentRoundType = "Finals";
+      currentRound = finalsRoundNumber(text, lastHARound);
       return;
     }
     if (border !== "1") return;
@@ -2939,6 +3044,7 @@ var init_ladder = __esm({
 async function fetchLadder(query) {
   const competition = query.competition ?? "AFLM";
   if (query.source === "squiggle") {
+    if (competition === "AFLW") return err(aflwUnsupportedError("squiggle"));
     const client2 = new SquiggleClient();
     const result = await client2.fetchStandings(query.season, query.round ?? void 0);
     if (!result.success) return result;
@@ -2950,6 +3056,7 @@ async function fetchLadder(query) {
     });
   }
   if (query.source === "afl-tables") {
+    if (competition === "AFLW") return err(aflwUnsupportedError("afl-tables"));
     const atClient = new AflTablesClient();
     const resultsResult = await atClient.fetchSeasonResults(query.season);
     if (!resultsResult.success) return resultsResult;
@@ -3114,6 +3221,7 @@ async function fetchMatchResults(query) {
       return ok(transformMatchItems(itemsResult.data, query.season, competition));
     }
     case "footywire": {
+      if (competition === "AFLW") return err(aflwUnsupportedError("footywire"));
       const client = new FootyWireClient();
       const result = await client.fetchSeasonResults(query.season);
       if (!result.success) return result;
@@ -3123,6 +3231,7 @@ async function fetchMatchResults(query) {
       return result;
     }
     case "afl-tables": {
+      if (competition === "AFLW") return err(aflwUnsupportedError("afl-tables"));
       const client = new AflTablesClient();
       const result = await client.fetchSeasonResults(query.season);
       if (!result.success) return result;
@@ -3132,6 +3241,7 @@ async function fetchMatchResults(query) {
       return result;
     }
     case "squiggle": {
+      if (competition === "AFLW") return err(aflwUnsupportedError("squiggle"));
       const client = new SquiggleClient();
       const result = await client.fetchGames(query.season, query.round ?? void 0, 100);
       if (!result.success) return result;
@@ -3170,7 +3280,7 @@ async function resolveTeamId(client, teamName, competition) {
 async function fetchFromAflApi(query) {
   const client = new AflApiClient();
   const competition = query.competition ?? "AFLM";
-  const season = query.season ?? (/* @__PURE__ */ new Date()).getFullYear();
+  const season = query.season ?? resolveDefaultSeason(competition);
   const [teamIdResult, seasonResult] = await Promise.all([
     resolveTeamId(client, query.team, competition),
     client.resolveCompSeason(competition, season)
@@ -3193,8 +3303,8 @@ async function fetchFromAflApi(query) {
     jumperNumber: p.jumperNumber ?? null,
     position: p.position ?? null,
     dateOfBirth: p.player.dateOfBirth ?? null,
-    heightCm: p.player.heightInCm ?? null,
-    weightKg: p.player.weightInKg ?? null,
+    heightCm: p.player.heightInCm || null,
+    weightKg: p.player.weightInKg || null,
     gamesPlayed: null,
     goals: null,
     draftYear: p.player.draftYear ? Number.parseInt(p.player.draftYear, 10) || null : null,
@@ -3208,8 +3318,9 @@ async function fetchFromAflApi(query) {
   return ok(players);
 }
 async function fetchFromFootyWire(query) {
-  const client = new FootyWireClient();
   const competition = query.competition ?? "AFLM";
+  if (competition === "AFLW") return err(aflwUnsupportedError("footywire"));
+  const client = new FootyWireClient();
   const teamName = normaliseTeamName(query.team);
   const result = await client.fetchPlayerList(teamName);
   if (!result.success) return result;
@@ -3221,8 +3332,9 @@ async function fetchFromFootyWire(query) {
   return ok(players);
 }
 async function fetchFromAflTables(query) {
-  const client = new AflTablesClient();
   const competition = query.competition ?? "AFLM";
+  if (competition === "AFLW") return err(aflwUnsupportedError("afl-tables"));
+  const client = new AflTablesClient();
   const teamName = normaliseTeamName(query.team);
   const result = await client.fetchPlayerList(teamName);
   if (!result.success) return result;
@@ -3253,6 +3365,7 @@ async function fetchPlayerDetails(query) {
 var init_player_details = __esm({
   "src/api/player-details.ts"() {
     "use strict";
+    init_date_utils();
     init_errors();
     init_result();
     init_team_mapping();
@@ -3268,80 +3381,82 @@ function toNullable(value) {
 }
 function transformOne(item, matchId, season, roundNumber, competition, source, teamIdMap) {
   const inner = item.player.player.player;
-  const stats = item.playerStats.stats;
-  const clearances = stats.clearances;
+  const stats = item.playerStats?.stats;
+  const clearances = stats?.clearances;
   return {
     matchId,
     season,
     roundNumber,
-    team: normaliseTeamName(teamIdMap?.get(item.teamId) ?? item.teamId),
+    team: normaliseTeamName(
+      teamIdMap?.get(item.teamId) ?? AFL_API_TEAM_IDS.get(item.teamId) ?? item.teamId
+    ),
     competition,
     playerId: inner.playerId,
     givenName: inner.playerName.givenName,
     surname: inner.playerName.surname,
     displayName: `${inner.playerName.givenName} ${inner.playerName.surname}`,
     jumperNumber: item.player.jumperNumber ?? null,
-    kicks: toNullable(stats.kicks),
-    handballs: toNullable(stats.handballs),
-    disposals: toNullable(stats.disposals),
-    marks: toNullable(stats.marks),
-    goals: toNullable(stats.goals),
-    behinds: toNullable(stats.behinds),
-    tackles: toNullable(stats.tackles),
-    hitouts: toNullable(stats.hitouts),
-    freesFor: toNullable(stats.freesFor),
-    freesAgainst: toNullable(stats.freesAgainst),
-    contestedPossessions: toNullable(stats.contestedPossessions),
-    uncontestedPossessions: toNullable(stats.uncontestedPossessions),
-    contestedMarks: toNullable(stats.contestedMarks),
-    intercepts: toNullable(stats.intercepts),
+    kicks: toNullable(stats?.kicks),
+    handballs: toNullable(stats?.handballs),
+    disposals: toNullable(stats?.disposals),
+    marks: toNullable(stats?.marks),
+    goals: toNullable(stats?.goals),
+    behinds: toNullable(stats?.behinds),
+    tackles: toNullable(stats?.tackles),
+    hitouts: toNullable(stats?.hitouts),
+    freesFor: toNullable(stats?.freesFor),
+    freesAgainst: toNullable(stats?.freesAgainst),
+    contestedPossessions: toNullable(stats?.contestedPossessions),
+    uncontestedPossessions: toNullable(stats?.uncontestedPossessions),
+    contestedMarks: toNullable(stats?.contestedMarks),
+    intercepts: toNullable(stats?.intercepts),
     centreClearances: toNullable(clearances?.centreClearances),
     stoppageClearances: toNullable(clearances?.stoppageClearances),
     totalClearances: toNullable(clearances?.totalClearances),
-    inside50s: toNullable(stats.inside50s),
-    rebound50s: toNullable(stats.rebound50s),
-    clangers: toNullable(stats.clangers),
-    turnovers: toNullable(stats.turnovers),
-    onePercenters: toNullable(stats.onePercenters),
-    bounces: toNullable(stats.bounces),
-    goalAssists: toNullable(stats.goalAssists),
-    disposalEfficiency: toNullable(stats.disposalEfficiency),
-    metresGained: toNullable(stats.metresGained),
-    goalAccuracy: toNullable(stats.goalAccuracy),
-    marksInside50: toNullable(stats.marksInside50),
-    tacklesInside50: toNullable(stats.tacklesInside50),
-    shotsAtGoal: toNullable(stats.shotsAtGoal),
-    scoreInvolvements: toNullable(stats.scoreInvolvements),
-    totalPossessions: toNullable(stats.totalPossessions),
-    timeOnGroundPercentage: toNullable(item.playerStats.timeOnGroundPercentage),
-    ratingPoints: toNullable(stats.ratingPoints),
-    dreamTeamPoints: toNullable(stats.dreamTeamPoints),
-    effectiveDisposals: toNullable(stats.extendedStats?.effectiveDisposals),
-    effectiveKicks: toNullable(stats.extendedStats?.effectiveKicks),
-    kickEfficiency: toNullable(stats.extendedStats?.kickEfficiency),
-    kickToHandballRatio: toNullable(stats.extendedStats?.kickToHandballRatio),
-    pressureActs: toNullable(stats.extendedStats?.pressureActs),
-    defHalfPressureActs: toNullable(stats.extendedStats?.defHalfPressureActs),
-    spoils: toNullable(stats.extendedStats?.spoils),
-    hitoutsToAdvantage: toNullable(stats.extendedStats?.hitoutsToAdvantage),
-    hitoutWinPercentage: toNullable(stats.extendedStats?.hitoutWinPercentage),
-    hitoutToAdvantageRate: toNullable(stats.extendedStats?.hitoutToAdvantageRate),
-    groundBallGets: toNullable(stats.extendedStats?.groundBallGets),
-    f50GroundBallGets: toNullable(stats.extendedStats?.f50GroundBallGets),
-    interceptMarks: toNullable(stats.extendedStats?.interceptMarks),
-    marksOnLead: toNullable(stats.extendedStats?.marksOnLead),
-    contestedPossessionRate: toNullable(stats.extendedStats?.contestedPossessionRate),
-    contestOffOneOnOnes: toNullable(stats.extendedStats?.contestOffOneOnOnes),
-    contestOffWins: toNullable(stats.extendedStats?.contestOffWins),
-    contestOffWinsPercentage: toNullable(stats.extendedStats?.contestOffWinsPercentage),
-    contestDefOneOnOnes: toNullable(stats.extendedStats?.contestDefOneOnOnes),
-    contestDefLosses: toNullable(stats.extendedStats?.contestDefLosses),
-    contestDefLossPercentage: toNullable(stats.extendedStats?.contestDefLossPercentage),
-    centreBounceAttendances: toNullable(stats.extendedStats?.centreBounceAttendances),
-    kickins: toNullable(stats.extendedStats?.kickins),
-    kickinsPlayon: toNullable(stats.extendedStats?.kickinsPlayon),
-    ruckContests: toNullable(stats.extendedStats?.ruckContests),
-    scoreLaunches: toNullable(stats.extendedStats?.scoreLaunches),
+    inside50s: toNullable(stats?.inside50s),
+    rebound50s: toNullable(stats?.rebound50s),
+    clangers: toNullable(stats?.clangers),
+    turnovers: toNullable(stats?.turnovers),
+    onePercenters: toNullable(stats?.onePercenters),
+    bounces: toNullable(stats?.bounces),
+    goalAssists: toNullable(stats?.goalAssists),
+    disposalEfficiency: toNullable(stats?.disposalEfficiency),
+    metresGained: toNullable(stats?.metresGained),
+    goalAccuracy: toNullable(stats?.goalAccuracy),
+    marksInside50: toNullable(stats?.marksInside50),
+    tacklesInside50: toNullable(stats?.tacklesInside50),
+    shotsAtGoal: toNullable(stats?.shotsAtGoal),
+    scoreInvolvements: toNullable(stats?.scoreInvolvements),
+    totalPossessions: toNullable(stats?.totalPossessions),
+    timeOnGroundPercentage: toNullable(item.playerStats?.timeOnGroundPercentage),
+    ratingPoints: toNullable(stats?.ratingPoints),
+    dreamTeamPoints: toNullable(stats?.dreamTeamPoints),
+    effectiveDisposals: toNullable(stats?.extendedStats?.effectiveDisposals),
+    effectiveKicks: toNullable(stats?.extendedStats?.effectiveKicks),
+    kickEfficiency: toNullable(stats?.extendedStats?.kickEfficiency),
+    kickToHandballRatio: toNullable(stats?.extendedStats?.kickToHandballRatio),
+    pressureActs: toNullable(stats?.extendedStats?.pressureActs),
+    defHalfPressureActs: toNullable(stats?.extendedStats?.defHalfPressureActs),
+    spoils: toNullable(stats?.extendedStats?.spoils),
+    hitoutsToAdvantage: toNullable(stats?.extendedStats?.hitoutsToAdvantage),
+    hitoutWinPercentage: toNullable(stats?.extendedStats?.hitoutWinPercentage),
+    hitoutToAdvantageRate: toNullable(stats?.extendedStats?.hitoutToAdvantageRate),
+    groundBallGets: toNullable(stats?.extendedStats?.groundBallGets),
+    f50GroundBallGets: toNullable(stats?.extendedStats?.f50GroundBallGets),
+    interceptMarks: toNullable(stats?.extendedStats?.interceptMarks),
+    marksOnLead: toNullable(stats?.extendedStats?.marksOnLead),
+    contestedPossessionRate: toNullable(stats?.extendedStats?.contestedPossessionRate),
+    contestOffOneOnOnes: toNullable(stats?.extendedStats?.contestOffOneOnOnes),
+    contestOffWins: toNullable(stats?.extendedStats?.contestOffWins),
+    contestOffWinsPercentage: toNullable(stats?.extendedStats?.contestOffWinsPercentage),
+    contestDefOneOnOnes: toNullable(stats?.extendedStats?.contestDefOneOnOnes),
+    contestDefLosses: toNullable(stats?.extendedStats?.contestDefLosses),
+    contestDefLossPercentage: toNullable(stats?.extendedStats?.contestDefLossPercentage),
+    centreBounceAttendances: toNullable(stats?.extendedStats?.centreBounceAttendances),
+    kickins: toNullable(stats?.extendedStats?.kickins),
+    kickinsPlayon: toNullable(stats?.extendedStats?.kickinsPlayon),
+    ruckContests: toNullable(stats?.extendedStats?.ruckContests),
+    scoreLaunches: toNullable(stats?.extendedStats?.scoreLaunches),
     source
   };
 }
@@ -3430,6 +3545,7 @@ async function fetchPlayerStats(query) {
       return ok(allStats);
     }
     case "footywire": {
+      if (competition === "AFLW") return err(aflwUnsupportedError("footywire"));
       const fwClient = new FootyWireClient();
       const idsResult = await fwClient.fetchSeasonMatchIds(query.season);
       if (!idsResult.success) return idsResult;
@@ -3459,6 +3575,7 @@ async function fetchPlayerStats(query) {
       return ok(allStats);
     }
     case "afl-tables": {
+      if (competition === "AFLW") return err(aflwUnsupportedError("afl-tables"));
       const atClient = new AflTablesClient();
       const atResult = await atClient.fetchSeasonPlayerStats(query.season);
       if (!atResult.success) return atResult;
@@ -3494,7 +3611,37 @@ async function fetchTeamStats(query) {
     }
     case "afl-tables": {
       const client = new AflTablesClient();
-      return client.fetchTeamStats(query.season);
+      const statsResult = await client.fetchTeamStats(query.season);
+      if (!statsResult.success) return statsResult;
+      const needsGp = statsResult.data.some((e) => e.gamesPlayed === 0);
+      const gpMap = /* @__PURE__ */ new Map();
+      if (needsGp) {
+        const resultsResult = await client.fetchSeasonResults(query.season);
+        if (resultsResult.success) {
+          for (const m of resultsResult.data) {
+            gpMap.set(m.homeTeam, (gpMap.get(m.homeTeam) ?? 0) + 1);
+            gpMap.set(m.awayTeam, (gpMap.get(m.awayTeam) ?? 0) + 1);
+          }
+        }
+      }
+      const enriched = statsResult.data.map((entry) => ({
+        ...entry,
+        gamesPlayed: gpMap.get(entry.team) ?? entry.gamesPlayed
+      }));
+      if (summaryType === "averages") {
+        return ok(
+          enriched.map((entry) => ({
+            ...entry,
+            stats: Object.fromEntries(
+              Object.entries(entry.stats).map(([k, v]) => [
+                k,
+                entry.gamesPlayed > 0 ? +(v / entry.gamesPlayed).toFixed(1) : 0
+              ])
+            )
+          }))
+        );
+      }
+      return ok(enriched);
     }
     case "afl-api":
     case "squiggle":
@@ -3522,19 +3669,30 @@ var init_team_stats = __esm({
 function teamTypeForComp(comp) {
   return comp === "AFLW" ? "WOMEN" : "MEN";
 }
-async function fetchTeams(query) {
-  const client = new AflApiClient();
-  const teamType = query?.teamType ?? teamTypeForComp(query?.competition ?? "AFLM");
-  const result = await client.fetchTeams(teamType);
-  if (!result.success) return result;
-  const competition = query?.competition ?? "AFLM";
-  const teams = result.data.map((t) => ({
+function toTeams(data, competition) {
+  return data.map((t) => ({
     teamId: String(t.id),
     name: normaliseTeamName(t.name),
     abbreviation: t.abbreviation ?? "",
     competition
   })).filter((t) => AFL_SENIOR_TEAMS.has(t.name));
-  return ok(teams);
+}
+async function fetchTeams(query) {
+  const client = new AflApiClient();
+  if (!query?.competition && !query?.teamType) {
+    const [menResult, womenResult] = await Promise.all([
+      client.fetchTeams("MEN"),
+      client.fetchTeams("WOMEN")
+    ]);
+    if (!menResult.success) return menResult;
+    if (!womenResult.success) return womenResult;
+    return ok([...toTeams(menResult.data, "AFLM"), ...toTeams(womenResult.data, "AFLW")]);
+  }
+  const competition = query?.competition ?? "AFLM";
+  const teamType = query?.teamType ?? teamTypeForComp(competition);
+  const result = await client.fetchTeams(teamType);
+  if (!result.success) return result;
+  return ok(toTeams(result.data, competition));
 }
 async function fetchSquad(query) {
   const client = new AflApiClient();
@@ -3555,8 +3713,8 @@ async function fetchSquad(query) {
     jumperNumber: p.jumperNumber ?? null,
     position: p.position ?? null,
     dateOfBirth: p.player.dateOfBirth ? new Date(p.player.dateOfBirth) : null,
-    heightCm: p.player.heightInCm ?? null,
-    weightKg: p.player.weightInKg ?? null,
+    heightCm: p.player.heightInCm || null,
+    weightKg: p.player.weightInKg || null,
     draftYear: p.player.draftYear ? Number.parseInt(p.player.draftYear, 10) || null : null,
     draftPosition: p.player.draftPosition ? Number.parseInt(p.player.draftPosition, 10) || null : null,
     draftType: p.player.draftType ?? null,
@@ -3897,10 +4055,6 @@ function validateOptionalSeason(raw) {
   if (raw != null) return validateSeason(raw);
   return void 0;
 }
-function resolveDefaultSeason(competition = "AFLM") {
-  const year = (/* @__PURE__ */ new Date()).getFullYear();
-  return competition === "AFLW" ? year - 1 : year;
-}
 function validateRound(raw) {
   const round = Number(raw);
   if (Number.isNaN(round) || !Number.isInteger(round) || round < 0) {
@@ -3979,6 +4133,7 @@ var init_validation2 = __esm({
   "src/cli/validation.ts"() {
     "use strict";
     init_team_mapping();
+    init_date_utils();
     VALID_SOURCES = ["afl-api", "footywire", "afl-tables", "squiggle"];
     VALID_COMPETITIONS = ["AFLM", "AFLW"];
     VALID_FORMATS = ["table", "json", "csv"];
@@ -3996,6 +4151,7 @@ var init_matches = __esm({
   "src/cli/commands/matches.ts"() {
     "use strict";
     init_index();
+    init_error_boundary();
     init_flags();
     init_formatters();
     init_ui();
@@ -4021,7 +4177,7 @@ var init_matches = __esm({
         ...COMPETITION_FLAG,
         ...OUTPUT_FLAGS
       },
-      async run({ args }) {
+      run: withErrorBoundary(async ({ args }) => {
         const season = validateSeason(args.season);
         const round = args.round ? validateRound(args.round) : void 0;
         const source = validateSource(args.source);
@@ -4044,7 +4200,7 @@ var init_matches = __esm({
           columns: DEFAULT_COLUMNS
         };
         console.log(formatOutput(data, formatOptions));
-      }
+      })
     });
   }
 });
@@ -4259,6 +4415,7 @@ var init_stats = __esm({
     init_index();
     init_fuzzy();
     init_afl_api();
+    init_error_boundary();
     init_flags();
     init_formatters();
     init_resolvers();
@@ -4288,7 +4445,7 @@ var init_stats = __esm({
         ...PLAYER_FLAG,
         ...OUTPUT_FLAGS
       },
-      async run({ args }) {
+      run: withErrorBoundary(async ({ args }) => {
         const season = validateSeason(args.season);
         const round = args.round ? validateRound(args.round) : void 0;
         const source = validateSource(args.source);
@@ -4331,7 +4488,7 @@ var init_stats = __esm({
           columns: DEFAULT_COLUMNS2
         };
         console.log(formatOutput(data, formatOptions));
-      }
+      })
     });
   }
 });
@@ -4347,6 +4504,7 @@ var init_fixture2 = __esm({
   "src/cli/commands/fixture.ts"() {
     "use strict";
     init_index();
+    init_error_boundary();
     init_flags();
     init_formatters();
     init_ui();
@@ -4370,7 +4528,7 @@ var init_fixture2 = __esm({
         ...COMPETITION_FLAG,
         ...OUTPUT_FLAGS
       },
-      async run({ args }) {
+      run: withErrorBoundary(async ({ args }) => {
         const season = validateSeason(args.season);
         const round = args.round ? validateRound(args.round) : void 0;
         const source = validateSource(args.source);
@@ -4393,7 +4551,7 @@ var init_fixture2 = __esm({
           columns: DEFAULT_COLUMNS3
         };
         console.log(formatOutput(data, formatOptions));
-      }
+      })
     });
   }
 });
@@ -4409,6 +4567,7 @@ var init_ladder3 = __esm({
   "src/cli/commands/ladder.ts"() {
     "use strict";
     init_index();
+    init_error_boundary();
     init_flags();
     init_formatters();
     init_ui();
@@ -4434,7 +4593,7 @@ var init_ladder3 = __esm({
         ...COMPETITION_FLAG,
         ...OUTPUT_FLAGS
       },
-      async run({ args }) {
+      run: withErrorBoundary(async ({ args }) => {
         const season = validateSeason(args.season);
         const round = args.round ? validateRound(args.round) : void 0;
         const source = validateSource(args.source);
@@ -4459,7 +4618,7 @@ var init_ladder3 = __esm({
           columns: DEFAULT_COLUMNS4
         };
         console.log(formatOutput(data.entries, formatOptions));
-      }
+      })
     });
   }
 });
@@ -4498,6 +4657,7 @@ var init_lineup3 = __esm({
     "use strict";
     init_index();
     init_afl_api();
+    init_error_boundary();
     init_flags();
     init_formatters();
     init_resolvers();
@@ -4524,7 +4684,7 @@ var init_lineup3 = __esm({
         ...COMPETITION_FLAG,
         ...OUTPUT_FLAGS
       },
-      async run({ args }) {
+      run: withErrorBoundary(async ({ args }) => {
         const season = validateSeason(args.season);
         const round = validateRound(args.round);
         const source = validateSource(args.source);
@@ -4561,7 +4721,7 @@ var init_lineup3 = __esm({
         } else {
           console.log(formatOutput(flattenLineups(data), formatOptions));
         }
-      }
+      })
     });
   }
 });
@@ -4577,6 +4737,7 @@ var init_squad = __esm({
   "src/cli/commands/squad.ts"() {
     "use strict";
     init_index();
+    init_error_boundary();
     init_flags();
     init_formatters();
     init_resolvers();
@@ -4600,7 +4761,7 @@ var init_squad = __esm({
         ...COMPETITION_FLAG,
         ...OUTPUT_FLAGS
       },
-      async run({ args }) {
+      run: withErrorBoundary(async ({ args }) => {
         const season = validateSeason(args.season);
         const competition = validateCompetition(args.competition);
         const format = validateFormat(args.format);
@@ -4629,7 +4790,7 @@ var init_squad = __esm({
           columns: DEFAULT_COLUMNS6
         };
         console.log(formatOutput(data.players, formatOptions));
-      }
+      })
     });
   }
 });
@@ -4645,6 +4806,7 @@ var init_teams2 = __esm({
   "src/cli/commands/teams.ts"() {
     "use strict";
     init_index();
+    init_error_boundary();
     init_flags();
     init_formatters();
     init_ui();
@@ -4665,7 +4827,7 @@ var init_teams2 = __esm({
         "team-type": { type: "string", description: "Team type filter" },
         ...OUTPUT_FLAGS
       },
-      async run({ args }) {
+      run: withErrorBoundary(async ({ args }) => {
         const competition = validateOptionalCompetition(args.competition);
         const format = validateFormat(args.format);
         const result = await withSpinner(
@@ -4690,7 +4852,7 @@ var init_teams2 = __esm({
           columns: DEFAULT_COLUMNS7
         };
         console.log(formatOutput(data, formatOptions));
-      }
+      })
     });
   }
 });
@@ -4704,14 +4866,19 @@ import { defineCommand as defineCommand8 } from "citty";
 function flattenEntries(data) {
   return data.map((entry) => {
     const { stats, ...rest } = entry;
-    return { ...rest, ...stats };
+    const normalised = {};
+    for (const [key, value] of Object.entries(stats)) {
+      normalised[AFL_TABLES_KEY_MAP[key] ?? key] = value;
+    }
+    return { ...rest, ...normalised };
   });
 }
-var DEFAULT_COLUMNS8, teamStatsCommand;
+var DEFAULT_COLUMNS8, AFL_TABLES_KEY_MAP, teamStatsCommand;
 var init_team_stats2 = __esm({
   "src/cli/commands/team-stats.ts"() {
     "use strict";
     init_index();
+    init_error_boundary();
     init_flags();
     init_formatters();
     init_ui();
@@ -4728,6 +4895,53 @@ var init_team_stats2 = __esm({
       { key: "T", label: "T", maxWidth: 6 },
       { key: "I50", label: "I50", maxWidth: 6 }
     ];
+    AFL_TABLES_KEY_MAP = {
+      KI_for: "K",
+      MK_for: "M",
+      HB_for: "HB",
+      DI_for: "D",
+      GL_for: "G",
+      BH_for: "B",
+      HO_for: "HO",
+      TK_for: "T",
+      RB_for: "RB",
+      IF_for: "IF",
+      CL_for: "CL",
+      CG_for: "CG",
+      FF_for: "FF",
+      BR_for: "BR",
+      CP_for: "CP",
+      UP_for: "UP",
+      CM_for: "CM",
+      MI_for: "MI",
+      "1%_for": "1%",
+      BO_for: "BO",
+      GA_for: "GA",
+      I50_for: "I50",
+      // "against" variants
+      KI_against: "K_against",
+      MK_against: "M_against",
+      HB_against: "HB_against",
+      DI_against: "D_against",
+      GL_against: "G_against",
+      BH_against: "B_against",
+      HO_against: "HO_against",
+      TK_against: "T_against",
+      RB_against: "RB_against",
+      IF_against: "IF_against",
+      CL_against: "CL_against",
+      CG_against: "CG_against",
+      FF_against: "FF_against",
+      BR_against: "BR_against",
+      CP_against: "CP_against",
+      UP_against: "UP_against",
+      CM_against: "CM_against",
+      MI_against: "MI_against",
+      "1%_against": "1%_against",
+      BO_against: "BO_against",
+      GA_against: "GA_against",
+      I50_against: "I50_against"
+    };
     teamStatsCommand = defineCommand8({
       meta: {
         name: "team-stats",
@@ -4743,7 +4957,7 @@ var init_team_stats2 = __esm({
         summary: { type: "string", description: "Summary type: totals or averages", default: "totals" },
         ...OUTPUT_FLAGS
       },
-      async run({ args }) {
+      run: withErrorBoundary(async ({ args }) => {
         const season = validateSeason(args.season);
         const source = validateSource(args.source);
         const format = validateFormat(args.format);
@@ -4766,7 +4980,7 @@ var init_team_stats2 = __esm({
           columns: DEFAULT_COLUMNS8
         };
         console.log(formatOutput(flat, formatOptions));
-      }
+      })
     });
   }
 });
@@ -4782,6 +4996,7 @@ var init_player_details2 = __esm({
   "src/cli/commands/player-details.ts"() {
     "use strict";
     init_index();
+    init_error_boundary();
     init_flags();
     init_formatters();
     init_resolvers();
@@ -4812,7 +5027,7 @@ var init_player_details2 = __esm({
         ...COMPETITION_FLAG,
         ...OUTPUT_FLAGS
       },
-      async run({ args }) {
+      run: withErrorBoundary(async ({ args }) => {
         const source = validateSource(args.source);
         const competition = validateCompetition(args.competition);
         const format = validateFormat(args.format);
@@ -4835,7 +5050,7 @@ var init_player_details2 = __esm({
           columns: DEFAULT_COLUMNS9
         };
         console.log(formatOutput(data, formatOptions));
-      }
+      })
     });
   }
 });
@@ -4851,6 +5066,7 @@ var init_coaches_votes2 = __esm({
   "src/cli/commands/coaches-votes.ts"() {
     "use strict";
     init_index();
+    init_error_boundary();
     init_flags();
     init_formatters();
     init_resolvers();
@@ -4876,7 +5092,7 @@ var init_coaches_votes2 = __esm({
         ...TEAM_FLAG,
         ...OUTPUT_FLAGS
       },
-      async run({ args }) {
+      run: withErrorBoundary(async ({ args }) => {
         const season = validateSeason(args.season);
         const round = args.round ? validateRound(args.round) : void 0;
         const competition = validateCompetition(args.competition);
@@ -4901,7 +5117,7 @@ var init_coaches_votes2 = __esm({
           columns: DEFAULT_COLUMNS10
         };
         console.log(formatOutput(data, formatOptions));
-      }
+      })
     });
   }
 });
@@ -4909,37 +5125,34 @@ var init_coaches_votes2 = __esm({
 // src/cli.ts
 import { defineCommand as defineCommand11, runMain } from "citty";
 
-// src/cli/error-boundary.ts
-init_errors();
-import pc from "picocolors";
-function formatError(error) {
-  if (error instanceof ValidationError && error.issues) {
-    const issueLines = error.issues.map((i) => `  ${pc.yellow(i.path)}: ${i.message}`);
-    return `${pc.red("Validation error:")}
-${issueLines.join("\n")}`;
-  }
-  if (error instanceof AflApiError) {
-    const status = error.statusCode ? ` (HTTP ${error.statusCode})` : "";
-    return `${pc.red("AFL API error:")} ${error.message}${status}`;
-  }
-  if (error instanceof ScrapeError) {
-    const source = error.source ? ` [${error.source}]` : "";
-    return `${pc.red("Scrape error:")} ${error.message}${source}`;
-  }
-  if (error instanceof UnsupportedSourceError) {
-    return `${pc.red("Unsupported source:")} ${error.message}`;
-  }
-  if (error instanceof Error) {
-    return `${pc.red("Error:")} ${error.message}`;
+// src/cli/alias-resolution.ts
+var SHORT_TO_LONG = {
+  "-s": "--season",
+  "-r": "--round",
+  "-c": "--competition",
+  "-j": "--json",
+  "-t": "--team",
+  "-p": "--player"
+};
+function resolveAliases() {
+  for (let i = 0; i < process.argv.length; i++) {
+    const arg = process.argv[i];
+    if (arg != null) {
+      const long = SHORT_TO_LONG[arg];
+      if (long) {
+        process.argv[i] = long;
+      }
+    }
   }
-  return `${pc.red("Error:")} ${String(error)}`;
 }
 
 // src/cli.ts
+init_error_boundary();
+resolveAliases();
 var main = defineCommand11({
   meta: {
     name: "fitzroy",
-    version: "1.2.0",
+    version: "1.3.0",
     description: "CLI for fetching AFL data \u2014 match results, player stats, fixtures, ladders, and more"
   },
   subCommands: {