autumn-js 0.0.66 → 0.0.67

package/dist/libraries/react/index.js

@@ -1,9 +1,11 @@
 "use client";
 
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,6 +19,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/libraries/react/index.ts
@@ -30,11 +40,29 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/libraries/react/AutumnContext.tsx
+// src/libraries/react/BaseAutumnProvider.tsx
+var import_react3 = require("react");
+
+// src/libraries/react/hooks/useDialog.tsx
 var import_react = require("react");
+var useDialog = (component) => {
+  const [dialogProps, setDialogProps] = (0, import_react.useState)(null);
+  const [dialogOpen, setDialogOpen] = (0, import_react.useState)(false);
+  (0, import_react.useEffect)(() => {
+    if (!dialogOpen) {
+      setTimeout(() => {
+        setDialogProps(null);
+      }, 200);
+    }
+  }, [dialogOpen]);
+  return [dialogProps, setDialogProps, dialogOpen, setDialogOpen];
+};
+
+// src/libraries/react/hooks/useCustomerBase.tsx
+var import_swr = __toESM(require("swr"));
 
 // src/sdk/error.ts
-var AutumnError = class extends Error {
+var AutumnError = class _AutumnError extends Error {
   message;
   code;
   constructor(response) {
@@ -42,6 +70,12 @@ var AutumnError = class extends Error {
     this.message = response.message;
     this.code = response.code;
   }
+  static fromError(error) {
+    return new _AutumnError({
+      message: error.message || "Unknown error",
+      code: error.code || "unknown_error"
+    });
+  }
   toString() {
     return `${this.message} (code: ${this.code})`;
   }
@@ -53,6 +87,53 @@ var AutumnError = class extends Error {
   }
 };
 
+// src/sdk/general/genMethods.ts
+var handleAttach = async ({
+  instance,
+  params
+}) => {
+  return instance.post("/attach", params);
+};
+var handleCancel = async ({
+  instance,
+  params
+}) => {
+  return instance.post("/cancel", params);
+};
+var handleEntitled = async ({
+  instance,
+  params
+}) => {
+  return instance.post("/entitled", params);
+};
+var handleEvent = async ({
+  instance,
+  params
+}) => {
+  return instance.post("/events", params);
+};
+var handleTrack = async ({
+  instance,
+  params
+}) => {
+  return instance.post("/track", params);
+};
+var handleUsage = async ({
+  instance,
+  params
+}) => {
+  return instance.post("/usage", params);
+};
+var handleCheck = async ({
+  instance,
+  params
+}) => {
+  return instance.post("/check", params);
+};
+
+// src/libraries/backend/constants.ts
+var autumnApiUrl = "https://api.useautumn.com/v1";
+
 // src/sdk/utils.ts
 var staticWrapper = (callback, instance, args) => {
   if (!instance) {
@@ -165,50 +246,6 @@ var deleteEntity = async ({
   return instance.delete(`/customers/${customer_id}/entities/${entity_id}`);
 };
 
-// src/sdk/general/genMethods.ts
-var handleAttach = async ({
-  instance,
-  params
-}) => {
-  return instance.post("/attach", params);
-};
-var handleCancel = async ({
-  instance,
-  params
-}) => {
-  return instance.post("/cancel", params);
-};
-var handleEntitled = async ({
-  instance,
-  params
-}) => {
-  return instance.post("/entitled", params);
-};
-var handleEvent = async ({
-  instance,
-  params
-}) => {
-  return instance.post("/events", params);
-};
-var handleTrack = async ({
-  instance,
-  params
-}) => {
-  return instance.post("/track", params);
-};
-var handleUsage = async ({
-  instance,
-  params
-}) => {
-  return instance.post("/usage", params);
-};
-var handleCheck = async ({
-  instance,
-  params
-}) => {
-  return instance.post("/check", params);
-};
-
 // src/sdk/products/prodMethods.ts
 var productMethods = (instance) => {
   return {
@@ -270,12 +307,14 @@ var redeemReferralCode = async ({
 };
 
 // src/sdk/response.ts
-var toContainerResult = async (response) => {
+var toContainerResult = async ({ response, logger: logger2 }) => {
   if (response.status < 200 || response.status >= 300) {
     let error;
     try {
       error = await response.json();
+      logger2.error(`[Autumn] ${error.message}`);
     } catch (error2) {
+      throw error2;
       return {
         data: null,
         error: new AutumnError({
@@ -302,6 +341,7 @@ var toContainerResult = async (response) => {
       statusCode: response?.status
     };
   } catch (error) {
+    throw error;
     return {
       data: null,
       error: new AutumnError({
@@ -313,14 +353,52 @@ var toContainerResult = async (response) => {
   }
 };
 
+// src/utils/logger.ts
+var import_chalk = __toESM(require("chalk"));
+var getTime = () => {
+  let timeString = (/* @__PURE__ */ new Date()).toISOString();
+  return `[${timeString.split("T")[1].split(".")[0]}]`;
+};
+var greaterThanLevel = (level) => {
+  return levels.indexOf(level) >= levels.indexOf(logger.level);
+};
+var levels = ["debug", "info", "warn", "error", "fatal"];
+var logger = {
+  ...console,
+  level: "info",
+  debug: (...args) => {
+    if (greaterThanLevel("debug")) {
+      console.log(getTime(), import_chalk.default.gray("DEBUG"), ...args);
+    }
+  },
+  log: (...args) => {
+    console.log(getTime(), import_chalk.default.blue("INFO"), ...args);
+  },
+  info: (...args) => {
+    if (greaterThanLevel("info")) {
+      console.log(getTime(), import_chalk.default.blue("INFO"), ...args);
+    }
+  },
+  warn: (...args) => {
+    if (greaterThanLevel("warn")) {
+      console.log(getTime(), import_chalk.default.yellow("WARN"), ...args);
+    }
+  },
+  error: (...args) => {
+    if (greaterThanLevel("error")) {
+      console.log(getTime(), import_chalk.default.red("ERROR"), ...args);
+    }
+  }
+};
+
 // src/sdk/client.ts
 var LATEST_API_VERSION = "1.2";
 var Autumn = class {
   secretKey;
   publishableKey;
-  level;
   headers;
   url;
+  logger = console;
   constructor(options) {
     try {
       this.secretKey = options?.secretKey || process.env.AUTUMN_SECRET_KEY;
@@ -336,17 +414,15 @@ var Autumn = class {
     };
     let version = options?.version || LATEST_API_VERSION;
     this.headers["x-api-version"] = version;
-    this.url = options?.url || "https://api.useautumn.com/v1";
-    this.level = this.secretKey ? "secret" : "publishable";
-  }
-  getLevel() {
-    return this.level;
+    this.url = options?.url || autumnApiUrl;
+    this.logger = logger;
+    this.logger.level = options?.logLevel || "info";
   }
   async get(path) {
     const response = await fetch(`${this.url}${path}`, {
       headers: this.headers
     });
-    return toContainerResult(response);
+    return toContainerResult({ response, logger: this.logger });
   }
   async post(path, body) {
     try {
@@ -355,7 +431,7 @@ var Autumn = class {
         headers: this.headers,
         body: JSON.stringify(body)
       });
-      return toContainerResult(response);
+      return toContainerResult({ response, logger: this.logger });
     } catch (error) {
       console.error("Error sending request:", error);
       throw error;
@@ -366,7 +442,7 @@ var Autumn = class {
       method: "DELETE",
       headers: this.headers
     });
-    return toContainerResult(response);
+    return toContainerResult({ response, logger: this.logger });
   }
   static customers = customerMethods();
   static products = productMethods();
@@ -443,6 +519,19 @@ var Autumn = class {
   }
 };
 
+// src/libraries/react/errorUtils/logFetchError.ts
+var logFetchError = ({
+  method,
+  backendUrl,
+  path,
+  error
+}) => {
+  console.error(`[Autumn] Fetch failed: ${method} ${backendUrl}${path}
+
+1. Check that backendUrl in <AutumnProvider/> is correctly set.
+2. Check that autumnHandler is correctly registered on your backend.`);
+};
+
 // src/libraries/react/client/clientCompMethods.ts
 async function getPricingTableMethod() {
   const res = await this.get("/api/autumn/components/pricing_table");
@@ -573,36 +662,57 @@ var AutumnClient = class {
     }
     return headers;
   }
-  async handleFetchResult(result) {
-    let res = await toContainerResult(result);
-    return res;
+  async handleFetch({
+    path,
+    method,
+    body
+  }) {
+    body = method === "POST" ? JSON.stringify({
+      ...body,
+      customer_data: this.customerData || void 0
+    }) : void 0;
+    try {
+      const response = await fetch(`${this.backendUrl}${path}`, {
+        method,
+        body,
+        headers: await this.getHeaders(),
+        credentials: this.includeCredentials ? "include" : void 0
+      });
+      return await toContainerResult({ response, logger: console });
+    } catch (error) {
+      logFetchError({
+        method,
+        backendUrl: this.backendUrl || "",
+        path,
+        error
+      });
+      return {
+        data: null,
+        error: new AutumnError({
+          message: error.message,
+          code: "fetch_failed"
+        })
+      };
+    }
   }
   async post(path, body) {
-    const response = await fetch(`${this.backendUrl}${path}`, {
+    return await this.handleFetch({
+      path,
       method: "POST",
-      body: JSON.stringify({
-        ...body,
-        customer_data: this.customerData || void 0
-      }),
-      headers: await this.getHeaders(),
-      credentials: this.includeCredentials ? "include" : void 0
+      body
     });
-    return await this.handleFetchResult(response);
   }
   async get(path) {
-    const response = await fetch(`${this.backendUrl}${path}`, {
-      method: "GET",
-      headers: await this.getHeaders(),
-      credentials: this.includeCredentials ? "include" : void 0
+    return await this.handleFetch({
+      path,
+      method: "GET"
     });
-    return await this.handleFetchResult(response);
   }
   async delete(path) {
-    const response = await fetch(`${this.backendUrl}${path}`, {
-      method: "DELETE",
-      headers: await this.getHeaders()
+    return await this.handleFetch({
+      path,
+      method: "DELETE"
     });
-    return await this.handleFetchResult(response);
   }
   async createCustomer(params) {
     return await createCustomerMethod({
@@ -630,23 +740,11 @@ var AutumnClient = class {
 };
 
 // src/libraries/react/AutumnContext.tsx
-var AutumnContext = (0, import_react.createContext)({
-  customerProvider: null,
-  pricingTableProvider: {
-    pricingTableProducts: null,
-    isLoading: true,
-    error: null,
-    refetch: () => Promise.resolve()
-  },
-  entityProvider: {
-    entity: null,
-    isLoading: true,
-    error: null,
-    refetch: () => Promise.resolve(),
-    lastParams: null
-  },
+var import_react2 = require("react");
+var AutumnContext = (0, import_react2.createContext)({
+  initialized: false,
   client: new AutumnClient({
-    backendUrl: "http://localhost:8000"
+    backendUrl: process.env.NEXT_PUBLIC_AUTUMN_BACKEND_URL
   }),
   paywallDialog: {
     props: null,
@@ -669,190 +767,72 @@ var AutumnContext = (0, import_react.createContext)({
     }
   }
 });
-var useAutumnContext = () => {
-  const context = (0, import_react.useContext)(AutumnContext);
-  if (context === void 0) {
-    throw new Error(
-      "useAutumnContext must be used within a AutumnContextProvider"
-    );
+var useAutumnContext = ({
+  AutumnContext: AutumnContext2,
+  name
+}) => {
+  const context = (0, import_react2.useContext)(AutumnContext2);
+  if (!context.initialized) {
+    throw new Error(`${name} must be used within <AutumnProvider />`);
   }
   return context;
 };
 
-// src/libraries/react/BaseAutumnProvider.tsx
-var import_react6 = require("react");
-
-// src/libraries/react/hooks/useDialog.tsx
-var import_react2 = require("react");
-var useDialog = (component) => {
-  const [dialogProps, setDialogProps] = (0, import_react2.useState)(null);
-  const [dialogOpen, setDialogOpen] = (0, import_react2.useState)(false);
-  (0, import_react2.useEffect)(() => {
-    if (!dialogOpen) {
-      setTimeout(() => {
-        setDialogProps(null);
-      }, 200);
-    }
-  }, [dialogOpen]);
-  return [dialogProps, setDialogProps, dialogOpen, setDialogOpen];
-};
-
-// src/libraries/react/hooks/usePricingTableProvider.tsx
-var import_react3 = require("react");
-var usePricingTableProvider = ({
+// src/libraries/react/hooks/useCustomerBase.tsx
+var useCustomerBase = ({
+  params,
+  AutumnContext: AutumnContext2,
   client
 }) => {
-  const [pricingTableProducts, setPricingTableProducts] = (0, import_react3.useState)(null);
-  const [isLoading, setIsLoading] = (0, import_react3.useState)(true);
-  const [error, setError] = (0, import_react3.useState)(null);
-  const fetchProducts = async () => {
-    try {
-      setIsLoading(true);
-      const { data, error: error2 } = await client.getPricingTable();
-      if (error2) {
-        setError(error2);
-        setPricingTableProducts(null);
-      } else {
-        setPricingTableProducts(data?.list || []);
-        setError(null);
-      }
-    } catch (error2) {
-      setError(
-        new AutumnError({
-          message: "Failed to fetch pricing table products",
-          code: "failed_to_fetch_pricing_table_products"
-        })
-      );
-      setPricingTableProducts(null);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-  return {
-    pricingTableProducts,
-    isLoading: isLoading && !pricingTableProducts,
-    error,
-    refetch: fetchProducts
-  };
-};
-
-// src/libraries/react/hooks/useEntityProvider.tsx
-var import_react4 = require("react");
-var useEntityProvider = ({ client }) => {
-  const [entity, setEntity] = (0, import_react4.useState)(null);
-  const [error, setError] = (0, import_react4.useState)(null);
-  const [isLoading, setIsLoading] = (0, import_react4.useState)(true);
-  const [lastParams, setLastParams] = (0, import_react4.useState)(null);
-  const fetchEntity = async ({
-    entityId,
-    params
-  }) => {
-    if (!entityId) {
-      console.warn("(Autumn) No entity ID provided in useEntity hook");
-      return;
-    }
-    setIsLoading(true);
-    setLastParams(params || null);
-    try {
-      const { data, error: error2 } = await client.entities.get(entityId, params);
-      if (error2) {
-        setError(error2);
-        setEntity(null);
-      } else {
-        setEntity(data);
-        setError(null);
-      }
-    } catch (error2) {
-      setError(
-        new AutumnError({
-          message: error2?.message || "Failed to fetch entity",
-          code: "entity_fetch_failed"
-        })
-      );
-    }
-    setIsLoading(false);
-  };
-  return { entity, isLoading, error, refetch: fetchEntity, lastParams };
-};
-
-// src/libraries/react/hooks/useCustomerProvider.tsx
-var import_react5 = require("react");
-function useCustomerProvider(client) {
-  const [stateMap, setStateMap] = (0, import_react5.useState)({});
-  const inProgressFetches = (0, import_react5.useRef)({});
-  const getQueryKey = (params) => {
-    return JSON.stringify(params || {});
-  };
-  const getState = (params) => {
-    const queryKey = getQueryKey(params);
-    if (!stateMap[queryKey]) {
-      return {
-        customer: null,
-        isLoading: true,
-        error: null
-      };
+  const queryKey = ["customer"];
+  let context;
+  if (AutumnContext2) {
+    context = useAutumnContext({ AutumnContext: AutumnContext2, name: "useCustomer" });
+  }
+  if (!client) {
+    client = context.client;
+  }
+  const fetchCustomer = async () => {
+    const { data: data2, error: error2 } = await client.createCustomer({
+      errorOnNotFound: params?.errorOnNotFound,
+      expand: params?.expand
+    });
+    if (error2) {
+      throw error2;
     }
-    return stateMap[queryKey];
-  };
-  const refetch = async ({
-    params,
-    errorOnNotFound = true
-  }) => {
-    const queryKey = getQueryKey(params);
-    if (inProgressFetches.current[queryKey]) {
-      return;
+    if (!data2) {
+      return null;
     }
-    inProgressFetches.current[queryKey] = true;
-    setStateMap((prevState) => ({
-      ...prevState,
-      [queryKey]: {
-        ...prevState[queryKey] || { customer: null },
-        isLoading: true,
-        error: null
-      }
-    }));
-    const { data, error } = await client.createCustomer({
-      expand: params?.expand,
-      errorOnNotFound
-    });
-    let newState = {
-      customer: data,
-      isLoading: false,
-      error
-    };
-    setStateMap((prevState) => ({
-      ...prevState,
-      [queryKey]: newState
-    }));
-    inProgressFetches.current[queryKey] = false;
+    return data2;
   };
-  const refetchFirstTwo = async () => {
-    try {
-      let batchRefetch = [];
-      for (const key of Object.keys(stateMap)) {
-        batchRefetch.push(refetch({ params: JSON.parse(key) }));
+  const { data, error, isLoading, mutate } = (0, import_swr.default)(queryKey, fetchCustomer, {
+    fallbackData: null,
+    onErrorRetry: (error2, key, config) => {
+      if (error2.code == "entity_not_found") {
+        return false;
       }
-      await Promise.all(batchRefetch);
-    } catch (error) {
-      console.error("Failed to refetch customer (useCustomerProvider)");
-      console.error(error);
+      return true;
     }
-  };
+  });
   return {
-    // stateMap,
-    getState,
-    refetch,
-    refetchFirstTwo
+    customer: error ? null : data,
+    isLoading,
+    error,
+    refetch: mutate,
+    createEntity: client.entities.create,
+    createReferralCode: client.referrals.createCode,
+    redeemReferralCode: client.referrals.redeemCode
   };
-}
+};
 
 // src/libraries/react/BaseAutumnProvider.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 function BaseAutumnProvider({
   client,
-  children
+  children,
+  AutumnContext: AutumnContext2
 }) {
-  const [components, setComponents] = (0, import_react6.useState)({});
+  const [components, setComponents] = (0, import_react3.useState)({});
   const [paywallProps, setPaywallProps, paywallOpen, setPaywallOpen] = useDialog(components.paywallDialog);
   const [
     productChangeProps,
@@ -860,33 +840,12 @@ function BaseAutumnProvider({
     productChangeOpen,
     setProductChangeOpen
   ] = useDialog(components.productChangeDialog);
-  const customerProvider = useCustomerProvider(client);
-  const entityProvider = useEntityProvider({ client });
-  const {
-    pricingTableProducts,
-    isLoading: pricingTableLoading,
-    error: pricingTableError,
-    refetch
-  } = usePricingTableProvider({
-    client
-  });
-  (0, import_react6.useEffect)(() => {
-    customerProvider.refetch({
-      errorOnNotFound: false
-    });
-  }, []);
+  useCustomerBase({ client, params: { errorOnNotFound: false } });
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
-    AutumnContext.Provider,
+    AutumnContext2.Provider,
     {
       value: {
-        customerProvider,
-        entityProvider,
-        pricingTableProvider: {
-          pricingTableProducts,
-          isLoading: pricingTableLoading,
-          error: pricingTableError,
-          refetch
-        },
+        initialized: true,
         client,
         paywallDialog: {
           props: paywallProps,
@@ -945,48 +904,88 @@ var ReactAutumnProvider = ({
   customerData,
   includeCredentials = true
 }) => {
+  if (backendUrl && !backendUrl.startsWith("http")) {
+    console.warn(`backendUrl is not a valid URL: ${backendUrl}`);
+  }
   let client = new AutumnClient({
-    backendUrl,
+    backendUrl: backendUrl || "",
     getBearerToken,
     customerData,
     includeCredentials
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(BaseAutumnProvider, { client, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(BaseAutumnProvider, { client, AutumnContext, children });
 };
 
 // src/libraries/react/hooks/useCustomer.tsx
-var import_react7 = require("react");
 var useCustomer = (params) => {
-  const { customerProvider, client } = useAutumnContext();
-  const { getState, refetch } = customerProvider;
-  const { customer, isLoading, error } = getState(params);
-  (0, import_react7.useEffect)(() => {
-    if (!customer) {
-      refetch({ params });
+  return useCustomerBase({
+    params,
+    AutumnContext
+  });
+};
+
+// src/libraries/react/hooks/usePricingTableBase.tsx
+var import_swr2 = __toESM(require("swr"));
+var mergeProductDetails = (products, productDetails) => {
+  if (!products) {
+    return null;
+  }
+  if (!productDetails) {
+    return products;
+  }
+  let mergedProducts = structuredClone(products);
+  for (const product of productDetails) {
+    let index = mergedProducts.findIndex((p) => p.id === product.id);
+    if (index == -1) {
+      console.warn(`Product with id ${product.id} not found`);
+      continue;
     }
-  }, []);
+    mergedProducts[index] = {
+      ...mergedProducts[index],
+      ...product
+    };
+  }
+  return mergedProducts;
+};
+var usePricingTableBase = ({
+  AutumnContext: AutumnContext2,
+  params
+}) => {
+  const context = useAutumnContext({ AutumnContext: AutumnContext2, name: "usePricingTable" });
+  const fetcher = async () => {
+    try {
+      const { data: data2, error: error2 } = await context.client.getPricingTable();
+      if (error2) throw error2;
+      return data2?.list || [];
+    } catch (error2) {
+      throw new AutumnError({
+        message: "Failed to fetch pricing table products",
+        code: "failed_to_fetch_pricing_table_products"
+      });
+    }
+  };
+  const { data, error, mutate } = (0, import_swr2.default)(
+    "pricing-table",
+    fetcher
+  );
   return {
-    customer,
-    isLoading: isLoading && !customer,
+    products: mergeProductDetails(data || void 0, params?.productDetails),
+    isLoading: !error && !data,
     error,
-    refetch: async () => {
-      await refetch({ params });
-    },
-    createEntity: client.entities.create,
-    createReferralCode: client.referrals.createCode,
-    redeemReferralCode: client.referrals.redeemCode
+    refetch: mutate
   };
 };
 
-// src/libraries/react/hooks/useAutumn.tsx
-var useAutumn = () => {
-  const { client } = useAutumnContext();
-  const {
-    prodChangeDialog,
-    paywallDialog,
-    pricingTableProvider,
-    customerProvider
-  } = useAutumnContext();
+// src/libraries/react/hooks/useAutumnBase.tsx
+var useAutumnBase = ({
+  AutumnContext: AutumnContext2
+}) => {
+  const context = useAutumnContext({ AutumnContext: AutumnContext2, name: "useAutumn" });
+  const { prodChangeDialog, paywallDialog } = context;
+  const client = context.client;
+  const { refetch: refetchPricingTable } = usePricingTableBase({
+    AutumnContext: AutumnContext2
+  });
   let {
     setProps: setProdChangeDialogProps,
     setOpen: setProdChangeDialogOpen,
@@ -998,23 +997,20 @@ var useAutumn = () => {
     setComponent: setPaywallComponent
   } = paywallDialog;
   const attachWithDialog = async (params) => {
-    const attachWithoutDialog = async (options) => {
-      let { dialog, ...rest } = params;
-      return await attach(rest);
-    };
+    let { dialog, ...rest } = params;
     const { productId, entityId, entityData } = params;
     const checkRes = await client.check({
       productId,
       entityId,
       entityData,
-      withPreview: "formatted"
+      withPreview: true
     });
     if (checkRes.error) {
       return checkRes;
     }
     let preview = checkRes.data.preview;
     if (!preview) {
-      return await attachWithoutDialog();
+      return await attach(rest);
     } else {
       setProdChangeDialogProps({
         preview
@@ -1024,7 +1020,7 @@ var useAutumn = () => {
     return checkRes;
   };
   const attach = async (params) => {
-    const { dialog, callback, openInNewTab } = params;
+    const { dialog, openInNewTab } = params;
     if (dialog) {
       setProdChangeComponent(dialog);
       return await attachWithDialog(params);
@@ -1041,18 +1037,7 @@ var useAutumn = () => {
         window.location.href = data.checkout_url;
       }
     }
-    try {
-      await callback?.();
-    } catch (error) {
-      return result;
-    }
-    await Promise.all([
-      pricingTableProvider.pricingTableProducts ? pricingTableProvider.refetch().catch((error) => {
-        console.warn("Failed to refetch pricing table data");
-        console.warn(error);
-      }) : Promise.resolve(),
-      customerProvider.refetchFirstTwo()
-    ]);
+    await refetchPricingTable();
     if (setProdChangeDialogOpen) {
       setProdChangeDialogOpen(false);
     }
@@ -1072,7 +1057,7 @@ var useAutumn = () => {
     }
     const res = await client.check({
       ...params,
-      withPreview: withPreview || dialog ? "formatted" : void 0
+      withPreview: withPreview || dialog ? true : false
     });
     if (res.error) {
       return res;
@@ -1080,9 +1065,7 @@ var useAutumn = () => {
     let data = res.data;
     if (data && data.preview && dialog) {
       let preview = data.preview;
-      setPaywallDialogProps({
-        preview
-      });
+      setPaywallDialogProps({ preview });
       setPaywallDialogOpen(true);
     }
     return res;
@@ -1095,13 +1078,24 @@ var useAutumn = () => {
     return res;
   };
   const openBillingPortal = async (params) => {
-    const res = await client.openBillingPortal(params);
+    let defaultParams = {
+      openInNewTab: false
+    };
+    let finalParams = {
+      ...defaultParams,
+      ...params
+    };
+    const res = await client.openBillingPortal(finalParams);
     if (res.error) {
       return res;
     }
     let data = res.data;
     if (data?.url && typeof window !== "undefined") {
-      window.open(data.url, "_blank");
+      if (finalParams.openInNewTab) {
+        window.open(data.url, "_blank");
+      } else {
+        window.open(data.url, "_self");
+      }
       return res;
     } else {
       return res;
@@ -1116,92 +1110,70 @@ var useAutumn = () => {
   };
 };
 
+// src/libraries/react/hooks/useAutumn.tsx
+var useAutumn = () => {
+  return useAutumnBase({ AutumnContext });
+};
+
 // src/libraries/react/hooks/usePricingTable.tsx
-var import_react8 = require("react");
-var mergeProductDetails = (products, productDetails) => {
-  if (!products) {
-    return null;
-  }
-  if (!productDetails) {
-    return products;
-  }
-  let mergedProducts = structuredClone(products);
-  for (const product of productDetails) {
-    let index = mergedProducts.findIndex((p) => p.id === product.id);
-    if (index == -1) {
-      console.warn(`Product with id ${product.id} not found`);
-      continue;
+var usePricingTable = (params) => {
+  return usePricingTableBase({
+    AutumnContext,
+    params
+  });
+};
+
+// src/libraries/react/hooks/useEntityBase.tsx
+var import_swr3 = __toESM(require("swr"));
+var import_react4 = require("react");
+var useEntityBase = ({
+  entityId,
+  params,
+  AutumnContext: AutumnContext2
+}) => {
+  const { client } = (0, import_react4.useContext)(AutumnContext2);
+  const queryKey = ["entity", entityId, params?.expand];
+  const fetchEntity = async () => {
+    if (!entityId) {
+      return null;
     }
-    mergedProducts[index] = {
-      ...mergedProducts[index],
-      ...product
+    const { data: data2, error: error2 } = await client.entities.get(entityId, params);
+    if (error2) {
+      throw error2;
+    }
+    if (!data2) {
+      return null;
+    }
+    return data2;
+  };
+  const { data, error, isLoading, mutate } = (0, import_swr3.default)(queryKey, fetchEntity, {
+    fallbackData: null,
+    onErrorRetry: (error2, key, config) => {
+      if (error2.code == "entity_not_found") {
+        return false;
+      }
+      return true;
+    }
+  });
+  if (!entityId) {
+    return {
+      entity: null,
+      isLoading: false,
+      error: null,
+      refetch: mutate
     };
   }
-  return mergedProducts;
-};
-var usePricingTable = (options) => {
-  const { pricingTableProvider } = useAutumnContext();
-  const { pricingTableProducts, isLoading, error, refetch } = pricingTableProvider;
-  (0, import_react8.useEffect)(() => {
-    if (!pricingTableProducts) {
-      refetch();
-    }
-  }, [pricingTableProducts]);
   return {
-    products: mergeProductDetails(
-      pricingTableProducts || void 0,
-      options?.productDetails
-    ),
-    isLoading: isLoading && !pricingTableProducts,
+    entity: error ? null : data,
+    isLoading,
     error,
-    refetch
+    refetch: mutate
   };
 };
 
-// src/libraries/react/hooks/useEntity.tsx
-var import_react9 = require("react");
-
-// src/libraries/react/utils/compareParams.ts
-var compareParams = (a, b) => {
-  if (a === b) return true;
-  if (a === null || b === null) return false;
-  if (typeof a !== "object" || typeof b !== "object") return false;
-  if (Array.isArray(a) && Array.isArray(b)) {
-    if (a.length !== b.length) return false;
-    return a.every((item, index) => compareParams(item, b[index]));
-  }
-  const keysA = Object.keys(a);
-  const keysB = Object.keys(b);
-  if (keysA.length !== keysB.length) return false;
-  return keysA.every((key) => {
-    if (!Object.prototype.hasOwnProperty.call(b, key)) return false;
-    return compareParams(a[key], b[key]);
-  });
-};
-
 // src/libraries/react/hooks/useEntity.tsx
 var useEntity = (entityId, params) => {
-  const { entityProvider } = useAutumnContext();
-  const {
-    entity,
-    isLoading,
-    error,
-    refetch: refetchEntity,
-    lastParams
-  } = entityProvider;
-  (0, import_react9.useEffect)(() => {
-    if (entityId !== entity?.id || !compareParams(params, lastParams)) {
-      refetchEntity({ entityId, params });
-    }
-  }, [entityId]);
-  return {
-    entity,
-    isLoading: isLoading && !entity,
-    error,
-    refetch: async (params2) => {
-      await refetchEntity({ entityId, params: params2 });
-    }
-  };
+  return useEntityBase({ AutumnContext, entityId, params });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {