@tinybirdco/sdk 0.0.64 → 0.0.65

package/src/schema/project.test.ts

@@ -13,6 +13,29 @@ import { definePipe, node } from "./pipe.js";
 import { t } from "./types.js";
 
 describe("Project Schema", () => {
+  const originalEnv = { ...process.env };
+
+  beforeEach(() => {
+    process.env = { ...originalEnv };
+    delete process.env.VERCEL_ENV;
+    delete process.env.GITHUB_HEAD_REF;
+    delete process.env.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME;
+    delete process.env.CI;
+    delete process.env.TINYBIRD_PREVIEW_MODE;
+    delete process.env.VERCEL_GIT_COMMIT_REF;
+    delete process.env.GITHUB_REF_NAME;
+    delete process.env.CI_COMMIT_BRANCH;
+    delete process.env.CIRCLE_BRANCH;
+    delete process.env.BUILD_SOURCEBRANCHNAME;
+    delete process.env.BITBUCKET_BRANCH;
+    delete process.env.TINYBIRD_BRANCH_NAME;
+    delete process.env.TINYBIRD_BRANCH_TOKEN;
+  });
+
+  afterEach(() => {
+    process.env = { ...originalEnv };
+  });
+
   describe("defineProject", () => {
     it("creates a project with empty config", () => {
       const project = defineProject({});
@@ -390,6 +413,7 @@ describe("Project Schema", () => {
       const events = defineDatasource("events", {
         schema: { id: t.string() },
       });
+      const customFetch = vi.fn();
 
       // Should accept all options without throwing
       const client = createTinybirdClient({
@@ -397,6 +421,7 @@ describe("Project Schema", () => {
         pipes: {},
         baseUrl: "https://custom.tinybird.co",
         token: "test-token",
+        fetch: customFetch as typeof fetch,
         configDir: "/custom/config/dir",
         devMode: true,
       });
@@ -440,5 +465,59 @@ describe("Project Schema", () => {
       expect(client._options).toBeDefined();
       expect(() => client.client).toThrow("Client not initialized");
     });
+
+    it("uses custom fetch for typed endpoint queries", async () => {
+      const topEvents = definePipe("top_events", {
+        nodes: [node({ name: "endpoint", sql: "SELECT 1" })],
+        output: { count: t.int64() },
+        endpoint: true,
+      });
+      const customFetch = vi.fn().mockResolvedValueOnce({
+        ok: true,
+        json: () =>
+          Promise.resolve({
+            data: [],
+            meta: [],
+            rows: 0,
+            statistics: {
+              elapsed: 0,
+              rows_read: 0,
+              bytes_read: 0,
+            },
+          }),
+      });
+      const originalFetch = global.fetch;
+      const globalFetch = vi.fn().mockRejectedValue(
+        new Error("global fetch should not be called")
+      );
+      global.fetch = globalFetch as typeof fetch;
+
+      try {
+        const client = createTinybirdClient({
+          datasources: {},
+          pipes: { topEvents },
+          baseUrl: "https://api.tinybird.co",
+          token: "test-token",
+          fetch: customFetch as typeof fetch,
+          devMode: false,
+        });
+
+        const result = await client.topEvents.query({});
+
+        expect(result.rows).toBe(0);
+        expect(customFetch).toHaveBeenCalledTimes(1);
+        expect(globalFetch).not.toHaveBeenCalled();
+
+        const [url, init] = customFetch.mock.calls[0] as [string, RequestInit];
+        const parsed = new URL(url);
+        expect(parsed.pathname).toBe("/v0/pipes/top_events.json");
+        expect(parsed.searchParams.get("from")).toBe("ts-sdk");
+        expect(new Headers(init.headers).get("Authorization")).toBe(
+          "Bearer test-token"
+        );
+      } finally {
+        global.fetch = originalFetch;
+      }
+    });
   });
 });

package/src/schema/project.ts

@@ -130,6 +130,8 @@ export interface TinybirdClientConfig<
   baseUrl?: string;
   /** Tinybird API token (defaults to TINYBIRD_TOKEN env var) */
   token?: string;
+  /** Custom fetch implementation (optional, defaults to global fetch) */
+  fetch?: typeof fetch;
   /**
    * Directory to use as the starting point when searching for tinybird.json config.
    * In monorepo setups, this should be set to the directory containing tinybird.json
@@ -295,6 +297,7 @@ export const Tinybird: TinybirdConstructor = class Tinybird<
   readonly #options: {
     baseUrl?: string;
     token?: string;
+    fetch?: typeof fetch;
     configDir?: string;
     devMode?: boolean;
   };
@@ -303,6 +306,7 @@ export const Tinybird: TinybirdConstructor = class Tinybird<
     this.#options = {
       baseUrl: config.baseUrl,
       token: config.token,
+      fetch: config.fetch,
       configDir: config.configDir,
       devMode: config.devMode,
     };
@@ -392,11 +396,16 @@ export const Tinybird: TinybirdConstructor = class Tinybird<
 
       const baseUrl =
         this.#options.baseUrl ?? process.env.TINYBIRD_URL ?? "https://api.tinybird.co";
-      const token = await resolveToken({ baseUrl, token: this.#options.token });
+      const token = await resolveToken({
+        baseUrl,
+        token: this.#options.token,
+        fetch: this.#options.fetch,
+      });
 
       this.#client = createClient({
         baseUrl,
         token,
+        fetch: this.#options.fetch,
         devMode: this.#options.devMode ?? process.env.NODE_ENV === "development",
         configDir: this.#options.configDir,
       });