@zapier/zapier-sdk 0.13.7 → 0.13.8

package/dist/plugins/eventEmission/index.test.js

@@ -119,6 +119,106 @@ describe("eventEmissionPlugin", () => {
         await new Promise((resolve) => setTimeout(resolve, 10));
         expect(failingTransport.emit).toHaveBeenCalled();
     });
+    it("should log tracking failure only on first occurrence", async () => {
+        // Mock console.warn to track logging calls
+        const mockConsoleWarn = vi
+            .spyOn(console, "warn")
+            .mockImplementation(() => { });
+        // Mock transport to throw error
+        const failingTransport = {
+            emit: vi.fn().mockRejectedValue(new Error("Network error")),
+            close: vi.fn().mockResolvedValue(undefined),
+        };
+        vi.mocked(createTransport).mockReturnValueOnce(failingTransport);
+        const plugin = eventEmissionPlugin({
+            sdk: {},
+            context: {
+                meta: {},
+                options: {
+                    eventEmission: {
+                        enabled: true,
+                        transport: {
+                            type: "http",
+                            endpoint: "https://example.com",
+                        },
+                    },
+                },
+            },
+        });
+        // First event should trigger logging
+        plugin.context.eventEmission.emit("test.event.FirstEvent", {
+            data: "first",
+        });
+        await new Promise((resolve) => setTimeout(resolve, 10));
+        // Verify logging occurred
+        const initialLogCount = mockConsoleWarn.mock.calls.length;
+        expect(initialLogCount).toBeGreaterThan(0);
+        // Second and third events should not trigger additional logging
+        plugin.context.eventEmission.emit("test.event.SecondEvent", {
+            data: "second",
+        });
+        plugin.context.eventEmission.emit("test.event.ThirdEvent", {
+            data: "third",
+        });
+        await new Promise((resolve) => setTimeout(resolve, 10));
+        // Verify no additional logging occurred
+        expect(mockConsoleWarn).toHaveBeenCalledTimes(initialLogCount);
+        mockConsoleWarn.mockRestore();
+    });
+    it("should not log failures after a successful emit", async () => {
+        // Mock console.warn to track logging calls
+        const mockConsoleWarn = vi
+            .spyOn(console, "warn")
+            .mockImplementation(() => { });
+        // Mock transport that succeeds first, then fails
+        let callCount = 0;
+        const mixedTransport = {
+            emit: vi.fn().mockImplementation(() => {
+                callCount++;
+                if (callCount === 1) {
+                    return Promise.resolve(); // First call succeeds
+                }
+                else {
+                    return Promise.reject(new Error("Network error")); // Subsequent calls fail
+                }
+            }),
+            close: vi.fn().mockResolvedValue(undefined),
+        };
+        vi.mocked(createTransport).mockReturnValueOnce(mixedTransport);
+        const plugin = eventEmissionPlugin({
+            sdk: {},
+            context: {
+                meta: {},
+                options: {
+                    eventEmission: {
+                        enabled: true,
+                        transport: {
+                            type: "http",
+                            endpoint: "https://example.com",
+                        },
+                    },
+                },
+            },
+        });
+        // First emit should succeed
+        plugin.context.eventEmission.emit("test.event.SuccessfulEvent", {
+            data: "success",
+        });
+        // Give time for success to be recorded
+        await new Promise((resolve) => setTimeout(resolve, 10));
+        // Subsequent emits should fail but not log
+        plugin.context.eventEmission.emit("test.event.FailingEvent1", {
+            data: "fail1",
+        });
+        plugin.context.eventEmission.emit("test.event.FailingEvent2", {
+            data: "fail2",
+        });
+        // Give async emissions time to complete
+        await new Promise((resolve) => setTimeout(resolve, 20));
+        // Should not have logged any warnings because tracking worked initially
+        expect(mockConsoleWarn).toHaveBeenCalledTimes(0);
+        mockConsoleWarn.mockRestore();
+    });
     it("should merge options with defaults", () => {
         const plugin = eventEmissionPlugin({
             sdk: {},

package/dist/schemas/Action.d.ts

@@ -15,8 +15,8 @@ export declare const ActionItemSchema: z.ZodObject<Omit<{
     title: z.ZodString;
     type: z.ZodLiteral<"action">;
 }, "strip", z.ZodTypeAny, {
-    type: "action";
     key: string;
+    type: "action";
     description: string;
     title: string;
     app_key: string;
@@ -26,8 +26,8 @@ export declare const ActionItemSchema: z.ZodObject<Omit<{
     is_hidden?: boolean | undefined;
     app_version?: string | undefined;
 }, {
-    type: "action";
     key: string;
+    type: "action";
     description: string;
     title: string;
     app_key: string;

package/dist/schemas/Auth.d.ts

@@ -35,6 +35,7 @@ export declare const AuthenticationItemSchema: z.ZodObject<Omit<{
     is_private: boolean;
     shared_with_all: boolean;
     url?: string | undefined;
+    members?: string | undefined;
     label?: string | null | undefined;
     lastchanged?: string | undefined;
     destination_selected_api?: string | null | undefined;
@@ -44,7 +45,6 @@ export declare const AuthenticationItemSchema: z.ZodObject<Omit<{
     identifier?: string | null | undefined;
     title?: string | null | undefined;
     groups?: string | undefined;
-    members?: string | undefined;
     permissions?: Record<string, boolean> | undefined;
     user_id?: number | undefined;
     implementation_id?: string | undefined;
@@ -60,6 +60,7 @@ export declare const AuthenticationItemSchema: z.ZodObject<Omit<{
     is_private: boolean;
     shared_with_all: boolean;
     url?: string | undefined;
+    members?: string | undefined;
     label?: string | null | undefined;
     lastchanged?: string | undefined;
     destination_selected_api?: string | null | undefined;
@@ -69,7 +70,6 @@ export declare const AuthenticationItemSchema: z.ZodObject<Omit<{
     identifier?: string | null | undefined;
     title?: string | null | undefined;
     groups?: string | undefined;
-    members?: string | undefined;
     permissions?: Record<string, boolean> | undefined;
     user_id?: number | undefined;
     implementation_id?: string | undefined;
@@ -114,6 +114,7 @@ export declare const AuthItemSchema: z.ZodObject<Omit<{
     is_private: boolean;
     shared_with_all: boolean;
     url?: string | undefined;
+    members?: string | undefined;
     label?: string | null | undefined;
     lastchanged?: string | undefined;
     destination_selected_api?: string | null | undefined;
@@ -123,7 +124,6 @@ export declare const AuthItemSchema: z.ZodObject<Omit<{
     identifier?: string | null | undefined;
     title?: string | null | undefined;
     groups?: string | undefined;
-    members?: string | undefined;
     permissions?: Record<string, boolean> | undefined;
     user_id?: number | undefined;
     implementation_id?: string | undefined;
@@ -139,6 +139,7 @@ export declare const AuthItemSchema: z.ZodObject<Omit<{
     is_private: boolean;
     shared_with_all: boolean;
     url?: string | undefined;
+    members?: string | undefined;
     label?: string | null | undefined;
     lastchanged?: string | undefined;
     destination_selected_api?: string | null | undefined;
@@ -148,7 +149,6 @@ export declare const AuthItemSchema: z.ZodObject<Omit<{
     identifier?: string | null | undefined;
     title?: string | null | undefined;
     groups?: string | undefined;
-    members?: string | undefined;
     permissions?: Record<string, boolean> | undefined;
     user_id?: number | undefined;
     implementation_id?: string | undefined;

package/dist/schemas/Field.d.ts

@@ -3,11 +3,11 @@ export declare const BaseFieldItemSchema: z.ZodObject<{
     type: z.ZodString;
     key: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    type: string;
     key: string;
-}, {
     type: string;
+}, {
     key: string;
+    type: string;
 }>;
 export declare const InputFieldItemSchema: z.ZodObject<{
     key: z.ZodString;
@@ -30,8 +30,8 @@ export declare const InputFieldItemSchema: z.ZodObject<{
         type: string;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    type: "input_field";
     key: string;
+    type: "input_field";
     depends_on: string[];
     placeholder: string;
     description: string;
@@ -45,8 +45,8 @@ export declare const InputFieldItemSchema: z.ZodObject<{
         type: string;
     } | undefined;
 }, {
-    type: "input_field";
     key: string;
+    type: "input_field";
     depends_on: string[];
     placeholder: string;
     description: string;
@@ -67,13 +67,13 @@ export declare const InfoFieldItemSchema: z.ZodObject<{
     description: z.ZodString;
     title: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    type: "info_field";
     key: string;
+    type: "info_field";
     description: string;
     title?: string | undefined;
 }, {
-    type: "info_field";
     key: string;
+    type: "info_field";
     description: string;
     title?: string | undefined;
 }>;
@@ -106,8 +106,8 @@ export declare const RootFieldItemSchema: z.ZodUnion<[z.ZodObject<{
         type: string;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    type: "input_field";
     key: string;
+    type: "input_field";
     depends_on: string[];
     placeholder: string;
     description: string;
@@ -121,8 +121,8 @@ export declare const RootFieldItemSchema: z.ZodUnion<[z.ZodObject<{
         type: string;
     } | undefined;
 }, {
-    type: "input_field";
     key: string;
+    type: "input_field";
     depends_on: string[];
     placeholder: string;
     description: string;
@@ -142,13 +142,13 @@ export declare const RootFieldItemSchema: z.ZodUnion<[z.ZodObject<{
     description: z.ZodString;
     title: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    type: "info_field";
     key: string;
+    type: "info_field";
     description: string;
     title?: string | undefined;
 }, {
-    type: "info_field";
     key: string;
+    type: "info_field";
     description: string;
     title?: string | undefined;
 }>, z.ZodType<FieldsetItem, z.ZodTypeDef, FieldsetItem>]>;

package/dist/sdk.test.js

@@ -1,5 +1,5 @@
 // Test the flat plugin system
-import { describe, it, expect } from "vitest";
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import { createZapierSdk, createSdk } from "./sdk";
 describe("Flat Plugin System", () => {
     it("should create SDK with all expected methods", () => {
@@ -133,3 +133,123 @@ describe("Flat Plugin System", () => {
         expect(context.meta).not.toBeNull();
     });
 });
+describe("Environment Variable Support", () => {
+    let originalEnv;
+    beforeEach(() => {
+        // Save original environment variable
+        originalEnv = process.env.ZAPIER_BASE_URL;
+    });
+    afterEach(() => {
+        // Restore original environment variable
+        if (originalEnv !== undefined) {
+            process.env.ZAPIER_BASE_URL = originalEnv;
+        }
+        else {
+            delete process.env.ZAPIER_BASE_URL;
+        }
+        // Clear module cache to ensure constants are re-evaluated
+        vi.resetModules();
+    });
+    it("should use custom base URL from ZAPIER_BASE_URL environment variable", async () => {
+        // Set custom base URL via environment variable
+        const customBaseUrl = "https://custom-zapier.example.com";
+        process.env.ZAPIER_BASE_URL = customBaseUrl;
+        // Clear module cache and re-import to get fresh constants
+        vi.resetModules();
+        const { createZapierSdk } = await import("./sdk");
+        // Create mock fetch function to capture requests
+        const mockFetch = vi.fn().mockResolvedValue({
+            ok: true,
+            status: 200,
+            json: async () => ({
+                results: [],
+                meta: { next_cursor: null },
+            }),
+            headers: new Headers(),
+        });
+        // Create SDK instance with mock fetch
+        const sdk = createZapierSdk({
+            token: "test-token",
+            fetch: mockFetch,
+        });
+        // Make an API call that should use the custom base URL
+        await sdk.listApps();
+        // Verify that the request was made to the custom base URL
+        expect(mockFetch).toHaveBeenCalledTimes(1);
+        const [actualUrl] = mockFetch.mock.calls[0];
+        expect(actualUrl).toMatch(new RegExp(`^${customBaseUrl}`));
+        expect(actualUrl).toContain("/api/v4/");
+    });
+    it("should use default base URL when ZAPIER_BASE_URL is not set", async () => {
+        // Ensure environment variable is not set
+        delete process.env.ZAPIER_BASE_URL;
+        // Clear module cache and re-import to get fresh constants
+        vi.resetModules();
+        const { createZapierSdk } = await import("./sdk");
+        // Create mock fetch function to capture requests
+        const mockFetch = vi.fn().mockResolvedValue({
+            ok: true,
+            status: 200,
+            json: async () => ({
+                results: [],
+                meta: { next_cursor: null },
+            }),
+            headers: new Headers(),
+        });
+        // Create SDK instance with mock fetch
+        const sdk = createZapierSdk({
+            token: "test-token",
+            fetch: mockFetch,
+        });
+        // Make an API call that should use the default base URL
+        await sdk.listApps();
+        // Verify that the request was made to the default base URL
+        expect(mockFetch).toHaveBeenCalledTimes(1);
+        const [actualUrl] = mockFetch.mock.calls[0];
+        expect(actualUrl).toMatch(/^https:\/\/zapier\.com/);
+        expect(actualUrl).toContain("/api/v4/");
+    });
+    it("should use explicit baseUrl option for SDK API requests", async () => {
+        // Clear environment variable to ensure we're testing the explicit option
+        delete process.env.ZAPIER_BASE_URL;
+        // Clear module cache and re-import to get fresh constants
+        vi.resetModules();
+        const { createZapierSdk } = await import("./sdk");
+        const customBaseUrl = "https://staging.zapier.com";
+        // Create mock fetch function to capture requests
+        const mockFetch = vi.fn().mockResolvedValue({
+            ok: true,
+            status: 200,
+            json: async () => ({
+                results: [],
+                meta: { next_cursor: null },
+            }),
+            headers: new Headers(),
+        });
+        // Create SDK instance with explicit baseUrl option and mock fetch
+        const sdk = createZapierSdk({
+            baseUrl: customBaseUrl,
+            token: "test-token",
+            fetch: mockFetch,
+        });
+        // Make an API call that should use the custom base URL
+        await sdk.listApps();
+        // Verify that the request was made to the custom base URL
+        expect(mockFetch).toHaveBeenCalledTimes(1);
+        const [actualUrl] = mockFetch.mock.calls[0];
+        expect(actualUrl).toMatch(new RegExp(`^${customBaseUrl}`));
+        expect(actualUrl).toContain("/api/v4/");
+    });
+    it("should accept authClientId in SDK options", async () => {
+        delete process.env.ZAPIER_BASE_URL;
+        vi.resetModules();
+        const { createZapierSdk } = await import("./sdk");
+        const sdk = createZapierSdk({
+            authClientId: "test-client-id",
+            token: "test-token",
+        });
+        // Verify SDK was created successfully with authClientId option
+        expect(sdk).toBeDefined();
+        expect(sdk.listApps).toBeDefined();
+    });
+});

package/dist/types/sdk.d.ts

@@ -10,6 +10,9 @@ export interface BaseSdkOptions {
     onEvent?: EventCallback;
     fetch?: typeof fetch;
     baseUrl?: string;
+    authBaseUrl?: string;
+    authClientId?: string;
+    trackingBaseUrl?: string;
     debug?: boolean;
     manifestPath?: string;
     manifest?: Manifest;

package/dist/types/sdk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/types/sdk.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/types/sdk.ts"],"names":[],"mappings":"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"}

package/dist/utils/url-utils.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Gets the Zapier base URL from a baseUrl if it matches Zapier hosting patterns.
+ * Returns the root domain URL or undefined if not a Zapier domain.
+ * This combines domain checking and URL extraction logic.
+ */
+export declare function getZapierBaseUrl(baseUrl?: string): string | undefined;
+/**
+ * Gets tracking base URL with the following precedence:
+ * 1. Explicit trackingBaseUrl parameter
+ * 2. ZAPIER_TRACKING_BASE_URL environment variable
+ * 3. Derive from baseUrl if it's a Zapier domain
+ * 4. Use baseUrl directly (whether Zapier-hosted or not)
+ * 5. Default to ZAPIER_BASE_URL constant
+ */
+export declare function getTrackingBaseUrl({ trackingBaseUrl, baseUrl, }: {
+    trackingBaseUrl?: string;
+    baseUrl?: string;
+}): string;
+//# sourceMappingURL=url-utils.d.ts.map

package/dist/utils/url-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url-utils.d.ts","sourceRoot":"","sources":["../../src/utils/url-utils.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA+BrE;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,eAAe,EACf,OAAO,GACR,EAAE;IACD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CA0BT"}

package/dist/utils/url-utils.js

@@ -0,0 +1,62 @@
+import { ZAPIER_BASE_URL } from "../constants";
+/**
+ * Gets the Zapier base URL from a baseUrl if it matches Zapier hosting patterns.
+ * Returns the root domain URL or undefined if not a Zapier domain.
+ * This combines domain checking and URL extraction logic.
+ */
+export function getZapierBaseUrl(baseUrl) {
+    if (!baseUrl) {
+        return undefined;
+    }
+    try {
+        const url = new URL(baseUrl);
+        const hostname = url.hostname;
+        // Check if it matches Zapier hosting patterns by examining the last two parts
+        const hostParts = hostname.split(".");
+        if (hostParts.length < 2) {
+            return undefined;
+        }
+        // Check if any part is "zapier" or starts with "zapier-"
+        const hasZapierPart = hostParts.some((part) => part === "zapier" || part.startsWith("zapier-"));
+        if (!hasZapierPart) {
+            return undefined;
+        }
+        // Extract root domain using the last two parts
+        const rootDomain = hostParts.slice(-2).join(".");
+        return `${url.protocol}//${rootDomain}`;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Gets tracking base URL with the following precedence:
+ * 1. Explicit trackingBaseUrl parameter
+ * 2. ZAPIER_TRACKING_BASE_URL environment variable
+ * 3. Derive from baseUrl if it's a Zapier domain
+ * 4. Use baseUrl directly (whether Zapier-hosted or not)
+ * 5. Default to ZAPIER_BASE_URL constant
+ */
+export function getTrackingBaseUrl({ trackingBaseUrl, baseUrl, }) {
+    // 1. Explicit parameter takes highest precedence
+    if (trackingBaseUrl) {
+        return trackingBaseUrl;
+    }
+    // 2. Environment variable override
+    if (process.env.ZAPIER_TRACKING_BASE_URL) {
+        return process.env.ZAPIER_TRACKING_BASE_URL;
+    }
+    // 3. Try to derive from baseUrl if it's a Zapier domain
+    if (baseUrl) {
+        const zapierBaseUrl = getZapierBaseUrl(baseUrl);
+        if (zapierBaseUrl) {
+            return zapierBaseUrl;
+        }
+    }
+    // 4. Use baseUrl directly for tracking (whether Zapier-hosted or not)
+    if (baseUrl) {
+        return baseUrl;
+    }
+    // 5. Default to ZAPIER_BASE_URL constant
+    return ZAPIER_BASE_URL;
+}

package/dist/utils/url-utils.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=url-utils.test.d.ts.map

package/dist/utils/url-utils.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url-utils.test.d.ts","sourceRoot":"","sources":["../../src/utils/url-utils.test.ts"],"names":[],"mappings":""}

package/dist/utils/url-utils.test.js

@@ -0,0 +1,103 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import { getZapierBaseUrl, getTrackingBaseUrl } from "./url-utils";
+describe("getZapierBaseUrl", () => {
+    describe("with valid Zapier domains", () => {
+        it("should return root domain for zapier.* patterns", () => {
+            expect(getZapierBaseUrl("https://zapier.com")).toBe("https://zapier.com");
+            expect(getZapierBaseUrl("https://api.zapier.com")).toBe("https://zapier.com");
+            expect(getZapierBaseUrl("https://staging.zapier.com")).toBe("https://zapier.com");
+            expect(getZapierBaseUrl("https://custom.zapier.dev:8080")).toBe("https://zapier.dev");
+        });
+        it("should return root domain for zapier-*.* patterns", () => {
+            expect(getZapierBaseUrl("https://zapier-staging.dev")).toBe("https://zapier-staging.dev");
+            expect(getZapierBaseUrl("https://zapier-production.example.com")).toBe("https://example.com");
+            expect(getZapierBaseUrl("http://zapier-custom.local")).toBe("http://zapier-custom.local");
+        });
+    });
+    describe("with non-Zapier domains", () => {
+        it("should return undefined for non-Zapier domains", () => {
+            expect(getZapierBaseUrl("https://example.com")).toBe(undefined);
+            expect(getZapierBaseUrl("https://api.example.com")).toBe(undefined);
+            expect(getZapierBaseUrl("http://localhost")).toBe(undefined);
+            expect(getZapierBaseUrl("http://127.0.0.1")).toBe(undefined);
+            expect(getZapierBaseUrl("https://my-zapier.com")).toBe(undefined);
+        });
+    });
+    describe("with invalid inputs", () => {
+        it("should return undefined for invalid or missing URLs", () => {
+            expect(getZapierBaseUrl()).toBe(undefined);
+            expect(getZapierBaseUrl(undefined)).toBe(undefined);
+            expect(getZapierBaseUrl("")).toBe(undefined);
+            expect(getZapierBaseUrl("invalid-url")).toBe(undefined);
+        });
+    });
+});
+describe("getTrackingBaseUrl", () => {
+    let originalEnv;
+    beforeEach(() => {
+        originalEnv = {
+            ZAPIER_TRACKING_BASE_URL: process.env.ZAPIER_TRACKING_BASE_URL,
+            ZAPIER_BASE_URL: process.env.ZAPIER_BASE_URL,
+        };
+    });
+    afterEach(() => {
+        if (originalEnv.ZAPIER_TRACKING_BASE_URL !== undefined) {
+            process.env.ZAPIER_TRACKING_BASE_URL =
+                originalEnv.ZAPIER_TRACKING_BASE_URL;
+        }
+        else {
+            delete process.env.ZAPIER_TRACKING_BASE_URL;
+        }
+        if (originalEnv.ZAPIER_BASE_URL !== undefined) {
+            process.env.ZAPIER_BASE_URL = originalEnv.ZAPIER_BASE_URL;
+        }
+        else {
+            delete process.env.ZAPIER_BASE_URL;
+        }
+    });
+    describe("precedence rules", () => {
+        it("should prioritize trackingBaseUrl parameter", () => {
+            process.env.ZAPIER_TRACKING_BASE_URL = "https://env-tracking.zapier.com";
+            expect(getTrackingBaseUrl({
+                trackingBaseUrl: "https://param-tracking.zapier.com",
+                baseUrl: "https://api.example.com",
+            })).toBe("https://param-tracking.zapier.com");
+        });
+        it("should use ZAPIER_TRACKING_BASE_URL environment variable", () => {
+            process.env.ZAPIER_TRACKING_BASE_URL = "https://env-tracking.zapier.com";
+            expect(getTrackingBaseUrl({
+                baseUrl: "https://api.example.com",
+            })).toBe("https://env-tracking.zapier.com");
+        });
+        it("should derive from baseUrl if it's a Zapier domain", () => {
+            delete process.env.ZAPIER_TRACKING_BASE_URL;
+            expect(getTrackingBaseUrl({
+                baseUrl: "https://api.zapier.com",
+            })).toBe("https://zapier.com");
+            expect(getTrackingBaseUrl({
+                baseUrl: "https://custom.zapier.dev:8080",
+            })).toBe("https://zapier.dev");
+        });
+        it("should use baseUrl directly for non-Zapier domains", () => {
+            delete process.env.ZAPIER_TRACKING_BASE_URL;
+            expect(getTrackingBaseUrl({
+                baseUrl: "https://api.example.com",
+            })).toBe("https://api.example.com");
+            expect(getTrackingBaseUrl({
+                baseUrl: "http://localhost:3000",
+            })).toBe("http://localhost:3000");
+        });
+        it("should fallback to ZAPIER_BASE_URL constant", async () => {
+            delete process.env.ZAPIER_TRACKING_BASE_URL;
+            process.env.ZAPIER_BASE_URL = "https://custom.zapier.com";
+            // Clear module cache and re-import to get fresh constants
+            vi.resetModules();
+            const { getTrackingBaseUrl: freshGetTrackingBaseUrl } = await import("./url-utils");
+            expect(freshGetTrackingBaseUrl({})).toBe("https://custom.zapier.com");
+            delete process.env.ZAPIER_BASE_URL;
+            vi.resetModules();
+            const { getTrackingBaseUrl: defaultGetTrackingBaseUrl } = await import("./url-utils");
+            expect(defaultGetTrackingBaseUrl({})).toBe("https://zapier.com");
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zapier/zapier-sdk",
-  "version": "0.13.7",
+  "version": "0.13.8",
   "description": "Complete Zapier SDK - combines all Zapier SDK packages",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -51,7 +51,7 @@
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.3",
-    "@zapier/zapier-sdk-cli-login": "0.3.3"
+    "@zapier/zapier-sdk-cli-login": "0.3.4"
   },
   "scripts": {
     "build": "tsup",