fitzroy 1.2.0 → 1.3.1

package/dist/index.js

@@ -20,6 +20,12 @@ var UnsupportedSourceError = class extends Error {
   }
   name = "UnsupportedSourceError";
 };
+function aflwUnsupportedError(source) {
+  return new UnsupportedSourceError(
+    `AFLW data is not available from ${source}. Use --source afl-api for AFLW data.`,
+    source
+  );
+}
 var ValidationError = class extends Error {
   constructor(message, issues) {
     super(message);
@@ -119,6 +125,10 @@ function toAestString(date) {
   });
   return formatter.format(date);
 }
+function resolveDefaultSeason(competition = "AFLM") {
+  const year = (/* @__PURE__ */ new Date()).getFullYear();
+  return competition === "AFLW" ? year - 1 : year;
+}
 var MONTH_ABBREV_TO_INDEX = /* @__PURE__ */ new Map([
   ["jan", 0],
   ["feb", 1],
@@ -233,6 +243,26 @@ function normaliseTeamName(raw) {
   const trimmed = raw.trim();
   return ALIAS_MAP.get(trimmed.toLowerCase()) ?? trimmed;
 }
+var 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"]
+]);
 
 // src/transforms/footywire-player-stats.ts
 import * as cheerio from "cheerio";
@@ -487,6 +517,14 @@ var FINALS_PATTERN = /final|elimination|qualifying|preliminary|semi|grand/i;
 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":
@@ -783,6 +821,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']");
@@ -792,6 +831,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;
     }
@@ -862,6 +906,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) => {
@@ -872,6 +917,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;
     }
@@ -1528,7 +1578,15 @@ var CfsPlayerInnerSchema = z.object({
   captain: z.boolean().optional(),
   playerJumperNumber: z.number().optional()
 }).passthrough();
-var statNum = z.number().nullable().optional();
+var statNum = z.union([
+  z.number(),
+  z.string().transform((s) => {
+    if (s === "" || s === "-") return null;
+    const n = Number(s);
+    return Number.isNaN(n) ? null : n;
+  }),
+  z.boolean().transform((b) => b ? 1 : 0)
+]).nullable().optional();
 var PlayerGameStatsSchema = z.object({
   goals: statNum,
   behinds: statNum,
@@ -1606,8 +1664,8 @@ var PlayerStatsItemSchema = z.object({
   teamId: z.string(),
   playerStats: z.object({
     stats: PlayerGameStatsSchema,
-    timeOnGroundPercentage: z.number().nullable().optional()
-  }).passthrough()
+    timeOnGroundPercentage: statNum
+  }).passthrough().nullable().optional()
 }).passthrough();
 var PlayerStatsListSchema = z.object({
   homeTeamPlayerStats: z.array(PlayerStatsItemSchema),
@@ -2284,12 +2342,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;
@@ -2633,6 +2693,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);
@@ -2642,10 +2703,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;
@@ -2960,6 +3025,7 @@ function transformLadderEntries(entries) {
 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;
@@ -2971,6 +3037,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;
@@ -3105,6 +3172,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;
@@ -3114,6 +3182,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;
@@ -3123,6 +3192,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;
@@ -3148,7 +3218,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)
@@ -3171,8 +3241,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,
@@ -3186,8 +3256,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;
@@ -3199,8 +3270,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;
@@ -3235,80 +3307,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
   };
 }
@@ -3334,11 +3408,11 @@ async function fetchPlayerStats(query) {
           client.fetchPlayerStats(query.matchId)
         ]);
         if (!statsResult.success) return statsResult;
-        const teamIdMap2 = /* @__PURE__ */ new Map();
+        const teamIdMap2 = new Map(AFL_API_TEAM_IDS);
         if (rosterResult.success) {
           const match = rosterResult.data.match;
-          teamIdMap2.set(match.homeTeamId, match.homeTeam.name);
-          teamIdMap2.set(match.awayTeamId, match.awayTeam.name);
+          teamIdMap2.set(match.homeTeamId, normaliseTeamName(match.homeTeam.name));
+          teamIdMap2.set(match.awayTeamId, normaliseTeamName(match.awayTeam.name));
         }
         return ok(
           transformPlayerStats(
@@ -3348,7 +3422,7 @@ async function fetchPlayerStats(query) {
             query.round ?? 0,
             competition,
             "afl-api",
-            teamIdMap2.size > 0 ? teamIdMap2 : void 0
+            teamIdMap2
           )
         );
       }
@@ -3391,6 +3465,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;
@@ -3420,6 +3495,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;
@@ -3443,7 +3519,39 @@ 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) {
+            const home = normaliseTeamName(m.homeTeam);
+            const away = normaliseTeamName(m.awayTeam);
+            gpMap.set(home, (gpMap.get(home) ?? 0) + 1);
+            gpMap.set(away, (gpMap.get(away) ?? 0) + 1);
+          }
+        }
+      }
+      const enriched = statsResult.data.map((entry) => ({
+        ...entry,
+        gamesPlayed: gpMap.get(normaliseTeamName(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":
@@ -3462,19 +3570,30 @@ async function fetchTeamStats(query) {
 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();
@@ -3495,8 +3614,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fitzroy",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "TypeScript library and CLI for AFL data — match results, player stats, fixtures, ladders, and more",
   "type": "module",
   "main": "./dist/index.js",