fitzroy 1.1.0 → 1.1.1

package/dist/index.js

@@ -47,35 +47,40 @@ function parseAflApiDate(iso) {
   }
   return date;
 }
-function parseFootyWireDate(dateStr) {
+function parseFootyWireDate(dateStr, defaultYear) {
   const trimmed = dateStr.trim();
   if (trimmed === "") {
     return null;
   }
   const withoutDow = trimmed.replace(/^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\w*\s+/i, "");
   const normalised = withoutDow.replace(/-/g, " ");
-  const match = /^(\d{1,2})\s+([A-Za-z]+)\s+(\d{4})$/.exec(normalised);
-  if (!match) {
-    return null;
-  }
-  const [, dayStr, monthStr, yearStr] = match;
-  if (!dayStr || !monthStr || !yearStr) {
-    return null;
-  }
-  const monthIndex = MONTH_ABBREV_TO_INDEX.get(monthStr.toLowerCase());
-  if (monthIndex === void 0) {
-    return null;
-  }
-  const year = Number.parseInt(yearStr, 10);
-  const day = Number.parseInt(dayStr, 10);
-  const date = new Date(Date.UTC(year, monthIndex, day));
-  if (Number.isNaN(date.getTime())) {
-    return null;
+  const fullMatch = /^(\d{1,2})\s+([A-Za-z]+)\s+(\d{4})$/.exec(normalised);
+  if (fullMatch) {
+    const [, dayStr, monthStr, yearStr] = fullMatch;
+    if (dayStr && monthStr && yearStr) {
+      return buildUtcDate(Number.parseInt(yearStr, 10), monthStr, Number.parseInt(dayStr, 10));
+    }
   }
-  if (date.getUTCFullYear() !== year || date.getUTCMonth() !== monthIndex || date.getUTCDate() !== day) {
-    return null;
+  const shortMatch = /^(\d{1,2})\s+([A-Za-z]+)(?:\s+(\d{1,2}):(\d{2})(am|pm))?$/i.exec(normalised);
+  if (shortMatch && defaultYear != null) {
+    const [, dayStr, monthStr, hourStr, minStr, ampm] = shortMatch;
+    if (!dayStr || !monthStr) return null;
+    const monthIndex = MONTH_ABBREV_TO_INDEX.get(monthStr.toLowerCase());
+    if (monthIndex === void 0) return null;
+    const day = Number.parseInt(dayStr, 10);
+    const hasTime = hourStr && minStr && ampm;
+    if (!hasTime) {
+      return buildUtcDate(defaultYear, monthStr, day);
+    }
+    let aestHours = Number.parseInt(hourStr, 10);
+    const minutes = Number.parseInt(minStr, 10);
+    if (ampm.toLowerCase() === "pm" && aestHours < 12) aestHours += 12;
+    if (ampm.toLowerCase() === "am" && aestHours === 12) aestHours = 0;
+    const date = new Date(Date.UTC(defaultYear, monthIndex, day, aestHours - 10, minutes));
+    if (Number.isNaN(date.getTime())) return null;
+    return date;
   }
-  return date;
+  return null;
 }
 function parseAflTablesDate(dateStr) {
   const trimmed = dateStr.trim();
@@ -810,7 +815,7 @@ function parseMatchList(html, year) {
     const scoreLink = scoreCell.find("a").attr("href") ?? "";
     const midMatch = /mid=(\d+)/.exec(scoreLink);
     const matchId = midMatch?.[1] ? `FW_${midMatch[1]}` : `FW_${year}_R${currentRound}_${homeTeam}`;
-    const date = parseFootyWireDate(dateText) ?? new Date(year, 0, 1);
+    const date = parseFootyWireDate(dateText, year) ?? new Date(Date.UTC(year, 0, 1));
     const homeGoals = Math.floor(homePoints / 6);
     const homeBehinds = homePoints - homeGoals * 6;
     const awayGoals = Math.floor(awayPoints / 6);
@@ -880,7 +885,7 @@ function parseFixtureList(html, year) {
     if (teamLinks.length < 2) return;
     const homeTeam = normaliseTeamName($(teamLinks[0]).text().trim());
     const awayTeam = normaliseTeamName($(teamLinks[1]).text().trim());
-    const date = parseFootyWireDate(dateText) ?? new Date(year, 0, 1);
+    const date = parseFootyWireDate(dateText, year) ?? new Date(Date.UTC(year, 0, 1));
     gameNumber++;
     const scoreCell = cells.length >= 5 ? $(cells[4]) : null;
     const scoreText = scoreCell?.text().trim() ?? "";
@@ -988,6 +993,12 @@ var FOOTYWIRE_SLUG_MAP = /* @__PURE__ */ new Map([
 function teamNameToFootyWireSlug(teamName) {
   return FOOTYWIRE_SLUG_MAP.get(teamName);
 }
+function normaliseDob(raw) {
+  if (!raw) return null;
+  const parsed = parseFootyWireDate(raw);
+  if (parsed) return parsed.toISOString().slice(0, 10);
+  return raw;
+}
 function parseFootyWirePlayerList(html, teamName) {
   const $ = cheerio2.load(html);
   const players = [];
@@ -1029,7 +1040,7 @@ function parseFootyWirePlayerList(html, teamName) {
       team: teamName,
       jumperNumber,
       position: position || null,
-      dateOfBirth: dobText || null,
+      dateOfBirth: normaliseDob(dobText),
       heightCm,
       weightKg: null,
       gamesPlayed,
@@ -1501,71 +1512,72 @@ var CfsPlayerInnerSchema = z.object({
   captain: z.boolean().optional(),
   playerJumperNumber: z.number().optional()
 }).passthrough();
+var statNum = z.number().nullable().optional();
 var PlayerGameStatsSchema = z.object({
-  goals: z.number().optional(),
-  behinds: z.number().optional(),
-  kicks: z.number().optional(),
-  handballs: z.number().optional(),
-  disposals: z.number().optional(),
-  marks: z.number().optional(),
-  bounces: z.number().optional(),
-  tackles: z.number().optional(),
-  contestedPossessions: z.number().optional(),
-  uncontestedPossessions: z.number().optional(),
-  totalPossessions: z.number().optional(),
-  inside50s: z.number().optional(),
-  marksInside50: z.number().optional(),
-  contestedMarks: z.number().optional(),
-  hitouts: z.number().optional(),
-  onePercenters: z.number().optional(),
-  disposalEfficiency: z.number().optional(),
-  clangers: z.number().optional(),
-  freesFor: z.number().optional(),
-  freesAgainst: z.number().optional(),
-  dreamTeamPoints: z.number().optional(),
+  goals: statNum,
+  behinds: statNum,
+  kicks: statNum,
+  handballs: statNum,
+  disposals: statNum,
+  marks: statNum,
+  bounces: statNum,
+  tackles: statNum,
+  contestedPossessions: statNum,
+  uncontestedPossessions: statNum,
+  totalPossessions: statNum,
+  inside50s: statNum,
+  marksInside50: statNum,
+  contestedMarks: statNum,
+  hitouts: statNum,
+  onePercenters: statNum,
+  disposalEfficiency: statNum,
+  clangers: statNum,
+  freesFor: statNum,
+  freesAgainst: statNum,
+  dreamTeamPoints: statNum,
   clearances: z.object({
-    centreClearances: z.number().optional(),
-    stoppageClearances: z.number().optional(),
-    totalClearances: z.number().optional()
-  }).passthrough().optional(),
-  rebound50s: z.number().optional(),
-  goalAssists: z.number().optional(),
-  goalAccuracy: z.number().optional(),
-  turnovers: z.number().optional(),
-  intercepts: z.number().optional(),
-  tacklesInside50: z.number().optional(),
-  shotsAtGoal: z.number().optional(),
-  metresGained: z.number().optional(),
-  scoreInvolvements: z.number().optional(),
-  ratingPoints: z.number().optional(),
+    centreClearances: statNum,
+    stoppageClearances: statNum,
+    totalClearances: statNum
+  }).passthrough().nullable().optional(),
+  rebound50s: statNum,
+  goalAssists: statNum,
+  goalAccuracy: statNum,
+  turnovers: statNum,
+  intercepts: statNum,
+  tacklesInside50: statNum,
+  shotsAtGoal: statNum,
+  metresGained: statNum,
+  scoreInvolvements: statNum,
+  ratingPoints: statNum,
   extendedStats: z.object({
-    effectiveDisposals: z.number().optional(),
-    effectiveKicks: z.number().optional(),
-    kickEfficiency: z.number().optional(),
-    kickToHandballRatio: z.number().optional(),
-    pressureActs: z.number().optional(),
-    defHalfPressureActs: z.number().optional(),
-    spoils: z.number().optional(),
-    hitoutsToAdvantage: z.number().optional(),
-    hitoutWinPercentage: z.number().optional(),
-    hitoutToAdvantageRate: z.number().optional(),
-    groundBallGets: z.number().optional(),
-    f50GroundBallGets: z.number().optional(),
-    interceptMarks: z.number().optional(),
-    marksOnLead: z.number().optional(),
-    contestedPossessionRate: z.number().optional(),
-    contestOffOneOnOnes: z.number().optional(),
-    contestOffWins: z.number().optional(),
-    contestOffWinsPercentage: z.number().optional(),
-    contestDefOneOnOnes: z.number().optional(),
-    contestDefLosses: z.number().optional(),
-    contestDefLossPercentage: z.number().optional(),
-    centreBounceAttendances: z.number().optional(),
-    kickins: z.number().optional(),
-    kickinsPlayon: z.number().optional(),
-    ruckContests: z.number().optional(),
-    scoreLaunches: z.number().optional()
-  }).passthrough().optional()
+    effectiveDisposals: statNum,
+    effectiveKicks: statNum,
+    kickEfficiency: statNum,
+    kickToHandballRatio: statNum,
+    pressureActs: statNum,
+    defHalfPressureActs: statNum,
+    spoils: statNum,
+    hitoutsToAdvantage: statNum,
+    hitoutWinPercentage: statNum,
+    hitoutToAdvantageRate: statNum,
+    groundBallGets: statNum,
+    f50GroundBallGets: statNum,
+    interceptMarks: statNum,
+    marksOnLead: statNum,
+    contestedPossessionRate: statNum,
+    contestOffOneOnOnes: statNum,
+    contestOffWins: statNum,
+    contestOffWinsPercentage: statNum,
+    contestDefOneOnOnes: statNum,
+    contestDefLosses: statNum,
+    contestDefLossPercentage: statNum,
+    centreBounceAttendances: statNum,
+    kickins: statNum,
+    kickinsPlayon: statNum,
+    ruckContests: statNum,
+    scoreLaunches: statNum
+  }).passthrough().nullable().optional()
 }).passthrough();
 var PlayerStatsItemSchema = z.object({
   player: z.object({
@@ -1578,7 +1590,7 @@ var PlayerStatsItemSchema = z.object({
   teamId: z.string(),
   playerStats: z.object({
     stats: PlayerGameStatsSchema,
-    timeOnGroundPercentage: z.number().optional()
+    timeOnGroundPercentage: z.number().nullable().optional()
   }).passthrough()
 }).passthrough();
 var PlayerStatsListSchema = z.object({
@@ -2696,6 +2708,7 @@ function parseAttendanceFromInfo(text) {
   if (!match?.[1]) return null;
   return Number.parseInt(match[1].replace(/,/g, ""), 10) || null;
 }
+var GP_HEADERS = /* @__PURE__ */ new Set(["gm", "gp", "p", "mp", "games"]);
 function parseAflTablesTeamStats(html, year) {
   const $ = cheerio6.load(html);
   const teamMap = /* @__PURE__ */ new Map();
@@ -2709,6 +2722,7 @@ function parseAflTablesTeamStats(html, year) {
     $(rows[0]).find("td, th").each((_ci, cell) => {
       headers.push($(cell).text().trim());
     });
+    const gpColIdx = headers.findIndex((h, i) => i > 0 && GP_HEADERS.has(h.toLowerCase()));
     for (let ri = 1; ri < rows.length; ri++) {
       const cells = $(rows[ri]).find("td");
       if (cells.length < 3) continue;
@@ -2721,7 +2735,12 @@ function parseAflTablesTeamStats(html, year) {
       }
       const entry = teamMap.get(teamName);
       if (!entry) continue;
+      if (gpColIdx >= 0 && suffix === "_for") {
+        const gpVal = Number.parseFloat($(cells[gpColIdx]).text().trim().replace(/,/g, "")) || 0;
+        entry.gamesPlayed = gpVal;
+      }
       for (let ci = 1; ci < cells.length; ci++) {
+        if (ci === gpColIdx) continue;
         const header = headers[ci];
         if (!header) continue;
         const value = Number.parseFloat($(cells[ci]).text().trim().replace(/,/g, "")) || 0;
@@ -3279,15 +3298,26 @@ async function fetchPlayerStats(query) {
     case "afl-api": {
       const client = new AflApiClient();
       if (query.matchId) {
-        const result = await client.fetchPlayerStats(query.matchId);
-        if (!result.success) return result;
+        const [rosterResult, statsResult] = await Promise.all([
+          client.fetchMatchRoster(query.matchId),
+          client.fetchPlayerStats(query.matchId)
+        ]);
+        if (!statsResult.success) return statsResult;
+        const teamIdMap2 = /* @__PURE__ */ new Map();
+        if (rosterResult.success) {
+          const match = rosterResult.data.match;
+          teamIdMap2.set(match.homeTeamId, match.homeTeam.name);
+          teamIdMap2.set(match.awayTeamId, match.awayTeam.name);
+        }
         return ok(
           transformPlayerStats(
-            result.data,
+            statsResult.data,
             query.matchId,
             query.season,
             query.round ?? 0,
-            competition
+            competition,
+            "afl-api",
+            teamIdMap2.size > 0 ? teamIdMap2 : void 0
           )
         );
       }

package/package.json

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