fitzroy 1.4.2 → 1.5.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,11 @@ function mergeFootyWireStats(basicTeams, advancedTeams, matchId, season, roundNu
         totalPossessions: null,
         timeOnGroundPercentage: adv?.timeOnGroundPercentage ?? null,
         ratingPoints: null,
+        position: null,
+        goalEfficiency: null,
+        shotEfficiency: null,
+        interchangeCounts: null,
+        supercoachScore: basic.supercoachPoints,
         dreamTeamPoints: basic.dreamTeamPoints,
         effectiveDisposals: adv?.effectiveDisposals ?? null,
         effectiveKicks: null,
@@ -684,6 +692,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),
@@ -734,10 +743,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 +791,7 @@ function parseMatchList(html, year) {
       season: year,
       roundNumber: currentRound,
       roundType: currentRoundType,
+      roundName: currentRoundName || null,
       date,
       venue: normaliseVenueName(venue),
       homeTeam,
@@ -1105,10 +1117,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 +1128,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(
@@ -1627,6 +1657,9 @@ var init_validation = __esm({
       metresGained: statNum,
       scoreInvolvements: statNum,
       ratingPoints: statNum,
+      goalEfficiency: statNum,
+      shotEfficiency: statNum,
+      interchangeCounts: statNum,
       extendedStats: z.object({
         effectiveDisposals: statNum,
         effectiveKicks: statNum,
@@ -1671,8 +1704,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 +2326,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),
@@ -2481,6 +2515,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 +2557,11 @@ function parseAflTablesGameStats(html, matchId, season, roundNumber) {
         totalPossessions: null,
         timeOnGroundPercentage: safeInt(cells[24] ?? ""),
         ratingPoints: null,
+        position: null,
+        goalEfficiency: null,
+        shotEfficiency: null,
+        interchangeCounts: null,
+        supercoachScore: null,
         dreamTeamPoints: null,
         effectiveDisposals: null,
         effectiveKicks: null,
@@ -2579,6 +2621,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 +2632,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 +2640,7 @@ function parseSeasonPage(html, year) {
     }
     if (border !== "1" && inferRoundType(text) === "Finals") {
       currentRoundType = "Finals";
+      currentRoundName = text;
       currentRound = finalsRoundNumber(text, lastHARound);
       return;
     }
@@ -2626,6 +2671,7 @@ function parseSeasonPage(html, year) {
       season: year,
       roundNumber: currentRound,
       roundType: currentRoundType,
+      roundName: currentRoundName || null,
       date,
       venue,
       homeTeam,
@@ -3340,29 +3386,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 +3409,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 +3507,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 +3522,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 +3576,11 @@ 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),
+    supercoachScore: null,
     dreamTeamPoints: toNullable(stats?.dreamTeamPoints),
     effectiveDisposals: toNullable(stats?.extendedStats?.effectiveDisposals),
     effectiveKicks: toNullable(stats?.extendedStats?.effectiveKicks),
@@ -3520,16 +3608,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 +3642,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 +3673,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 +3693,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 +5214,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 +5232,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 +5354,7 @@ resolveAliases();
 var main = defineCommand11({
   meta: {
     name: "fitzroy",
-    version: "1.4.2",
+    version: "1.5.0",
     description: "TypeScript port of the fitzRoy R package \u2014 fetch AFL data from the command line"
   },
   subCommands: {

package/dist/index.d.ts

@@ -56,6 +56,8 @@ interface MatchResult {
 	readonly season: number;
 	readonly roundNumber: number;
 	readonly roundType: RoundType;
+	/** Human-readable round name (e.g. "Round 1", "Qualifying Final"). Null for scraped sources. */
+	readonly roundName: string | null;
 	readonly date: Date;
 	readonly venue: string;
 	readonly homeTeam: string;
@@ -104,6 +106,10 @@ interface PlayerStats {
 	readonly roundNumber: number;
 	readonly team: string;
 	readonly competition: CompetitionCode;
+	/** Match context for cross-source joins (null when unavailable). */
+	readonly date: Date | null;
+	readonly homeTeam: string | null;
+	readonly awayTeam: string | null;
 	/** Player identification. */
 	readonly playerId: string;
 	readonly givenName: string;
@@ -149,7 +155,14 @@ interface PlayerStats {
 	readonly totalPossessions: number | null;
 	readonly timeOnGroundPercentage: number | null;
 	readonly ratingPoints: number | null;
+	/** Position played in this match (e.g. "INT", "MIDFIELD"). Null when unavailable. */
+	readonly position: string | null;
+	/** Efficiency stats. */
+	readonly goalEfficiency: number | null;
+	readonly shotEfficiency: number | null;
+	readonly interchangeCounts: number | null;
 	/** Fantasy. */
+	readonly supercoachScore: number | null;
 	readonly dreamTeamPoints: number | null;
 	/** Extended stats. */
 	readonly effectiveDisposals: number | null;
@@ -297,7 +310,8 @@ interface PlayerDetails {
 /** Query parameters for fetching player details. */
 interface PlayerDetailsQuery {
 	readonly source: DataSource;
-	readonly team: string;
+	/** Team name. When omitted, returns details for all teams. */
+	readonly team?: string | undefined;
 	readonly season?: number | undefined;
 	readonly current?: boolean | undefined;
 	readonly competition?: CompetitionCode | undefined;
@@ -505,8 +519,9 @@ declare function fetchMatchResults(query: SeasonRoundQuery): Promise<Result<Matc
 * Fetch player biographical details (DOB, height, draft info, etc.).
 *
 * Dispatches to the appropriate data source based on `query.source`.
+* When `query.team` is omitted, returns details for all teams.
 *
-* @param query - Team name, source, and optional season/competition filters.
+* @param query - Source, optional team name, and optional season/competition filters.
 * @returns Array of player details.
 *
 * @example
@@ -1209,6 +1224,9 @@ declare const PlayerGameStatsSchema: z2.ZodObject<{
 	metresGained: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 	scoreInvolvements: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 	ratingPoints: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+	goalEfficiency: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+	shotEfficiency: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+	interchangeCounts: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 	extendedStats: z2.ZodOptional<z2.ZodNullable<z2.ZodObject<{
 		effectiveDisposals: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 		effectiveKicks: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
@@ -1294,6 +1312,9 @@ declare const PlayerStatsItemSchema: z2.ZodObject<{
 			metresGained: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 			scoreInvolvements: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 			ratingPoints: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+			goalEfficiency: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+			shotEfficiency: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+			interchangeCounts: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 			extendedStats: z2.ZodOptional<z2.ZodNullable<z2.ZodObject<{
 				effectiveDisposals: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 				effectiveKicks: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
@@ -1328,7 +1349,7 @@ declare const PlayerStatsItemSchema: z2.ZodObject<{
 }, z2.core.$loose>;
 /** Schema for the player stats response. */
 declare const PlayerStatsListSchema: z2.ZodObject<{
-	homeTeamPlayerStats: z2.ZodArray<z2.ZodObject<{
+	homeTeamPlayerStats: z2.ZodDefault<z2.ZodNullable<z2.ZodArray<z2.ZodObject<{
 		player: z2.ZodObject<{
 			player: z2.ZodObject<{
 				position: z2.ZodOptional<z2.ZodString>;
@@ -1383,6 +1404,9 @@ declare const PlayerStatsListSchema: z2.ZodObject<{
 				metresGained: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 				scoreInvolvements: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 				ratingPoints: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+				goalEfficiency: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+				shotEfficiency: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+				interchangeCounts: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 				extendedStats: z2.ZodOptional<z2.ZodNullable<z2.ZodObject<{
 					effectiveDisposals: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 					effectiveKicks: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
@@ -1414,8 +1438,8 @@ declare const PlayerStatsListSchema: z2.ZodObject<{
 			}, z2.core.$loose>;
 			timeOnGroundPercentage: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 		}, z2.core.$loose>>>;
-	}, z2.core.$loose>>;
-	awayTeamPlayerStats: z2.ZodArray<z2.ZodObject<{
+	}, z2.core.$loose>>>>;
+	awayTeamPlayerStats: z2.ZodDefault<z2.ZodNullable<z2.ZodArray<z2.ZodObject<{
 		player: z2.ZodObject<{
 			player: z2.ZodObject<{
 				position: z2.ZodOptional<z2.ZodString>;
@@ -1470,6 +1494,9 @@ declare const PlayerStatsListSchema: z2.ZodObject<{
 				metresGained: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 				scoreInvolvements: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 				ratingPoints: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+				goalEfficiency: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+				shotEfficiency: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
+				interchangeCounts: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 				extendedStats: z2.ZodOptional<z2.ZodNullable<z2.ZodObject<{
 					effectiveDisposals: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 					effectiveKicks: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
@@ -1501,7 +1528,7 @@ declare const PlayerStatsListSchema: z2.ZodObject<{
 			}, z2.core.$loose>;
 			timeOnGroundPercentage: z2.ZodOptional<z2.ZodNullable<z2.ZodUnion<readonly [z2.ZodNumber, z2.ZodPipe<z2.ZodString, z2.ZodTransform<number | null, string>>, z2.ZodPipe<z2.ZodBoolean, z2.ZodTransform<1 | 0, boolean>>]>>>;
 		}, z2.core.$loose>>>;
-	}, z2.core.$loose>>;
+	}, z2.core.$loose>>>>;
 }, z2.core.$loose>;
 /** Inferred type for a single player stats item. */
 type PlayerStatsItem = z2.infer<typeof PlayerStatsItemSchema>;
@@ -2065,12 +2092,15 @@ declare class FootyWireClient {
 	/**
 	* 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.
 	*/
-	fetchSeasonMatchIds(year: number): Promise<Result<string[], ScrapeError>>;
+	fetchSeasonMatchIds(year: number): Promise<Result<Array<{
+		matchId: string;
+		roundNumber: number;
+	}>, ScrapeError>>;
 	/**
 	* Fetch player list (team history) from FootyWire.
 	*
@@ -2177,17 +2207,26 @@ declare function inferRoundType(roundName: string): RoundType;
 * @returns Flattened, normalised MatchResult array.
 */
 declare function transformMatchItems(items: readonly MatchItem[], season: number, competition: CompetitionCode, source?: DataSource): MatchResult[];
+/** Context for a single match transform. */
+interface TransformContext {
+	readonly matchId: string;
+	readonly season: number;
+	readonly roundNumber: number;
+	readonly competition: CompetitionCode;
+	readonly source: DataSource;
+	readonly teamIdMap?: ReadonlyMap<string, string>;
+	readonly date?: Date | null;
+	readonly homeTeam?: string | null;
+	readonly awayTeam?: string | null;
+}
 /**
 * Transform raw AFL API player stats list into typed PlayerStats objects.
 *
 * @param data - Raw player stats response with home/away arrays.
-* @param matchId - The match provider ID.
-* @param season - The season year.
-* @param roundNumber - The round number.
-* @param competition - The competition code.
+* @param ctx - Match context (IDs, season, round, source, team mappings, match metadata).
 * @returns Flattened PlayerStats array (home players first, then away).
 */
-declare function transformPlayerStats(data: PlayerStatsList, matchId: string, season: number, roundNumber: number, competition: CompetitionCode, source?: DataSource, teamIdMap?: ReadonlyMap<string, string>): PlayerStats[];
+declare function transformPlayerStats(data: PlayerStatsList, ctx: TransformContext): PlayerStats[];
 /**
 * Transform Squiggle games into MatchResult objects.
 *
@@ -2204,4 +2243,4 @@ declare function transformSquiggleGamesToFixture(games: readonly SquiggleGame[],
 * Transform Squiggle standings into LadderEntry objects.
 */
 declare function transformSquiggleStandings(standings: readonly SquiggleStanding[]): LadderEntry[];
-export { transformSquiggleStandings, transformSquiggleGamesToResults, transformSquiggleGamesToFixture, transformPlayerStats, transformMatchRoster, transformMatchItems, transformLadderEntries, toAestString, parseFootyWireDate, parseAflTablesDate, parseAflApiDate, ok, normaliseVenueName, normaliseTeamName, inferRoundType, fetchTeams2 as fetchTeams, fetchTeamStats2 as fetchTeamStats, fetchSquad2 as fetchSquad, fetchPlayerStats2 as fetchPlayerStats, fetchPlayerDetails, fetchMatchResults, fetchLineup, fetchLadder2 as fetchLadder, fetchFryziggStats, fetchFixture, fetchCoachesVotes, fetchAwards, err, computeLadder, ValidationError, UnsupportedSourceError, TeamStatsSummaryType, TeamStatsQuery, TeamStatsEntry, TeamScoreSchema, TeamScore, TeamQuery, TeamPlayersSchema, TeamPlayers, TeamListSchema, TeamList, TeamItemSchema, TeamItem, Team, SquiggleStandingsResponseSchema, SquiggleStandingsResponse, SquiggleStandingSchema, SquiggleStanding, SquiggleGamesResponseSchema, SquiggleGamesResponse, SquiggleGameSchema, SquiggleGame, SquiggleClientOptions, SquiggleClient, SquadSchema, SquadQuery, SquadPlayerItemSchema, SquadPlayerItem, SquadPlayerInnerSchema, SquadPlayer, SquadListSchema, SquadList, Squad, SeasonRoundQuery, ScrapeError, ScoreSchema, Score, RoundType, RoundSchema, RoundListSchema, RoundList, Round, RosterPlayerSchema, RosterPlayer, RisingStarNomination, Result, QuarterScore, PlayerStatsQuery, PlayerStatsListSchema, PlayerStatsList, PlayerStatsItemSchema, PlayerStatsItem, PlayerStats, PlayerGameStatsSchema, PlayerGameStats, PlayerDetailsQuery, PlayerDetails, PeriodScoreSchema, PeriodScore, Ok, MatchStatus, MatchRosterSchema, MatchRoster, MatchResult, MatchQuery, MatchItemSchema, MatchItemListSchema, MatchItemList, MatchItem, LineupQuery, LineupPlayer, Lineup, LadderResponseSchema, LadderResponse, LadderQuery, LadderEntryRawSchema, LadderEntryRaw, LadderEntry, Ladder, FootyWireClientOptions, FootyWireClient, Fixture, Err, DataSource, CompseasonSchema, CompseasonListSchema, CompseasonList, Compseason, CompetitionSchema, CompetitionListSchema, CompetitionList, CompetitionCode, Competition, CoachesVoteQuery, CoachesVote, CfsVenueSchema, CfsVenue, CfsScoreSchema, CfsScore, CfsMatchTeamSchema, CfsMatchTeam, CfsMatchSchema, CfsMatch, BrownlowVote, AwardType, AwardQuery, Award, AllAustralianSelection, AflTablesClientOptions, AflTablesClient, AflCoachesClientOptions, AflCoachesClient, AflApiTokenSchema, AflApiToken, AflApiError, AflApiClientOptions, AflApiClient };
+export { transformSquiggleStandings, transformSquiggleGamesToResults, transformSquiggleGamesToFixture, transformPlayerStats, transformMatchRoster, transformMatchItems, transformLadderEntries, toAestString, parseFootyWireDate, parseAflTablesDate, parseAflApiDate, ok, normaliseVenueName, normaliseTeamName, inferRoundType, fetchTeams2 as fetchTeams, fetchTeamStats2 as fetchTeamStats, fetchSquad2 as fetchSquad, fetchPlayerStats2 as fetchPlayerStats, fetchPlayerDetails, fetchMatchResults, fetchLineup, fetchLadder2 as fetchLadder, fetchFryziggStats, fetchFixture, fetchCoachesVotes, fetchAwards, err, computeLadder, ValidationError, UnsupportedSourceError, TransformContext, TeamStatsSummaryType, TeamStatsQuery, TeamStatsEntry, TeamScoreSchema, TeamScore, TeamQuery, TeamPlayersSchema, TeamPlayers, TeamListSchema, TeamList, TeamItemSchema, TeamItem, Team, SquiggleStandingsResponseSchema, SquiggleStandingsResponse, SquiggleStandingSchema, SquiggleStanding, SquiggleGamesResponseSchema, SquiggleGamesResponse, SquiggleGameSchema, SquiggleGame, SquiggleClientOptions, SquiggleClient, SquadSchema, SquadQuery, SquadPlayerItemSchema, SquadPlayerItem, SquadPlayerInnerSchema, SquadPlayer, SquadListSchema, SquadList, Squad, SeasonRoundQuery, ScrapeError, ScoreSchema, Score, RoundType, RoundSchema, RoundListSchema, RoundList, Round, RosterPlayerSchema, RosterPlayer, RisingStarNomination, Result, QuarterScore, PlayerStatsQuery, PlayerStatsListSchema, PlayerStatsList, PlayerStatsItemSchema, PlayerStatsItem, PlayerStats, PlayerGameStatsSchema, PlayerGameStats, PlayerDetailsQuery, PlayerDetails, PeriodScoreSchema, PeriodScore, Ok, MatchStatus, MatchRosterSchema, MatchRoster, MatchResult, MatchQuery, MatchItemSchema, MatchItemListSchema, MatchItemList, MatchItem, LineupQuery, LineupPlayer, Lineup, LadderResponseSchema, LadderResponse, LadderQuery, LadderEntryRawSchema, LadderEntryRaw, LadderEntry, Ladder, FootyWireClientOptions, FootyWireClient, Fixture, Err, DataSource, CompseasonSchema, CompseasonListSchema, CompseasonList, Compseason, CompetitionSchema, CompetitionListSchema, CompetitionList, CompetitionCode, Competition, CoachesVoteQuery, CoachesVote, CfsVenueSchema, CfsVenue, CfsScoreSchema, CfsScore, CfsMatchTeamSchema, CfsMatchTeam, CfsMatchSchema, CfsMatch, BrownlowVote, AwardType, AwardQuery, Award, AllAustralianSelection, AflTablesClientOptions, AflTablesClient, AflCoachesClientOptions, AflCoachesClient, AflApiTokenSchema, AflApiToken, AflApiError, AflApiClientOptions, AflApiClient };

package/dist/index.js

@@ -489,6 +489,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,
@@ -528,6 +531,11 @@ function mergeFootyWireStats(basicTeams, advancedTeams, matchId, season, roundNu
         totalPossessions: null,
         timeOnGroundPercentage: adv?.timeOnGroundPercentage ?? null,
         ratingPoints: null,
+        position: null,
+        goalEfficiency: null,
+        shotEfficiency: null,
+        interchangeCounts: null,
+        supercoachScore: basic.supercoachPoints,
         dreamTeamPoints: basic.dreamTeamPoints,
         effectiveDisposals: adv?.effectiveDisposals ?? null,
         effectiveKicks: null,
@@ -617,6 +625,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),
@@ -750,10 +759,10 @@ var FootyWireClient = class {
   /**
    * 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}`;
@@ -761,15 +770,33 @@ var FootyWireClient = class {
     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(
@@ -873,10 +900,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]) {
@@ -919,6 +948,7 @@ function parseMatchList(html, year) {
       season: year,
       roundNumber: currentRound,
       roundType: currentRoundType,
+      roundName: currentRoundName || null,
       date,
       venue: normaliseVenueName(venue),
       homeTeam,
@@ -1674,6 +1704,9 @@ var PlayerGameStatsSchema = z.object({
   metresGained: statNum,
   scoreInvolvements: statNum,
   ratingPoints: statNum,
+  goalEfficiency: statNum,
+  shotEfficiency: statNum,
+  interchangeCounts: statNum,
   extendedStats: z.object({
     effectiveDisposals: statNum,
     effectiveKicks: statNum,
@@ -1718,8 +1751,8 @@ var PlayerStatsItemSchema = z.object({
   }).passthrough().nullable().optional()
 }).passthrough();
 var PlayerStatsListSchema = z.object({
-  homeTeamPlayerStats: z.array(PlayerStatsItemSchema),
-  awayTeamPlayerStats: z.array(PlayerStatsItemSchema)
+  homeTeamPlayerStats: z.array(PlayerStatsItemSchema).nullable().default([]),
+  awayTeamPlayerStats: z.array(PlayerStatsItemSchema).nullable().default([])
 }).passthrough();
 var RosterPlayerSchema = z.object({
   player: z.object({
@@ -2313,6 +2346,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),
@@ -2481,6 +2515,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 +2557,11 @@ function parseAflTablesGameStats(html, matchId, season, roundNumber) {
         totalPossessions: null,
         timeOnGroundPercentage: safeInt(cells[24] ?? ""),
         ratingPoints: null,
+        position: null,
+        goalEfficiency: null,
+        shotEfficiency: null,
+        interchangeCounts: null,
+        supercoachScore: null,
         dreamTeamPoints: null,
         effectiveDisposals: null,
         effectiveKicks: null,
@@ -2743,6 +2785,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) => {
@@ -2753,6 +2796,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;
       }
@@ -2760,6 +2804,7 @@ function parseSeasonPage(html, year) {
     }
     if (border !== "1" && inferRoundType(text) === "Finals") {
       currentRoundType = "Finals";
+      currentRoundName = text;
       currentRound = finalsRoundNumber(text, lastHARound);
       return;
     }
@@ -2790,6 +2835,7 @@ function parseSeasonPage(html, year) {
       season: year,
       roundNumber: currentRound,
       roundType: currentRoundType,
+      roundName: currentRoundName || null,
       date,
       venue,
       homeTeam,
@@ -3265,29 +3311,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,
@@ -3303,35 +3334,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) {
@@ -3355,18 +3434,21 @@ async function fetchPlayerDetails(query) {
 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,
@@ -3406,6 +3488,11 @@ 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),
+    supercoachScore: null,
     dreamTeamPoints: toNullable(stats?.dreamTeamPoints),
     effectiveDisposals: toNullable(stats?.extendedStats?.effectiveDisposals),
     effectiveKicks: toNullable(stats?.extendedStats?.effectiveKicks),
@@ -3433,16 +3520,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];
 }
 
@@ -3465,24 +3548,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) {
@@ -3501,15 +3579,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);
@@ -3519,29 +3599,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": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fitzroy",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "TypeScript port of the fitzRoy R package — programmatic access to AFL data including match results, player stats, fixtures, ladders, and more",
   "type": "module",
   "main": "./dist/index.js",