fitzroy 1.4.0 → 1.4.1

package/dist/cli.js

@@ -315,27 +315,6 @@ var init_team_mapping = __esm({
   }
 });
 
-// src/lib/parse-utils.ts
-function safeInt(text) {
-  const cleaned = text.replace(/[^0-9-]/g, "").trim();
-  if (!cleaned) return null;
-  const n = Number.parseInt(cleaned, 10);
-  return Number.isNaN(n) ? null : n;
-}
-function parseIntOr0(text) {
-  const n = Number.parseInt(text.replace(/[^0-9-]/g, ""), 10);
-  return Number.isNaN(n) ? 0 : n;
-}
-function parseFloatOr0(text) {
-  const n = Number.parseFloat(text.replace(/[^0-9.-]/g, ""));
-  return Number.isNaN(n) ? 0 : n;
-}
-var init_parse_utils = __esm({
-  "src/lib/parse-utils.ts"() {
-    "use strict";
-  }
-});
-
 // src/lib/venue-mapping.ts
 function normaliseVenueName(raw) {
   const trimmed = raw.trim();
@@ -392,6 +371,27 @@ var init_venue_mapping = __esm({
   }
 });
 
+// src/lib/parse-utils.ts
+function safeInt(text) {
+  const cleaned = text.replace(/[^0-9-]/g, "").trim();
+  if (!cleaned) return null;
+  const n = Number.parseInt(cleaned, 10);
+  return Number.isNaN(n) ? null : n;
+}
+function parseIntOr0(text) {
+  const n = Number.parseInt(text.replace(/[^0-9-]/g, ""), 10);
+  return Number.isNaN(n) ? 0 : n;
+}
+function parseFloatOr0(text) {
+  const n = Number.parseFloat(text.replace(/[^0-9.-]/g, ""));
+  return Number.isNaN(n) ? 0 : n;
+}
+var init_parse_utils = __esm({
+  "src/lib/parse-utils.ts"() {
+    "use strict";
+  }
+});
+
 // src/transforms/footywire-player-stats.ts
 import * as cheerio from "cheerio";
 function cleanPlayerName(raw) {
@@ -413,7 +413,7 @@ function parseStatsTable(html, expectedCols, rowParser) {
       const headerText = teamHeader.text().trim();
       const match = /^(\w[\w\s]+?)\s+Match Statistics/i.exec(headerText);
       if (match?.[1]) {
-        teamName = match[1].trim();
+        teamName = normaliseTeamName(match[1].trim());
       }
     }
     const parsed = [];
@@ -586,6 +586,7 @@ var init_footywire_player_stats = __esm({
   "src/transforms/footywire-player-stats.ts"() {
     "use strict";
     init_parse_utils();
+    init_team_mapping();
     BASIC_COLS = [
       "Player",
       "K",
@@ -780,7 +781,7 @@ function parseMatchList(html, year) {
       roundNumber: currentRound,
       roundType: currentRoundType,
       date,
-      venue,
+      venue: normaliseVenueName(venue),
       homeTeam,
       awayTeam,
       homeGoals,
@@ -856,7 +857,7 @@ function parseFixtureList(html, year) {
       roundNumber: currentRound,
       roundType: currentRoundType,
       date,
-      venue,
+      venue: normaliseVenueName(venue),
       homeTeam,
       awayTeam,
       status: hasScore ? "Complete" : "Upcoming",
@@ -1002,6 +1003,7 @@ var init_footywire = __esm({
     init_errors();
     init_result();
     init_team_mapping();
+    init_venue_mapping();
     init_footywire_player_stats();
     init_match_results();
     FOOTYWIRE_BASE = "https://www.footywire.com/afl/footy";
@@ -2329,7 +2331,7 @@ function transformSquiggleGamesToFixture(games, season) {
     roundNumber: g.round,
     roundType: inferRoundType(g.roundname),
     date: new Date(g.unixtime * 1e3),
-    venue: g.venue,
+    venue: normaliseVenueName(g.venue),
     homeTeam: normaliseTeamName(g.hteam),
     awayTeam: normaliseTeamName(g.ateam),
     status: toMatchStatus2(g.complete),
@@ -2368,7 +2370,7 @@ function toFixture(item, season, fallbackRoundNumber, competition) {
     roundNumber: item.round?.roundNumber ?? fallbackRoundNumber,
     roundType: inferRoundType(item.round?.name ?? ""),
     date: new Date(item.match.utcStartTime),
-    venue: item.venue?.name ?? "",
+    venue: normaliseVenueName(item.venue?.name ?? ""),
     homeTeam: normaliseTeamName(item.match.homeTeam.name),
     awayTeam: normaliseTeamName(item.match.awayTeam.name),
     status: toMatchStatus(item.match.status),
@@ -2437,6 +2439,7 @@ var init_fixture = __esm({
     init_errors();
     init_result();
     init_team_mapping();
+    init_venue_mapping();
     init_afl_api();
     init_footywire();
     init_squiggle();
@@ -2613,7 +2616,7 @@ function parseSeasonPage(html, year) {
     const awayPoints = Number.parseInt($(awayCells[2]).text().trim(), 10) || 0;
     const infoText = $(homeCells[3]).text().trim();
     const date = parseDateFromInfo(infoText, year);
-    const venue = parseVenueFromInfo($(homeCells[3]).html() ?? "");
+    const venue = normaliseVenueName(parseVenueFromInfo($(homeCells[3]).html() ?? ""));
     const attendance = parseAttendanceFromInfo(infoText);
     const homeFinal = homeQuarters[3];
     const awayFinal = awayQuarters[3];
@@ -2801,6 +2804,7 @@ var init_afl_tables = __esm({
     init_errors();
     init_result();
     init_team_mapping();
+    init_venue_mapping();
     init_afl_tables_player_stats();
     init_match_results();
     AFL_TABLES_BASE = "https://afltables.com/afl/seas";
@@ -3913,9 +3917,17 @@ function escapeField(value) {
   }
   return value;
 }
+function dateToAestIso(date) {
+  const parts = AEST_ISO_FORMATTER.formatToParts(date);
+  const get = (type) => parts.find((p) => p.type === type)?.value ?? "";
+  const offset = get("timeZoneName");
+  const sign = offset.includes("-") ? "-" : "+";
+  const offsetHours = offset.replace(/[^0-9]/g, "").padStart(2, "0");
+  return `${get("year")}-${get("month")}-${get("day")}T${get("hour")}:${get("minute")}:${get("second")}${sign}${offsetHours}:00`;
+}
 function toStringValue(value) {
   if (value === null || value === void 0) return "";
-  if (value instanceof Date) return value.toISOString();
+  if (value instanceof Date) return dateToAestIso(value);
   if (typeof value === "object") return JSON.stringify(value);
   return String(value);
 }
@@ -3931,19 +3943,57 @@ function formatCsv(data) {
   }
   return lines.join("\n");
 }
+var AEST_ISO_FORMATTER;
 var init_csv = __esm({
   "src/cli/formatters/csv.ts"() {
     "use strict";
+    AEST_ISO_FORMATTER = new Intl.DateTimeFormat("en-AU", {
+      timeZone: "Australia/Melbourne",
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      hour12: false,
+      timeZoneName: "shortOffset"
+    });
   }
 });
 
 // src/cli/formatters/json.ts
+function dateToAestIso2(date) {
+  const parts = AEST_ISO_FORMATTER2.formatToParts(date);
+  const get = (type) => parts.find((p) => p.type === type)?.value ?? "";
+  const offset = get("timeZoneName");
+  const sign = offset.includes("-") ? "-" : "+";
+  const offsetHours = offset.replace(/[^0-9]/g, "").padStart(2, "0");
+  return `${get("year")}-${get("month")}-${get("day")}T${get("hour")}:${get("minute")}:${get("second")}${sign}${offsetHours}:00`;
+}
+function jsonReplacer(_key, value) {
+  if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/.test(value)) {
+    return dateToAestIso2(new Date(value));
+  }
+  return value;
+}
 function formatJson(data) {
-  return JSON.stringify(data, null, 2);
+  return JSON.stringify(data, jsonReplacer, 2);
 }
+var AEST_ISO_FORMATTER2;
 var init_json = __esm({
   "src/cli/formatters/json.ts"() {
     "use strict";
+    AEST_ISO_FORMATTER2 = new Intl.DateTimeFormat("en-AU", {
+      timeZone: "Australia/Melbourne",
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      hour12: false,
+      timeZoneName: "shortOffset"
+    });
   }
 });
 
@@ -5229,7 +5279,7 @@ resolveAliases();
 var main = defineCommand11({
   meta: {
     name: "fitzroy",
-    version: "1.4.0",
+    version: "1.4.1",
     description: "TypeScript port of the fitzRoy R package \u2014 fetch AFL data from the command line"
   },
   subCommands: {

package/dist/index.js

@@ -264,25 +264,6 @@ var AFL_API_TEAM_IDS = /* @__PURE__ */ new Map([
   ["CD_T140", "Western Bulldogs"]
 ]);
 
-// src/transforms/footywire-player-stats.ts
-import * as cheerio from "cheerio";
-
-// src/lib/parse-utils.ts
-function safeInt(text) {
-  const cleaned = text.replace(/[^0-9-]/g, "").trim();
-  if (!cleaned) return null;
-  const n = Number.parseInt(cleaned, 10);
-  return Number.isNaN(n) ? null : n;
-}
-function parseIntOr0(text) {
-  const n = Number.parseInt(text.replace(/[^0-9-]/g, ""), 10);
-  return Number.isNaN(n) ? 0 : n;
-}
-function parseFloatOr0(text) {
-  const n = Number.parseFloat(text.replace(/[^0-9.-]/g, ""));
-  return Number.isNaN(n) ? 0 : n;
-}
-
 // src/lib/venue-mapping.ts
 var VENUE_ALIASES = [
   ["MCG", "M.C.G.", "Melbourne Cricket Ground"],
@@ -333,6 +314,25 @@ function normaliseVenueName(raw) {
   return VENUE_ALIAS_MAP.get(trimmed.toLowerCase()) ?? trimmed;
 }
 
+// src/transforms/footywire-player-stats.ts
+import * as cheerio from "cheerio";
+
+// src/lib/parse-utils.ts
+function safeInt(text) {
+  const cleaned = text.replace(/[^0-9-]/g, "").trim();
+  if (!cleaned) return null;
+  const n = Number.parseInt(cleaned, 10);
+  return Number.isNaN(n) ? null : n;
+}
+function parseIntOr0(text) {
+  const n = Number.parseInt(text.replace(/[^0-9-]/g, ""), 10);
+  return Number.isNaN(n) ? 0 : n;
+}
+function parseFloatOr0(text) {
+  const n = Number.parseFloat(text.replace(/[^0-9.-]/g, ""));
+  return Number.isNaN(n) ? 0 : n;
+}
+
 // src/transforms/footywire-player-stats.ts
 var BASIC_COLS = [
   "Player",
@@ -393,7 +393,7 @@ function parseStatsTable(html, expectedCols, rowParser) {
       const headerText = teamHeader.text().trim();
       const match = /^(\w[\w\s]+?)\s+Match Statistics/i.exec(headerText);
       if (match?.[1]) {
-        teamName = match[1].trim();
+        teamName = normaliseTeamName(match[1].trim());
       }
     }
     const parsed = [];
@@ -920,7 +920,7 @@ function parseMatchList(html, year) {
       roundNumber: currentRound,
       roundType: currentRoundType,
       date,
-      venue,
+      venue: normaliseVenueName(venue),
       homeTeam,
       awayTeam,
       homeGoals,
@@ -996,7 +996,7 @@ function parseFixtureList(html, year) {
       roundNumber: currentRound,
       roundType: currentRoundType,
       date,
-      venue,
+      venue: normaliseVenueName(venue),
       homeTeam,
       awayTeam,
       status: hasScore ? "Complete" : "Upcoming",
@@ -1175,7 +1175,7 @@ function parseBrownlowVotes(html, season) {
       const tds = $(row).find("td");
       if (tds.length < 9) return;
       const player = $(tds[0]).text().trim();
-      const team = $(tds[1]).text().trim();
+      const team = normaliseTeamName($(tds[1]).text().trim());
       if (!player || player.toLowerCase() === "player") return;
       const votes3 = safeInt($(tds[2]).text()) ?? 0;
       const votes2 = safeInt($(tds[3]).text()) ?? 0;
@@ -1212,7 +1212,7 @@ function parseAllAustralian(html, season) {
       const playerLink = $(cell).find("a");
       const playerName = playerLink.text().trim();
       const teamSpan = $(cell).find("span.playerflag");
-      const team = teamSpan.text().trim();
+      const team = normaliseTeamName(teamSpan.text().trim());
       if (playerName && team) {
         results.push({
           type: "all-australian",
@@ -1250,8 +1250,8 @@ function parseRisingStarNominations(html, season) {
     const round = safeInt(roundText);
     if (round == null) return;
     const player = $(tds[1]).text().trim();
-    const team = $(tds[2]).text().trim();
-    const opponent = $(tds[3]).text().trim();
+    const team = normaliseTeamName($(tds[2]).text().trim());
+    const opponent = normaliseTeamName($(tds[3]).text().trim());
     if (!player || player.toLowerCase() === "name") return;
     results.push({
       type: "rising-star",
@@ -2351,7 +2351,7 @@ function transformSquiggleGamesToFixture(games, season) {
     roundNumber: g.round,
     roundType: inferRoundType(g.roundname),
     date: new Date(g.unixtime * 1e3),
-    venue: g.venue,
+    venue: normaliseVenueName(g.venue),
     homeTeam: normaliseTeamName(g.hteam),
     awayTeam: normaliseTeamName(g.ateam),
     status: toMatchStatus2(g.complete),
@@ -2382,7 +2382,7 @@ function toFixture(item, season, fallbackRoundNumber, competition) {
     roundNumber: item.round?.roundNumber ?? fallbackRoundNumber,
     roundType: inferRoundType(item.round?.name ?? ""),
     date: new Date(item.match.utcStartTime),
-    venue: item.venue?.name ?? "",
+    venue: normaliseVenueName(item.venue?.name ?? ""),
     homeTeam: normaliseTeamName(item.match.homeTeam.name),
     awayTeam: normaliseTeamName(item.match.awayTeam.name),
     status: toMatchStatus(item.match.status),
@@ -2780,7 +2780,7 @@ function parseSeasonPage(html, year) {
     const awayPoints = Number.parseInt($(awayCells[2]).text().trim(), 10) || 0;
     const infoText = $(homeCells[3]).text().trim();
     const date = parseDateFromInfo(infoText, year);
-    const venue = parseVenueFromInfo($(homeCells[3]).html() ?? "");
+    const venue = normaliseVenueName(parseVenueFromInfo($(homeCells[3]).html() ?? ""));
     const attendance = parseAttendanceFromInfo(infoText);
     const homeFinal = homeQuarters[3];
     const awayFinal = awayQuarters[3];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fitzroy",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "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",