fitzroy 1.4.2 → 1.6.0

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,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,
@@ -564,6 +573,22 @@ function mergeFootyWireStats(basicTeams, advancedTeams, matchId, season, roundNu
 
 // src/transforms/match-results.ts
 var FINALS_PATTERN = /final|elimination|qualifying|preliminary|semi|grand/i;
+var ROUND_CODE_MAP = /* @__PURE__ */ new Map([
+  ["Qualifying Final", "QF"],
+  ["Elimination Final", "EF"],
+  ["Semi Final", "SF"],
+  ["Preliminary Final", "PF"],
+  ["Grand Final", "GF"]
+]);
+var ROUND_NUMBER_PATTERN = /^Round\s+(\d+)$/i;
+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";
 }
@@ -617,6 +642,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),
@@ -637,7 +663,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,
@@ -750,10 +779,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 +790,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 +920,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 +968,7 @@ function parseMatchList(html, year) {
       season: year,
       roundNumber: currentRound,
       roundType: currentRoundType,
+      roundName: currentRoundName || null,
       date,
       venue: normaliseVenueName(venue),
       homeTeam,
@@ -940,6 +990,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,
@@ -1605,6 +1658,10 @@ var CfsVenueSchema = z.object({
   state: z.string().optional(),
   timeZone: z.string().optional()
 }).passthrough();
+var CfsWeatherSchema = z.object({
+  tempInCelsius: z.number().nullable().optional(),
+  weatherType: z.string().nullable().optional()
+}).passthrough();
 var MatchItemSchema = z.object({
   match: CfsMatchSchema,
   score: CfsScoreSchema.nullish(),
@@ -1613,7 +1670,9 @@ var MatchItemSchema = z.object({
     name: z.string(),
     roundId: z.string(),
     roundNumber: z.number()
-  }).passthrough().optional()
+  }).passthrough().optional(),
+  attendance: z.number().nullable().optional(),
+  weather: CfsWeatherSchema.nullable().optional()
 }).passthrough();
 var MatchItemListSchema = z.object({
   roundId: z.string().optional(),
@@ -1674,6 +1733,10 @@ var PlayerGameStatsSchema = z.object({
   metresGained: statNum,
   scoreInvolvements: statNum,
   ratingPoints: statNum,
+  goalEfficiency: statNum,
+  shotEfficiency: statNum,
+  interchangeCounts: statNum,
+  brownlowVotes: statNum,
   extendedStats: z.object({
     effectiveDisposals: statNum,
     effectiveKicks: statNum,
@@ -1718,8 +1781,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 +2376,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),
@@ -2334,6 +2398,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,
@@ -2743,6 +2819,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 +2830,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 +2838,7 @@ function parseSeasonPage(html, year) {
     }
     if (border !== "1" && inferRoundType(text) === "Finals") {
       currentRoundType = "Finals";
+      currentRoundName = text;
       currentRound = finalsRoundNumber(text, lastHARound);
       return;
     }
@@ -2790,6 +2869,7 @@ function parseSeasonPage(html, year) {
       season: year,
       roundNumber: currentRound,
       roundType: currentRoundType,
+      roundName: currentRoundName || null,
       date,
       venue,
       homeTeam,
@@ -2811,6 +2891,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,
@@ -3265,29 +3348,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 +3371,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 +3471,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 +3525,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),
@@ -3433,16 +3558,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 +3586,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 +3617,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 +3637,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.6.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",