fitzroy 1.6.0 → 1.6.2

package/dist/cli.js

@@ -1045,7 +1045,7 @@ var init_footywire = __esm({
     FootyWireClient = class {
       fetchFn;
       constructor(options) {
-        this.fetchFn = options?.fetchFn ?? globalThis.fetch;
+        this.fetchFn = options?.fetchFn ?? globalThis.fetch.bind(globalThis);
       }
       /**
        * Fetch the HTML content of any URL using this client's fetch function.
@@ -1361,7 +1361,7 @@ var init_afl_coaches = __esm({
     AflCoachesClient = class {
       fetchFn;
       constructor(options) {
-        this.fetchFn = options?.fetchFn ?? globalThis.fetch;
+        this.fetchFn = options?.fetchFn ?? globalThis.fetch.bind(globalThis);
       }
       /**
        * Fetch the HTML content of an AFLCA page.
@@ -1827,7 +1827,7 @@ var init_validation = __esm({
 });
 
 // src/sources/afl-api.ts
-var TOKEN_URL, API_BASE, CFS_BASE, AflApiClient;
+var USER_AGENT, TOKEN_URL, API_BASE, CFS_BASE, AflApiClient;
 var init_afl_api = __esm({
   "src/sources/afl-api.ts"() {
     "use strict";
@@ -1835,6 +1835,7 @@ var init_afl_api = __esm({
     init_errors();
     init_result();
     init_validation();
+    USER_AGENT = "fitzroy/2 (https://github.com/jackemcpherson/fitzRoy-ts)";
     TOKEN_URL = "https://api.afl.com.au/cfs/afl/WMCTok";
     API_BASE = "https://aflapi.afl.com.au/afl/v2";
     CFS_BASE = "https://api.afl.com.au/cfs/afl";
@@ -1844,7 +1845,14 @@ var init_afl_api = __esm({
       cachedToken = null;
       pendingAuth = null;
       constructor(options) {
-        this.fetchFn = options?.fetchFn ?? globalThis.fetch;
+        const baseFetch = options?.fetchFn ?? globalThis.fetch.bind(globalThis);
+        this.fetchFn = (input, init) => {
+          const headers = new Headers(init?.headers);
+          if (!headers.has("User-Agent")) {
+            headers.set("User-Agent", USER_AGENT);
+          }
+          return baseFetch(input, { ...init, headers });
+        };
         this.tokenUrl = options?.tokenUrl ?? TOKEN_URL;
       }
       /**
@@ -2261,7 +2269,7 @@ var init_squiggle_validation = __esm({
 });
 
 // src/sources/squiggle.ts
-var SQUIGGLE_BASE, USER_AGENT, SquiggleClient;
+var SQUIGGLE_BASE, USER_AGENT2, SquiggleClient;
 var init_squiggle = __esm({
   "src/sources/squiggle.ts"() {
     "use strict";
@@ -2269,11 +2277,11 @@ var init_squiggle = __esm({
     init_result();
     init_squiggle_validation();
     SQUIGGLE_BASE = "https://api.squiggle.com.au/";
-    USER_AGENT = "fitzRoy-ts/1.0 (https://github.com/jackemcpherson/fitzRoy-ts)";
+    USER_AGENT2 = "fitzRoy-ts/1.0 (https://github.com/jackemcpherson/fitzRoy-ts)";
     SquiggleClient = class {
       fetchFn;
       constructor(options) {
-        this.fetchFn = options?.fetchFn ?? globalThis.fetch;
+        this.fetchFn = options?.fetchFn ?? globalThis.fetch.bind(globalThis);
       }
       /**
        * Fetch JSON from the Squiggle API.
@@ -2282,7 +2290,7 @@ var init_squiggle = __esm({
         const url = `${SQUIGGLE_BASE}?${params.toString()}`;
         try {
           const response = await this.fetchFn(url, {
-            headers: { "User-Agent": USER_AGENT }
+            headers: { "User-Agent": USER_AGENT2 }
           });
           if (!response.ok) {
             return err(
@@ -2894,7 +2902,7 @@ var init_afl_tables = __esm({
     AflTablesClient = class {
       fetchFn;
       constructor(options) {
-        this.fetchFn = options?.fetchFn ?? globalThis.fetch;
+        this.fetchFn = options?.fetchFn ?? globalThis.fetch.bind(globalThis);
       }
       /**
        * Fetch season match results from AFL Tables.
@@ -5392,7 +5400,7 @@ resolveAliases();
 var main = defineCommand11({
   meta: {
     name: "fitzroy",
-    version: "1.6.0",
+    version: "1.6.2",
     description: "TypeScript port of the fitzRoy R package \u2014 fetch AFL data from the command line"
   },
   subCommands: {

package/dist/index.js

@@ -684,7 +684,7 @@ var FOOTYWIRE_BASE = "https://www.footywire.com/afl/footy";
 var FootyWireClient = class {
   fetchFn;
   constructor(options) {
-    this.fetchFn = options?.fetchFn ?? globalThis.fetch;
+    this.fetchFn = options?.fetchFn ?? globalThis.fetch.bind(globalThis);
   }
   /**
    * Fetch the HTML content of any URL using this client's fetch function.
@@ -1376,7 +1376,7 @@ import * as cheerio4 from "cheerio";
 var AflCoachesClient = class {
   fetchFn;
   constructor(options) {
-    this.fetchFn = options?.fetchFn ?? globalThis.fetch;
+    this.fetchFn = options?.fetchFn ?? globalThis.fetch.bind(globalThis);
   }
   /**
    * Fetch the HTML content of an AFLCA page.
@@ -1872,6 +1872,7 @@ var LadderResponseSchema = z.object({
 }).passthrough();
 
 // src/sources/afl-api.ts
+var USER_AGENT = "fitzroy/2 (https://github.com/jackemcpherson/fitzRoy-ts)";
 var TOKEN_URL = "https://api.afl.com.au/cfs/afl/WMCTok";
 var API_BASE = "https://aflapi.afl.com.au/afl/v2";
 var CFS_BASE = "https://api.afl.com.au/cfs/afl";
@@ -1881,7 +1882,14 @@ var AflApiClient = class {
   cachedToken = null;
   pendingAuth = null;
   constructor(options) {
-    this.fetchFn = options?.fetchFn ?? globalThis.fetch;
+    const baseFetch = options?.fetchFn ?? globalThis.fetch.bind(globalThis);
+    this.fetchFn = (input, init) => {
+      const headers = new Headers(init?.headers);
+      if (!headers.has("User-Agent")) {
+        headers.set("User-Agent", USER_AGENT);
+      }
+      return baseFetch(input, { ...init, headers });
+    };
     this.tokenUrl = options?.tokenUrl ?? TOKEN_URL;
   }
   /**
@@ -2291,11 +2299,11 @@ var SquiggleStandingsResponseSchema = z2.object({
 
 // src/sources/squiggle.ts
 var SQUIGGLE_BASE = "https://api.squiggle.com.au/";
-var USER_AGENT = "fitzRoy-ts/1.0 (https://github.com/jackemcpherson/fitzRoy-ts)";
+var USER_AGENT2 = "fitzRoy-ts/1.0 (https://github.com/jackemcpherson/fitzRoy-ts)";
 var SquiggleClient = class {
   fetchFn;
   constructor(options) {
-    this.fetchFn = options?.fetchFn ?? globalThis.fetch;
+    this.fetchFn = options?.fetchFn ?? globalThis.fetch.bind(globalThis);
   }
   /**
    * Fetch JSON from the Squiggle API.
@@ -2304,7 +2312,7 @@ var SquiggleClient = class {
     const url = `${SQUIGGLE_BASE}?${params.toString()}`;
     try {
       const response = await this.fetchFn(url, {
-        headers: { "User-Agent": USER_AGENT }
+        headers: { "User-Agent": USER_AGENT2 }
       });
       if (!response.ok) {
         return err(
@@ -2646,7 +2654,7 @@ var AFL_TABLES_BASE = "https://afltables.com/afl/seas";
 var AflTablesClient = class {
   fetchFn;
   constructor(options) {
-    this.fetchFn = options?.fetchFn ?? globalThis.fetch;
+    this.fetchFn = options?.fetchFn ?? globalThis.fetch.bind(globalThis);
   }
   /**
    * Fetch season match results from AFL Tables.

package/package.json

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