fitzroy 1.7.1 → 1.8.0

package/README.md

@@ -1,5 +1,8 @@
 # fitzroy
 
+[![CI](https://github.com/jackemcpherson/fitzRoy-ts/actions/workflows/ci.yml/badge.svg)](https://github.com/jackemcpherson/fitzRoy-ts/actions/workflows/ci.yml)
+[![npm](https://img.shields.io/npm/v/fitzroy)](https://www.npmjs.com/package/fitzroy)
+
 TypeScript library and CLI for AFL data — match results, player stats, fixtures, ladders, lineups, squads, and teams.
 
 A port of the [fitzRoy R package](https://github.com/jimmyday12/fitzRoy).

package/dist/cli.js

@@ -106,13 +106,21 @@ var init_result = __esm({
 });
 
 // src/lib/date-utils.ts
-function parseFootyWireDate(dateStr, defaultYear) {
-  const trimmed = dateStr.trim();
-  if (trimmed === "") {
-    return null;
+function parseDate(raw, defaultYear) {
+  if (typeof raw === "number") {
+    const date = new Date(raw * 1e3);
+    return Number.isNaN(date.getTime()) ? null : date;
+  }
+  const trimmed = raw.trim();
+  if (trimmed === "") return null;
+  if (/^\d{4}-\d{2}-\d{2}/.test(trimmed)) {
+    const stripped = trimmed.replace(/[Zz]$|[+-]\d{2}:\d{2}$/, "");
+    const utc = stripped.includes("T") ? `${stripped}Z` : `${stripped}T00:00:00Z`;
+    const date = new Date(utc);
+    return Number.isNaN(date.getTime()) ? null : date;
   }
   const withoutDow = trimmed.replace(/^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\w*\s+/i, "");
-  const normalised = withoutDow.replace(/-/g, " ");
+  const normalised = withoutDow.replace(/[-/]/g, " ");
   const fullMatch = /^(\d{1,2})\s+([A-Za-z]+)\s+(\d{4})$/.exec(normalised);
   if (fullMatch) {
     const [, dayStr, monthStr, yearStr] = fullMatch;
@@ -120,6 +128,13 @@ function parseFootyWireDate(dateStr, defaultYear) {
       return buildUtcDate(Number.parseInt(yearStr, 10), monthStr, Number.parseInt(dayStr, 10));
     }
   }
+  const mdyMatch = /^([A-Za-z]+)\s+(\d{1,2})\s+(\d{4})$/.exec(normalised);
+  if (mdyMatch) {
+    const [, monthStr, dayStr, yearStr] = mdyMatch;
+    if (dayStr && monthStr && yearStr) {
+      return buildUtcDate(Number.parseInt(yearStr, 10), monthStr, Number.parseInt(dayStr, 10));
+    }
+  }
   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;
@@ -127,40 +142,15 @@ function parseFootyWireDate(dateStr, defaultYear) {
     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) {
+    if (!hourStr || !minStr || !ampm) {
       return buildUtcDate(defaultYear, monthStr, day);
     }
-    let aestHours = Number.parseInt(hourStr, 10);
+    let hours = 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 = melbourneLocalToUtc(defaultYear, monthIndex, day, aestHours, minutes);
-    if (Number.isNaN(date.getTime())) return null;
-    return date;
-  }
-  return null;
-}
-function parseAflTablesDate(dateStr) {
-  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 dmy = /^(\d{1,2})\s+([A-Za-z]+)\s+(\d{4})$/.exec(normalised);
-  if (dmy) {
-    const [, dayStr, monthStr, yearStr] = dmy;
-    if (dayStr && monthStr && yearStr) {
-      return buildUtcDate(Number.parseInt(yearStr, 10), monthStr, Number.parseInt(dayStr, 10));
-    }
-  }
-  const mdy = /^([A-Za-z]+)\s+(\d{1,2})\s+(\d{4})$/.exec(normalised);
-  if (mdy) {
-    const [, monthStr, dayStr, yearStr] = mdy;
-    if (dayStr && monthStr && yearStr) {
-      return buildUtcDate(Number.parseInt(yearStr, 10), monthStr, Number.parseInt(dayStr, 10));
-    }
+    if (ampm.toLowerCase() === "pm" && hours < 12) hours += 12;
+    if (ampm.toLowerCase() === "am" && hours === 12) hours = 0;
+    const date = melbourneLocalToUtc(defaultYear, monthIndex, day, hours, minutes);
+    return Number.isNaN(date.getTime()) ? null : date;
   }
   return null;
 }
@@ -716,7 +706,7 @@ function transformMatchItems(items, season, competition, source = "afl-api") {
       roundNumber: item.round?.roundNumber ?? 0,
       roundType: inferRoundType(item.round?.name ?? ""),
       roundName: item.round?.name ?? null,
-      date: new Date(item.match.utcStartTime),
+      date: parseDate(item.match.utcStartTime) ?? new Date(item.match.utcStartTime),
       venue: item.venue?.name ? normaliseVenueName(item.venue.name) : "",
       homeTeam: normaliseTeamName(item.match.homeTeam.name),
       awayTeam: normaliseTeamName(item.match.awayTeam.name),
@@ -755,6 +745,7 @@ var FINALS_PATTERN, ROUND_CODE_MAP, ROUND_NUMBER_PATTERN;
 var init_match_results = __esm({
   "src/transforms/match-results.ts"() {
     "use strict";
+    init_date_utils();
     init_team_mapping();
     init_venue_mapping();
     FINALS_PATTERN = /final|elimination|qualifying|preliminary|semi|grand/i;
@@ -815,7 +806,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, year) ?? new Date(Date.UTC(year, 0, 1));
+    const date = parseDate(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);
@@ -895,7 +886,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, year) ?? new Date(Date.UTC(year, 0, 1));
+    const date = parseDate(dateText, year) ?? new Date(Date.UTC(year, 0, 1));
     gameNumber++;
     const scoreCell = cells.length >= 5 ? $(cells[4]) : null;
     const scoreText = scoreCell?.text().trim() ?? "";
@@ -985,7 +976,7 @@ function teamNameToFootyWireSlug(teamName) {
 }
 function normaliseDob(raw) {
   if (!raw) return null;
-  const parsed = parseFootyWireDate(raw);
+  const parsed = parseDate(raw);
   if (parsed) return parsed.toISOString().slice(0, 10);
   return raw;
 }
@@ -2379,7 +2370,7 @@ function transformSquiggleGamesToResults(games, season) {
     roundNumber: g.round,
     roundType: inferRoundType(g.roundname),
     roundName: g.roundname || null,
-    date: new Date(g.unixtime * 1e3),
+    date: parseDate(g.unixtime) ?? new Date(g.unixtime * 1e3),
     venue: normaliseVenueName(g.venue),
     homeTeam: normaliseTeamName(g.hteam),
     awayTeam: normaliseTeamName(g.ateam),
@@ -2419,7 +2410,7 @@ function transformSquiggleGamesToFixture(games, season) {
     season,
     roundNumber: g.round,
     roundType: inferRoundType(g.roundname),
-    date: new Date(g.unixtime * 1e3),
+    date: parseDate(g.unixtime) ?? new Date(g.unixtime * 1e3),
     venue: normaliseVenueName(g.venue),
     homeTeam: normaliseTeamName(g.hteam),
     awayTeam: normaliseTeamName(g.ateam),
@@ -2445,6 +2436,7 @@ function transformSquiggleStandings(standings) {
 var init_squiggle2 = __esm({
   "src/transforms/squiggle.ts"() {
     "use strict";
+    init_date_utils();
     init_team_mapping();
     init_venue_mapping();
     init_match_results();
@@ -2458,7 +2450,7 @@ function toFixture(item, season, fallbackRoundNumber, competition) {
     season,
     roundNumber: item.round?.roundNumber ?? fallbackRoundNumber,
     roundType: inferRoundType(item.round?.name ?? ""),
-    date: new Date(item.match.utcStartTime),
+    date: parseDate(item.match.utcStartTime) ?? new Date(item.match.utcStartTime),
     venue: normaliseVenueName(item.venue?.name ?? ""),
     homeTeam: normaliseTeamName(item.match.homeTeam.name),
     awayTeam: normaliseTeamName(item.match.awayTeam.name),
@@ -2525,6 +2517,7 @@ var init_fixture = __esm({
   "src/api/fixture.ts"() {
     "use strict";
     init_concurrency();
+    init_date_utils();
     init_errors();
     init_result();
     init_team_mapping();
@@ -2776,9 +2769,9 @@ function parseQuarterScores(text) {
 function parseDateFromInfo(text, year) {
   const dateMatch = /(\d{1,2}-[A-Z][a-z]{2}-\d{4})/.exec(text);
   if (dateMatch?.[1]) {
-    return parseAflTablesDate(dateMatch[1]) ?? new Date(year, 0, 1);
+    return parseDate(dateMatch[1]) ?? new Date(year, 0, 1);
   }
-  return parseAflTablesDate(text) ?? new Date(year, 0, 1);
+  return parseDate(text) ?? new Date(year, 0, 1);
 }
 function parseVenueFromInfo(html) {
   const $ = cheerio5.load(html);
@@ -3805,7 +3798,7 @@ function mapRow(i, c, isAflw, competition) {
     roundNumber: roundAt(c.round, i),
     team: normaliseTeamName(team),
     competition,
-    date: dateStr ? new Date(dateStr) : null,
+    date: dateStr ? parseDate(dateStr) : null,
     homeTeam: homeTeam ? normaliseTeamName(homeTeam) : null,
     awayTeam: awayTeam ? normaliseTeamName(awayTeam) : null,
     playerId: String(c.playerId?.[i] ?? ""),
@@ -3887,6 +3880,7 @@ var REQUIRED_COLUMN_GROUPS, AFLM_COLUMNS, AFLW_COLUMNS;
 var init_fryzigg_player_stats = __esm({
   "src/transforms/fryzigg-player-stats.ts"() {
     "use strict";
+    init_date_utils();
     init_errors();
     init_result();
     init_team_mapping();
@@ -4108,7 +4102,7 @@ async function fetchPlayerStats(query) {
             competition,
             source: "afl-api",
             teamIdMap,
-            date: new Date(item.match.utcStartTime),
+            date: parseDate(item.match.utcStartTime) ?? new Date(item.match.utcStartTime),
             homeTeam: normaliseTeamName(item.match.homeTeam.name),
             awayTeam: normaliseTeamName(item.match.awayTeam.name)
           })
@@ -4171,6 +4165,7 @@ var init_player_stats2 = __esm({
   "src/api/player-stats.ts"() {
     "use strict";
     init_concurrency();
+    init_date_utils();
     init_errors();
     init_result();
     init_team_mapping();
@@ -4297,7 +4292,7 @@ async function fetchSquad(query) {
     displayName: `${p.player.firstName} ${p.player.surname}`,
     jumperNumber: p.jumperNumber ?? null,
     position: p.position ?? null,
-    dateOfBirth: p.player.dateOfBirth ? new Date(p.player.dateOfBirth) : null,
+    dateOfBirth: p.player.dateOfBirth ? parseDate(p.player.dateOfBirth) : null,
     heightCm: p.player.heightInCm || null,
     weightKg: p.player.weightInKg || null,
     draftYear: p.player.draftYear ? Number.parseInt(p.player.draftYear, 10) || null : null,
@@ -4317,6 +4312,7 @@ async function fetchSquad(query) {
 var init_teams = __esm({
   "src/api/teams.ts"() {
     "use strict";
+    init_date_utils();
     init_errors();
     init_result();
     init_team_mapping();
@@ -5326,6 +5322,7 @@ var init_lineup3 = __esm({
         ...REQUIRED_ROUND_FLAG,
         match: { type: "string", description: "Filter by team name to find a specific match" },
         "match-id": { type: "string", description: "Specific match provider ID (advanced)" },
+        ...TEAM_FLAG,
         ...SOURCE_FLAG,
         ...COMPETITION_FLAG,
         ...OUTPUT_FLAGS
@@ -5336,6 +5333,7 @@ var init_lineup3 = __esm({
         const source = validateSource(args.source);
         const competition = validateCompetition(args.competition);
         const format = validateFormat(args.format);
+        const team = args.team ? await resolveTeamNameOrPrompt(args.team) : void 0;
         let matchId = args["match-id"];
         if (!matchId && args.match) {
           const client = new AflApiClient();
@@ -5352,8 +5350,11 @@ var init_lineup3 = __esm({
         if (!result.success) {
           throw result.error;
         }
-        const data = result.data;
-        showSummary(`Loaded ${data.length} lineups for ${season} round ${round}`);
+        const data = team ? result.data.filter((l) => l.homeTeam === team || l.awayTeam === team) : result.data;
+        const teamSuffix = team ? ` for ${team}` : "";
+        showSummary(
+          `Loaded ${data.length} lineup${data.length === 1 ? "" : "s"} for ${season} round ${round}${teamSuffix}`
+        );
         const formatOptions = {
           json: args.json,
           csv: args.csv,
@@ -5800,7 +5801,7 @@ resolveAliases();
 var main = defineCommand11({
   meta: {
     name: "fitzroy",
-    version: "1.7.1",
+    version: "1.8.0",
     description: "TypeScript port of the fitzRoy R package \u2014 fetch AFL data from the command line"
   },
   subCommands: {

package/dist/index.d.ts

@@ -598,65 +598,32 @@ declare function fetchSquad2(query: SquadQuery): Promise<Result<Squad, Error>>;
 * @module
 */
 /**
-* Parse a UTC ISO 8601 string from the AFL API into a Date.
+* Parse any AFL date string or timestamp into a correct UTC Date.
 *
-* The AFL API returns dates like `"2024-03-14T06:20:00.000Z"` or
-* `"2024-03-14T06:20:00Z"`.
+* Accepts every format seen across AFL data sources and always returns
+* a proper UTC Date. Input format is auto-detected:
 *
-* @param iso - A UTC ISO 8601 date string
-* @returns A Date object, or null if parsing fails
+* | Input | Source | Handling |
+* |---|---|---|
+* | `1709622000` (number) | Squiggle unix timestamp | × 1000 → UTC |
+* | `"2026-03-05T08:30:00"` | AFL API `utcStartTime` (no Z) | Force UTC |
+* | `"2026-03-05T08:30:00.000Z"` | AFL API (with Z) | Parse as UTC |
+* | `"Thu 13 Mar 7:30pm"` | FootyWire (Melbourne local) | AEST/AEDT → UTC |
+* | `"16-Mar-2024"` / `"16 Mar 2024"` | AFL Tables / FootyWire | Midnight UTC |
+* | `"Sat 16 Mar 2024"` | FootyWire (day-of-week prefix) | Midnight UTC |
 *
-* @example
-* ```ts
-* parseAflApiDate("2024-03-14T06:20:00.000Z")
-* // => Date(2024-03-14T06:20:00.000Z)
-* ```
+* @param raw - A date string or unix timestamp (seconds)
+* @param defaultYear - Year to use when the string lacks one (FootyWire fixtures)
+* @returns A Date object in UTC, or null if parsing fails
 */
+declare function parseDate(raw: string | number, defaultYear?: number): Date | null;
+/** @deprecated Use {@link parseDate} instead. */
 declare function parseAflApiDate(iso: string): Date | null;
-/**
-* Parse a date string from FootyWire into a Date.
-*
-* FootyWire uses formats like:
-* - `"Sat 16 Mar 2024"` (day-of-week, day, month-abbrev, year)
-* - `"16 Mar 2024"` (day, month-abbrev, year)
-* - `"16-Mar-2024"` (day-month-year with hyphens)
-* - `"Thu 13 Mar 7:30pm"` (day-of-week, day, month, time — no year)
-* - `"13 Mar"` (day, month — no year)
-*
-* @param dateStr - A FootyWire date string
-* @param defaultYear - Year to use when the string lacks one (e.g. fixture pages)
-* @returns A Date object (UTC), or null if parsing fails
-*
-* @example
-* ```ts
-* parseFootyWireDate("Sat 16 Mar 2024")
-* // => Date(2024-03-16T00:00:00.000Z)
-*
-* parseFootyWireDate("Thu 13 Mar 7:30pm", 2025)
-* // => Date(2025-03-13T09:30:00.000Z) — time stored as AEST offset from UTC
-* ```
-*/
+/** @deprecated Use {@link parseDate} instead. */
+declare function parseAflApiMatchTime(iso: string): Date | null;
+/** @deprecated Use {@link parseDate} instead. */
 declare function parseFootyWireDate(dateStr: string, defaultYear?: number): Date | null;
-/**
-* Parse a date string from AFL Tables into a Date.
-*
-* AFL Tables uses formats like:
-* - `"16-Mar-2024"` (DD-Mon-YYYY)
-* - `"Sat 16-Mar-2024"` (Dow DD-Mon-YYYY)
-* - `"16 Mar 2024"` (DD Mon YYYY)
-*
-* For very old historical matches, dates may be partial (e.g. just a year),
-* which are not supported and return null.
-*
-* @param dateStr - An AFL Tables date string
-* @returns A Date object (midnight UTC), or null if parsing fails
-*
-* @example
-* ```ts
-* parseAflTablesDate("16-Mar-2024")
-* // => Date(2024-03-16T00:00:00.000Z)
-* ```
-*/
+/** @deprecated Use {@link parseDate} instead. */
 declare function parseAflTablesDate(dateStr: string): Date | null;
 /**
 * Format a Date as an AEST/AEDT-aware display string.
@@ -666,12 +633,6 @@ declare function parseAflTablesDate(dateStr: string): Date | null;
 *
 * @param date - The Date to format
 * @returns A formatted string like `"Thu 14 Mar 2024 5:20 PM AEDT"`
-*
-* @example
-* ```ts
-* toAestString(new Date("2024-03-14T06:20:00.000Z"))
-* // => "Thu 14 Mar 2024 5:20 PM AEDT"
-* ```
 */
 declare function toAestString(date: Date): string;
 /**
@@ -2299,4 +2260,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, transformFryziggPlayerStats, 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, 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, FryziggTransformOptions, FryziggClientOptions, FryziggClient, 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, transformFryziggPlayerStats, toAestString, parseFootyWireDate, parseDate, parseAflTablesDate, parseAflApiMatchTime, parseAflApiDate, ok, normaliseVenueName, normaliseTeamName, inferRoundType, fetchTeams2 as fetchTeams, fetchTeamStats2 as fetchTeamStats, fetchSquad2 as fetchSquad, fetchPlayerStats2 as fetchPlayerStats, fetchPlayerDetails, fetchMatchResults, fetchLineup, fetchLadder2 as fetchLadder, 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, FryziggTransformOptions, FryziggClientOptions, FryziggClient, 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

@@ -46,20 +46,21 @@ function err(error) {
 import * as cheerio2 from "cheerio";
 
 // src/lib/date-utils.ts
-function parseAflApiDate(iso) {
-  const date = new Date(iso);
-  if (Number.isNaN(date.getTime())) {
-    return null;
+function parseDate(raw, defaultYear) {
+  if (typeof raw === "number") {
+    const date = new Date(raw * 1e3);
+    return Number.isNaN(date.getTime()) ? null : date;
   }
-  return date;
-}
-function parseFootyWireDate(dateStr, defaultYear) {
-  const trimmed = dateStr.trim();
-  if (trimmed === "") {
-    return null;
+  const trimmed = raw.trim();
+  if (trimmed === "") return null;
+  if (/^\d{4}-\d{2}-\d{2}/.test(trimmed)) {
+    const stripped = trimmed.replace(/[Zz]$|[+-]\d{2}:\d{2}$/, "");
+    const utc = stripped.includes("T") ? `${stripped}Z` : `${stripped}T00:00:00Z`;
+    const date = new Date(utc);
+    return Number.isNaN(date.getTime()) ? null : date;
   }
   const withoutDow = trimmed.replace(/^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\w*\s+/i, "");
-  const normalised = withoutDow.replace(/-/g, " ");
+  const normalised = withoutDow.replace(/[-/]/g, " ");
   const fullMatch = /^(\d{1,2})\s+([A-Za-z]+)\s+(\d{4})$/.exec(normalised);
   if (fullMatch) {
     const [, dayStr, monthStr, yearStr] = fullMatch;
@@ -67,6 +68,13 @@ function parseFootyWireDate(dateStr, defaultYear) {
       return buildUtcDate(Number.parseInt(yearStr, 10), monthStr, Number.parseInt(dayStr, 10));
     }
   }
+  const mdyMatch = /^([A-Za-z]+)\s+(\d{1,2})\s+(\d{4})$/.exec(normalised);
+  if (mdyMatch) {
+    const [, monthStr, dayStr, yearStr] = mdyMatch;
+    if (dayStr && monthStr && yearStr) {
+      return buildUtcDate(Number.parseInt(yearStr, 10), monthStr, Number.parseInt(dayStr, 10));
+    }
+  }
   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;
@@ -74,42 +82,29 @@ function parseFootyWireDate(dateStr, defaultYear) {
     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) {
+    if (!hourStr || !minStr || !ampm) {
       return buildUtcDate(defaultYear, monthStr, day);
     }
-    let aestHours = Number.parseInt(hourStr, 10);
+    let hours = 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 = melbourneLocalToUtc(defaultYear, monthIndex, day, aestHours, minutes);
-    if (Number.isNaN(date.getTime())) return null;
-    return date;
+    if (ampm.toLowerCase() === "pm" && hours < 12) hours += 12;
+    if (ampm.toLowerCase() === "am" && hours === 12) hours = 0;
+    const date = melbourneLocalToUtc(defaultYear, monthIndex, day, hours, minutes);
+    return Number.isNaN(date.getTime()) ? null : date;
   }
   return null;
 }
+function parseAflApiDate(iso) {
+  return parseDate(iso);
+}
+function parseAflApiMatchTime(iso) {
+  return parseDate(iso);
+}
+function parseFootyWireDate(dateStr, defaultYear) {
+  return parseDate(dateStr, defaultYear);
+}
 function parseAflTablesDate(dateStr) {
-  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 dmy = /^(\d{1,2})\s+([A-Za-z]+)\s+(\d{4})$/.exec(normalised);
-  if (dmy) {
-    const [, dayStr, monthStr, yearStr] = dmy;
-    if (dayStr && monthStr && yearStr) {
-      return buildUtcDate(Number.parseInt(yearStr, 10), monthStr, Number.parseInt(dayStr, 10));
-    }
-  }
-  const mdy = /^([A-Za-z]+)\s+(\d{1,2})\s+(\d{4})$/.exec(normalised);
-  if (mdy) {
-    const [, monthStr, dayStr, yearStr] = mdy;
-    if (dayStr && monthStr && yearStr) {
-      return buildUtcDate(Number.parseInt(yearStr, 10), monthStr, Number.parseInt(dayStr, 10));
-    }
-  }
-  return null;
+  return parseDate(dateStr);
 }
 function toAestString(date) {
   const formatter = new Intl.DateTimeFormat("en-AU", {
@@ -657,7 +652,7 @@ function transformMatchItems(items, season, competition, source = "afl-api") {
       roundNumber: item.round?.roundNumber ?? 0,
       roundType: inferRoundType(item.round?.name ?? ""),
       roundName: item.round?.name ?? null,
-      date: new Date(item.match.utcStartTime),
+      date: parseDate(item.match.utcStartTime) ?? new Date(item.match.utcStartTime),
       venue: item.venue?.name ? normaliseVenueName(item.venue.name) : "",
       homeTeam: normaliseTeamName(item.match.homeTeam.name),
       awayTeam: normaliseTeamName(item.match.awayTeam.name),
@@ -972,7 +967,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, year) ?? new Date(Date.UTC(year, 0, 1));
+    const date = parseDate(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);
@@ -1052,7 +1047,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, year) ?? new Date(Date.UTC(year, 0, 1));
+    const date = parseDate(dateText, year) ?? new Date(Date.UTC(year, 0, 1));
     gameNumber++;
     const scoreCell = cells.length >= 5 ? $(cells[4]) : null;
     const scoreText = scoreCell?.text().trim() ?? "";
@@ -1162,7 +1157,7 @@ function teamNameToFootyWireSlug(teamName) {
 }
 function normaliseDob(raw) {
   if (!raw) return null;
-  const parsed = parseFootyWireDate(raw);
+  const parsed = parseDate(raw);
   if (parsed) return parsed.toISOString().slice(0, 10);
   return raw;
 }
@@ -2399,7 +2394,7 @@ function transformSquiggleGamesToResults(games, season) {
     roundNumber: g.round,
     roundType: inferRoundType(g.roundname),
     roundName: g.roundname || null,
-    date: new Date(g.unixtime * 1e3),
+    date: parseDate(g.unixtime) ?? new Date(g.unixtime * 1e3),
     venue: normaliseVenueName(g.venue),
     homeTeam: normaliseTeamName(g.hteam),
     awayTeam: normaliseTeamName(g.ateam),
@@ -2439,7 +2434,7 @@ function transformSquiggleGamesToFixture(games, season) {
     season,
     roundNumber: g.round,
     roundType: inferRoundType(g.roundname),
-    date: new Date(g.unixtime * 1e3),
+    date: parseDate(g.unixtime) ?? new Date(g.unixtime * 1e3),
     venue: normaliseVenueName(g.venue),
     homeTeam: normaliseTeamName(g.hteam),
     awayTeam: normaliseTeamName(g.ateam),
@@ -2470,7 +2465,7 @@ function toFixture(item, season, fallbackRoundNumber, competition) {
     season,
     roundNumber: item.round?.roundNumber ?? fallbackRoundNumber,
     roundType: inferRoundType(item.round?.name ?? ""),
-    date: new Date(item.match.utcStartTime),
+    date: parseDate(item.match.utcStartTime) ?? new Date(item.match.utcStartTime),
     venue: normaliseVenueName(item.venue?.name ?? ""),
     homeTeam: normaliseTeamName(item.match.homeTeam.name),
     awayTeam: normaliseTeamName(item.match.awayTeam.name),
@@ -2940,9 +2935,9 @@ function parseQuarterScores(text) {
 function parseDateFromInfo(text, year) {
   const dateMatch = /(\d{1,2}-[A-Z][a-z]{2}-\d{4})/.exec(text);
   if (dateMatch?.[1]) {
-    return parseAflTablesDate(dateMatch[1]) ?? new Date(year, 0, 1);
+    return parseDate(dateMatch[1]) ?? new Date(year, 0, 1);
   }
-  return parseAflTablesDate(text) ?? new Date(year, 0, 1);
+  return parseDate(text) ?? new Date(year, 0, 1);
 }
 function parseVenueFromInfo(html) {
   const $ = cheerio6.load(html);
@@ -3761,7 +3756,7 @@ function mapRow(i, c, isAflw, competition) {
     roundNumber: roundAt(c.round, i),
     team: normaliseTeamName(team),
     competition,
-    date: dateStr ? new Date(dateStr) : null,
+    date: dateStr ? parseDate(dateStr) : null,
     homeTeam: homeTeam ? normaliseTeamName(homeTeam) : null,
     awayTeam: awayTeam ? normaliseTeamName(awayTeam) : null,
     playerId: String(c.playerId?.[i] ?? ""),
@@ -3997,7 +3992,7 @@ async function fetchPlayerStats(query) {
             competition,
             source: "afl-api",
             teamIdMap,
-            date: new Date(item.match.utcStartTime),
+            date: parseDate(item.match.utcStartTime) ?? new Date(item.match.utcStartTime),
             homeTeam: normaliseTeamName(item.match.homeTeam.name),
             awayTeam: normaliseTeamName(item.match.awayTeam.name)
           })
@@ -4161,7 +4156,7 @@ async function fetchSquad(query) {
     displayName: `${p.player.firstName} ${p.player.surname}`,
     jumperNumber: p.jumperNumber ?? null,
     position: p.position ?? null,
-    dateOfBirth: p.player.dateOfBirth ? new Date(p.player.dateOfBirth) : null,
+    dateOfBirth: p.player.dateOfBirth ? parseDate(p.player.dateOfBirth) : null,
     heightCm: p.player.heightInCm || null,
     weightKg: p.player.weightInKg || null,
     draftYear: p.player.draftYear ? Number.parseInt(p.player.draftYear, 10) || null : null,
@@ -4241,7 +4236,9 @@ export {
   normaliseVenueName,
   ok,
   parseAflApiDate,
+  parseAflApiMatchTime,
   parseAflTablesDate,
+  parseDate,
   parseFootyWireDate,
   toAestString,
   transformFryziggPlayerStats,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fitzroy",
-  "version": "1.7.1",
+  "version": "1.8.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",
@@ -46,7 +46,6 @@
     "@jackemcpherson/rds-js": "0.2.0",
     "cheerio": "^1.0.0",
     "citty": "^0.2.1",
-    "fitzroy": "^1.4.1",
     "picocolors": "^1.1.1",
     "zod": "^4.3.6"
   },