fitzroy 1.4.2 → 1.6.0

package/dist/cli.js

@@ -509,6 +509,9 @@ function mergeFootyWireStats(basicTeams, advancedTeams, matchId, season, roundNu
         roundNumber,
         team: teamName,
         competition: "AFLM",
+        date: null,
+        homeTeam: null,
+        awayTeam: null,
         playerId: `FW_${basic.player.replace(/\s+/g, "_")}`,
         givenName: firstName,
         surname,
@@ -548,6 +551,12 @@ function mergeFootyWireStats(basicTeams, advancedTeams, matchId, season, roundNu
         totalPossessions: null,
         timeOnGroundPercentage: adv?.timeOnGroundPercentage ?? null,
         ratingPoints: null,
+        position: null,
+        goalEfficiency: null,
+        shotEfficiency: null,
+        interchangeCounts: null,
+        brownlowVotes: null,
+        supercoachScore: basic.supercoachPoints,
         dreamTeamPoints: basic.dreamTeamPoints,
         effectiveDisposals: adv?.effectiveDisposals ?? null,
         effectiveKicks: null,
@@ -631,6 +640,14 @@ var init_footywire_player_stats = __esm({
 });
 
 // src/transforms/match-results.ts
+function toRoundCode(roundName) {
+  if (!roundName) return null;
+  const mapped = ROUND_CODE_MAP.get(roundName);
+  if (mapped) return mapped;
+  const m = ROUND_NUMBER_PATTERN.exec(roundName);
+  if (m?.[1]) return `R${m[1]}`;
+  return roundName;
+}
 function inferRoundType(roundName) {
   return FINALS_PATTERN.test(roundName) ? "Finals" : "HomeAndAway";
 }
@@ -684,6 +701,7 @@ function transformMatchItems(items, season, competition, source = "afl-api") {
       season,
       roundNumber: item.round?.roundNumber ?? 0,
       roundType: inferRoundType(item.round?.name ?? ""),
+      roundName: item.round?.name ?? null,
       date: new Date(item.match.utcStartTime),
       venue: item.venue?.name ? normaliseVenueName(item.venue.name) : "",
       homeTeam: normaliseTeamName(item.match.homeTeam.name),
@@ -704,7 +722,10 @@ function transformMatchItems(items, season, competition, source = "afl-api") {
       q3Away: findPeriod(awayScore?.periodScore, 3),
       q4Away: findPeriod(awayScore?.periodScore, 4),
       status: toMatchStatus(item.match.status),
-      attendance: null,
+      attendance: item.attendance ?? null,
+      weatherTempCelsius: item.weather?.tempInCelsius ?? null,
+      weatherType: item.weather?.weatherType ?? null,
+      roundCode: toRoundCode(item.round?.name),
       venueState: item.venue?.state ?? null,
       venueTimezone: item.venue?.timeZone ?? null,
       homeRushedBehinds: homeScore?.rushedBehinds ?? null,
@@ -716,13 +737,21 @@ function transformMatchItems(items, season, competition, source = "afl-api") {
     };
   });
 }
-var FINALS_PATTERN;
+var FINALS_PATTERN, ROUND_CODE_MAP, ROUND_NUMBER_PATTERN;
 var init_match_results = __esm({
   "src/transforms/match-results.ts"() {
     "use strict";
     init_team_mapping();
     init_venue_mapping();
     FINALS_PATTERN = /final|elimination|qualifying|preliminary|semi|grand/i;
+    ROUND_CODE_MAP = /* @__PURE__ */ new Map([
+      ["Qualifying Final", "QF"],
+      ["Elimination Final", "EF"],
+      ["Semi Final", "SF"],
+      ["Preliminary Final", "PF"],
+      ["Grand Final", "GF"]
+    ]);
+    ROUND_NUMBER_PATTERN = /^Round\s+(\d+)$/i;
   }
 });
 
@@ -734,10 +763,12 @@ function parseMatchList(html, year) {
   let currentRound = 0;
   let lastHARound = 0;
   let currentRoundType = "HomeAndAway";
+  let currentRoundName = "";
   $("tr").each((_i, row) => {
     const roundHeader = $(row).find("td[colspan='7']");
     if (roundHeader.length > 0) {
       const text = roundHeader.text().trim();
+      currentRoundName = text;
       currentRoundType = inferRoundType(text);
       const roundMatch = /Round\s+(\d+)/i.exec(text);
       if (roundMatch?.[1]) {
@@ -780,6 +811,7 @@ function parseMatchList(html, year) {
       season: year,
       roundNumber: currentRound,
       roundType: currentRoundType,
+      roundName: currentRoundName || null,
       date,
       venue: normaliseVenueName(venue),
       homeTeam,
@@ -801,6 +833,9 @@ function parseMatchList(html, year) {
       q4Away: null,
       status: "Complete",
       attendance: attendance ? Number.parseInt(attendance, 10) || null : null,
+      weatherTempCelsius: null,
+      weatherType: null,
+      roundCode: toRoundCode(currentRoundName),
       venueState: null,
       venueTimezone: null,
       homeRushedBehinds: null,
@@ -1105,10 +1140,10 @@ var init_footywire = __esm({
       /**
        * Fetch match IDs from a season's match list page.
        *
-       * Extracts `mid=XXXX` values from score links.
+       * Extracts `mid=XXXX` values from score links alongside round numbers.
        *
        * @param year - The season year.
-       * @returns Array of match ID strings.
+       * @returns Array of match ID + round number pairs.
        */
       async fetchSeasonMatchIds(year) {
         const url = `${FOOTYWIRE_BASE}/ft_match_list?year=${year}`;
@@ -1116,15 +1151,33 @@ var init_footywire = __esm({
         if (!htmlResult.success) return htmlResult;
         try {
           const $ = cheerio2.load(htmlResult.data);
-          const ids = [];
-          $(".data:nth-child(5) a").each((_i, el) => {
-            const href = $(el).attr("href") ?? "";
-            const match = /mid=(\d+)/.exec(href);
-            if (match?.[1]) {
-              ids.push(match[1]);
+          const entries = [];
+          let currentRound = 0;
+          let lastHARound = 0;
+          $("tr").each((_i, row) => {
+            const roundHeader = $(row).find("td[colspan='7']");
+            if (roundHeader.length > 0) {
+              const text = roundHeader.text().trim();
+              const roundMatch = /Round\s+(\d+)/i.exec(text);
+              if (roundMatch?.[1]) {
+                currentRound = Number.parseInt(roundMatch[1], 10);
+                if (inferRoundType(text) === "HomeAndAway") {
+                  lastHARound = currentRound;
+                }
+              } else if (inferRoundType(text) === "Finals") {
+                currentRound = finalsRoundNumber(text, lastHARound);
+              }
+              return;
+            }
+            const scoreLink = $(row).find(".data:nth-child(5) a");
+            if (scoreLink.length === 0) return;
+            const href = scoreLink.attr("href") ?? "";
+            const midMatch = /mid=(\d+)/.exec(href);
+            if (midMatch?.[1]) {
+              entries.push({ matchId: midMatch[1], roundNumber: currentRound });
             }
           });
-          return ok(ids);
+          return ok(entries);
         } catch (cause) {
           return err(
             new ScrapeError(
@@ -1474,7 +1527,7 @@ var init_concurrency = __esm({
 
 // src/lib/validation.ts
 import { z } from "zod/v4";
-var AflApiTokenSchema, CompetitionSchema, CompetitionListSchema, CompseasonSchema, CompseasonListSchema, RoundSchema, RoundListSchema, ScoreSchema, PeriodScoreSchema, TeamScoreSchema, CfsMatchTeamSchema, CfsMatchSchema, CfsScoreSchema, CfsVenueSchema, MatchItemSchema, MatchItemListSchema, CfsPlayerInnerSchema, statNum, PlayerGameStatsSchema, PlayerStatsItemSchema, PlayerStatsListSchema, RosterPlayerSchema, TeamPlayersSchema, MatchRosterSchema, TeamItemSchema, TeamListSchema, SquadPlayerInnerSchema, SquadPlayerItemSchema, SquadSchema, SquadListSchema, WinLossRecordSchema, LadderEntryRawSchema, LadderResponseSchema;
+var AflApiTokenSchema, CompetitionSchema, CompetitionListSchema, CompseasonSchema, CompseasonListSchema, RoundSchema, RoundListSchema, ScoreSchema, PeriodScoreSchema, TeamScoreSchema, CfsMatchTeamSchema, CfsMatchSchema, CfsScoreSchema, CfsVenueSchema, CfsWeatherSchema, MatchItemSchema, MatchItemListSchema, CfsPlayerInnerSchema, statNum, PlayerGameStatsSchema, PlayerStatsItemSchema, PlayerStatsListSchema, RosterPlayerSchema, TeamPlayersSchema, MatchRosterSchema, TeamItemSchema, TeamListSchema, SquadPlayerInnerSchema, SquadPlayerItemSchema, SquadSchema, SquadListSchema, WinLossRecordSchema, LadderEntryRawSchema, LadderResponseSchema;
 var init_validation = __esm({
   "src/lib/validation.ts"() {
     "use strict";
@@ -1558,6 +1611,10 @@ var init_validation = __esm({
       state: z.string().optional(),
       timeZone: z.string().optional()
     }).passthrough();
+    CfsWeatherSchema = z.object({
+      tempInCelsius: z.number().nullable().optional(),
+      weatherType: z.string().nullable().optional()
+    }).passthrough();
     MatchItemSchema = z.object({
       match: CfsMatchSchema,
       score: CfsScoreSchema.nullish(),
@@ -1566,7 +1623,9 @@ var init_validation = __esm({
         name: z.string(),
         roundId: z.string(),
         roundNumber: z.number()
-      }).passthrough().optional()
+      }).passthrough().optional(),
+      attendance: z.number().nullable().optional(),
+      weather: CfsWeatherSchema.nullable().optional()
     }).passthrough();
     MatchItemListSchema = z.object({
       roundId: z.string().optional(),
@@ -1627,6 +1686,10 @@ var init_validation = __esm({
       metresGained: statNum,
       scoreInvolvements: statNum,
       ratingPoints: statNum,
+      goalEfficiency: statNum,
+      shotEfficiency: statNum,
+      interchangeCounts: statNum,
+      brownlowVotes: statNum,
       extendedStats: z.object({
         effectiveDisposals: statNum,
         effectiveKicks: statNum,
@@ -1671,8 +1734,8 @@ var init_validation = __esm({
       }).passthrough().nullable().optional()
     }).passthrough();
     PlayerStatsListSchema = z.object({
-      homeTeamPlayerStats: z.array(PlayerStatsItemSchema),
-      awayTeamPlayerStats: z.array(PlayerStatsItemSchema)
+      homeTeamPlayerStats: z.array(PlayerStatsItemSchema).nullable().default([]),
+      awayTeamPlayerStats: z.array(PlayerStatsItemSchema).nullable().default([])
     }).passthrough();
     RosterPlayerSchema = z.object({
       player: z.object({
@@ -2293,6 +2356,7 @@ function transformSquiggleGamesToResults(games, season) {
     season,
     roundNumber: g.round,
     roundType: inferRoundType(g.roundname),
+    roundName: g.roundname || null,
     date: new Date(g.unixtime * 1e3),
     venue: normaliseVenueName(g.venue),
     homeTeam: normaliseTeamName(g.hteam),
@@ -2314,6 +2378,9 @@ function transformSquiggleGamesToResults(games, season) {
     q4Away: null,
     status: "Complete",
     attendance: null,
+    weatherTempCelsius: null,
+    weatherType: null,
+    roundCode: toRoundCode(g.roundname),
     venueState: null,
     venueTimezone: g.tz || null,
     homeRushedBehinds: null,
@@ -2481,6 +2548,9 @@ function parseAflTablesGameStats(html, matchId, season, roundNumber) {
         roundNumber,
         team: teamName,
         competition: "AFLM",
+        date: null,
+        homeTeam: null,
+        awayTeam: null,
         playerId: `AT_${displayName.replace(/\s+/g, "_")}`,
         givenName,
         surname,
@@ -2520,6 +2590,12 @@ function parseAflTablesGameStats(html, matchId, season, roundNumber) {
         totalPossessions: null,
         timeOnGroundPercentage: safeInt(cells[24] ?? ""),
         ratingPoints: null,
+        position: null,
+        goalEfficiency: null,
+        shotEfficiency: null,
+        interchangeCounts: null,
+        brownlowVotes: null,
+        supercoachScore: null,
         dreamTeamPoints: null,
         effectiveDisposals: null,
         effectiveKicks: null,
@@ -2579,6 +2655,7 @@ function parseSeasonPage(html, year) {
   const results = [];
   let currentRound = 0;
   let currentRoundType = "HomeAndAway";
+  let currentRoundName = "";
   let lastHARound = 0;
   let matchCounter = 0;
   $("table").each((_i, table) => {
@@ -2589,6 +2666,7 @@ function parseSeasonPage(html, year) {
     if (roundMatch?.[1] && border !== "1") {
       currentRound = Number.parseInt(roundMatch[1], 10);
       currentRoundType = inferRoundType(text);
+      currentRoundName = text;
       if (currentRoundType === "HomeAndAway") {
         lastHARound = currentRound;
       }
@@ -2596,6 +2674,7 @@ function parseSeasonPage(html, year) {
     }
     if (border !== "1" && inferRoundType(text) === "Finals") {
       currentRoundType = "Finals";
+      currentRoundName = text;
       currentRound = finalsRoundNumber(text, lastHARound);
       return;
     }
@@ -2626,6 +2705,7 @@ function parseSeasonPage(html, year) {
       season: year,
       roundNumber: currentRound,
       roundType: currentRoundType,
+      roundName: currentRoundName || null,
       date,
       venue,
       homeTeam,
@@ -2647,6 +2727,9 @@ function parseSeasonPage(html, year) {
       q4Away: awayQuarters[3] ?? null,
       status: "Complete",
       attendance,
+      weatherTempCelsius: null,
+      weatherType: null,
+      roundCode: toRoundCode(currentRoundName),
       venueState: null,
       venueTimezone: null,
       homeRushedBehinds: null,
@@ -3340,29 +3423,14 @@ async function resolveTeamId(client, teamName, competition) {
   }
   return ok(String(match.id));
 }
-async function fetchFromAflApi(query) {
-  const client = new AflApiClient();
-  const competition = query.competition ?? "AFLM";
-  const season = query.season ?? resolveDefaultSeason(competition);
-  const [teamIdResult, seasonResult] = await Promise.all([
-    resolveTeamId(client, query.team, competition),
-    client.resolveCompSeason(competition, season)
-  ]);
-  if (!teamIdResult.success) return teamIdResult;
-  if (!seasonResult.success) return seasonResult;
-  const teamId = Number.parseInt(teamIdResult.data, 10);
-  if (Number.isNaN(teamId)) {
-    return err(new ValidationError(`Invalid team ID: ${teamIdResult.data}`));
-  }
-  const squadResult = await client.fetchSquad(teamId, seasonResult.data);
-  if (!squadResult.success) return squadResult;
-  const teamName = normaliseTeamName(squadResult.data.squad.team?.name ?? query.team);
-  const players = squadResult.data.squad.players.map((p) => ({
+function mapSquadToPlayerDetails(data, fallbackTeamName, competition) {
+  const resolvedName = normaliseTeamName(data.squad.team?.name ?? fallbackTeamName);
+  return data.squad.players.map((p) => ({
     playerId: p.player.providerId ?? String(p.player.id),
     givenName: p.player.firstName,
     surname: p.player.surname,
     displayName: `${p.player.firstName} ${p.player.surname}`,
-    team: teamName,
+    team: resolvedName,
     jumperNumber: p.jumperNumber ?? null,
     position: p.position ?? null,
     dateOfBirth: p.player.dateOfBirth ?? null,
@@ -3378,35 +3446,83 @@ async function fetchFromAflApi(query) {
     source: "afl-api",
     competition
   }));
-  return ok(players);
+}
+async function fetchFromAflApi(query) {
+  const client = new AflApiClient();
+  const competition = query.competition ?? "AFLM";
+  const season = query.season ?? resolveDefaultSeason(competition);
+  const seasonResult = await client.resolveCompSeason(competition, season);
+  if (!seasonResult.success) return seasonResult;
+  if (query.team) {
+    const teamIdResult = await resolveTeamId(client, query.team, competition);
+    if (!teamIdResult.success) return teamIdResult;
+    const teamId = Number.parseInt(teamIdResult.data, 10);
+    if (Number.isNaN(teamId)) {
+      return err(new ValidationError(`Invalid team ID: ${teamIdResult.data}`));
+    }
+    const squadResult = await client.fetchSquad(teamId, seasonResult.data);
+    if (!squadResult.success) return squadResult;
+    return ok(mapSquadToPlayerDetails(squadResult.data, query.team, competition));
+  }
+  const teamType = competition === "AFLW" ? "WOMEN" : "MEN";
+  const teamsResult = await client.fetchTeams(teamType);
+  if (!teamsResult.success) return teamsResult;
+  const teamEntries = teamsResult.data.map((t) => ({
+    id: Number.parseInt(String(t.id), 10),
+    name: normaliseTeamName(t.name)
+  }));
+  const results = await batchedMap(
+    teamEntries,
+    (entry) => client.fetchSquad(entry.id, seasonResult.data)
+  );
+  const allPlayers = [];
+  for (let i = 0; i < results.length; i++) {
+    const result = results[i];
+    const entry = teamEntries[i];
+    if (result?.success && entry) {
+      allPlayers.push(...mapSquadToPlayerDetails(result.data, entry.name, competition));
+    }
+  }
+  return ok(allPlayers);
+}
+async function fetchAllTeamsFromScraper(fetchFn, source, competition) {
+  const teamNames = [...AFL_SENIOR_TEAMS];
+  const results = await batchedMap(teamNames, (name) => fetchFn(name));
+  const allPlayers = [];
+  for (const result of results) {
+    if (result.success) {
+      allPlayers.push(...result.data.map((p) => ({ ...p, source, competition })));
+    }
+  }
+  return ok(allPlayers);
 }
 async function fetchFromFootyWire(query) {
   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;
-  const players = result.data.map((p) => ({
-    ...p,
-    source: "footywire",
-    competition
-  }));
-  return ok(players);
+  if (query.team) {
+    const teamName = normaliseTeamName(query.team);
+    const result = await client.fetchPlayerList(teamName);
+    if (!result.success) return result;
+    return ok(result.data.map((p) => ({ ...p, source: "footywire", competition })));
+  }
+  return fetchAllTeamsFromScraper((name) => client.fetchPlayerList(name), "footywire", competition);
 }
 async function fetchFromAflTables(query) {
   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;
-  const players = result.data.map((p) => ({
-    ...p,
-    source: "afl-tables",
+  if (query.team) {
+    const teamName = normaliseTeamName(query.team);
+    const result = await client.fetchPlayerList(teamName);
+    if (!result.success) return result;
+    return ok(result.data.map((p) => ({ ...p, source: "afl-tables", competition })));
+  }
+  return fetchAllTeamsFromScraper(
+    (name) => client.fetchPlayerList(name),
+    "afl-tables",
     competition
-  }));
-  return ok(players);
+  );
 }
 async function fetchPlayerDetails(query) {
   switch (query.source) {
@@ -3428,6 +3544,7 @@ async function fetchPlayerDetails(query) {
 var init_player_details = __esm({
   "src/api/player-details.ts"() {
     "use strict";
+    init_concurrency();
     init_date_utils();
     init_errors();
     init_result();
@@ -3442,18 +3559,21 @@ var init_player_details = __esm({
 function toNullable(value) {
   return value ?? null;
 }
-function transformOne(item, matchId, season, roundNumber, competition, source, teamIdMap) {
+function transformOne(item, ctx) {
   const inner = item.player.player.player;
   const stats = item.playerStats?.stats;
   const clearances = stats?.clearances;
   return {
-    matchId,
-    season,
-    roundNumber,
+    matchId: ctx.matchId,
+    season: ctx.season,
+    roundNumber: ctx.roundNumber,
     team: normaliseTeamName(
-      teamIdMap?.get(item.teamId) ?? AFL_API_TEAM_IDS.get(item.teamId) ?? item.teamId
+      ctx.teamIdMap?.get(item.teamId) ?? AFL_API_TEAM_IDS.get(item.teamId) ?? item.teamId
     ),
-    competition,
+    competition: ctx.competition,
+    date: ctx.date ?? null,
+    homeTeam: ctx.homeTeam ?? null,
+    awayTeam: ctx.awayTeam ?? null,
     playerId: inner.playerId,
     givenName: inner.playerName.givenName,
     surname: inner.playerName.surname,
@@ -3493,6 +3613,12 @@ function transformOne(item, matchId, season, roundNumber, competition, source, t
     totalPossessions: toNullable(stats?.totalPossessions),
     timeOnGroundPercentage: toNullable(item.playerStats?.timeOnGroundPercentage),
     ratingPoints: toNullable(stats?.ratingPoints),
+    position: item.player.player.position ?? null,
+    goalEfficiency: toNullable(stats?.goalEfficiency),
+    shotEfficiency: toNullable(stats?.shotEfficiency),
+    interchangeCounts: toNullable(stats?.interchangeCounts),
+    brownlowVotes: toNullable(stats?.brownlowVotes),
+    supercoachScore: null,
     dreamTeamPoints: toNullable(stats?.dreamTeamPoints),
     effectiveDisposals: toNullable(stats?.extendedStats?.effectiveDisposals),
     effectiveKicks: toNullable(stats?.extendedStats?.effectiveKicks),
@@ -3520,16 +3646,12 @@ function transformOne(item, matchId, season, roundNumber, competition, source, t
     kickinsPlayon: toNullable(stats?.extendedStats?.kickinsPlayon),
     ruckContests: toNullable(stats?.extendedStats?.ruckContests),
     scoreLaunches: toNullable(stats?.extendedStats?.scoreLaunches),
-    source
+    source: ctx.source
   };
 }
-function transformPlayerStats(data, matchId, season, roundNumber, competition, source = "afl-api", teamIdMap) {
-  const home = data.homeTeamPlayerStats.map(
-    (item) => transformOne(item, matchId, season, roundNumber, competition, source, teamIdMap)
-  );
-  const away = data.awayTeamPlayerStats.map(
-    (item) => transformOne(item, matchId, season, roundNumber, competition, source, teamIdMap)
-  );
+function transformPlayerStats(data, ctx) {
+  const home = (data.homeTeamPlayerStats ?? []).map((item) => transformOne(item, ctx));
+  const away = (data.awayTeamPlayerStats ?? []).map((item) => transformOne(item, ctx));
   return [...home, ...away];
 }
 var init_player_stats = __esm({
@@ -3558,24 +3680,19 @@ async function fetchPlayerStats(query) {
           teamIdMap2.set(match.awayTeamId, normaliseTeamName(match.awayTeam.name));
         }
         return ok(
-          transformPlayerStats(
-            statsResult.data,
-            query.matchId,
-            query.season,
-            query.round ?? 0,
+          transformPlayerStats(statsResult.data, {
+            matchId: query.matchId,
+            season: query.season,
+            roundNumber: query.round ?? 0,
             competition,
-            "afl-api",
-            teamIdMap2
-          )
+            source: "afl-api",
+            teamIdMap: teamIdMap2
+          })
         );
       }
       const seasonResult = await client.resolveCompSeason(competition, query.season);
       if (!seasonResult.success) return seasonResult;
-      const roundNumber = query.round ?? 1;
-      const matchItemsResult = await client.fetchRoundMatchItemsByNumber(
-        seasonResult.data,
-        roundNumber
-      );
+      const matchItemsResult = query.round != null ? await client.fetchRoundMatchItemsByNumber(seasonResult.data, query.round) : await client.fetchSeasonMatchItems(seasonResult.data);
       if (!matchItemsResult.success) return matchItemsResult;
       const teamIdMap = /* @__PURE__ */ new Map();
       for (const item of matchItemsResult.data) {
@@ -3594,15 +3711,17 @@ async function fetchPlayerStats(query) {
         const item = matchItemsResult.data[i];
         if (!item) continue;
         allStats.push(
-          ...transformPlayerStats(
-            statsResult.data,
-            item.match.matchId,
-            query.season,
-            roundNumber,
+          ...transformPlayerStats(statsResult.data, {
+            matchId: item.match.matchId,
+            season: query.season,
+            roundNumber: item.round?.roundNumber ?? query.round ?? 0,
             competition,
-            "afl-api",
-            teamIdMap
-          )
+            source: "afl-api",
+            teamIdMap,
+            date: new Date(item.match.utcStartTime),
+            homeTeam: normaliseTeamName(item.match.homeTeam.name),
+            awayTeam: normaliseTeamName(item.match.awayTeam.name)
+          })
         );
       }
       return ok(allStats);
@@ -3612,29 +3731,26 @@ async function fetchPlayerStats(query) {
       const fwClient = new FootyWireClient();
       const idsResult = await fwClient.fetchSeasonMatchIds(query.season);
       if (!idsResult.success) return idsResult;
-      const matchIds = idsResult.data;
-      if (matchIds.length === 0) {
+      const entries = query.round != null ? idsResult.data.filter((e) => e.roundNumber === query.round) : idsResult.data;
+      if (entries.length === 0) {
         return ok([]);
       }
       const allStats = [];
       const batchSize = 5;
-      for (let i = 0; i < matchIds.length; i += batchSize) {
-        const batch = matchIds.slice(i, i + batchSize);
+      for (let i = 0; i < entries.length; i += batchSize) {
+        const batch = entries.slice(i, i + batchSize);
         const results = await Promise.all(
-          batch.map((mid) => fwClient.fetchMatchPlayerStats(mid, query.season, query.round ?? 0))
+          batch.map((e) => fwClient.fetchMatchPlayerStats(e.matchId, query.season, e.roundNumber))
         );
         for (const result of results) {
           if (result.success) {
             allStats.push(...result.data);
           }
         }
-        if (i + batchSize < matchIds.length) {
+        if (i + batchSize < entries.length) {
           await new Promise((resolve) => setTimeout(resolve, 500));
         }
       }
-      if (query.round != null) {
-        return ok(allStats.filter((s) => s.roundNumber === query.round));
-      }
       return ok(allStats);
     }
     case "afl-tables": {
@@ -5136,10 +5252,10 @@ var init_player_details2 = __esm({
     playerDetailsCommand = defineCommand9({
       meta: {
         name: "player-details",
-        description: "Fetch player biographical details for a team"
+        description: "Fetch player biographical details (optionally filtered by team)"
       },
       args: {
-        ...REQUIRED_TEAM_FLAG,
+        ...TEAM_FLAG,
         source: {
           type: "string",
           description: "Data source: afl-api, footywire, afl-tables",
@@ -5154,16 +5270,18 @@ var init_player_details2 = __esm({
         const competition = validateCompetition(args.competition);
         const format = validateFormat(args.format);
         const season = validateOptionalSeason(args.season) ?? resolveDefaultSeason(competition);
-        const team = await resolveTeamNameOrPrompt(args.team);
+        const team = args.team ? await resolveTeamNameOrPrompt(args.team) : void 0;
+        const label = team ? `Fetching player details for ${team}\u2026` : "Fetching player details for all teams\u2026";
         const result = await withSpinner(
-          "Fetching player details\u2026",
+          label,
           () => fetchPlayerDetails({ source, team, season, competition })
         );
         if (!result.success) {
           throw result.error;
         }
         const data = result.data;
-        showSummary(`Loaded ${data.length} players for ${team} (${source})`);
+        const summary = team ? `Loaded ${data.length} players for ${team} (${source})` : `Loaded ${data.length} players across all teams (${source})`;
+        showSummary(summary);
         const formatOptions = {
           json: args.json,
           csv: args.csv,
@@ -5274,7 +5392,7 @@ resolveAliases();
 var main = defineCommand11({
   meta: {
     name: "fitzroy",
-    version: "1.4.2",
+    version: "1.6.0",
     description: "TypeScript port of the fitzRoy R package \u2014 fetch AFL data from the command line"
   },
   subCommands: {