swell-js 5.8.1 → 5.9.0

package/dist/swell.cjs

@@ -4493,8 +4493,6 @@ function isEmpty(value) {
 
 const LOADING_SCRIPTS = {};
 
-let options = {};
-
 function arrayMerge(target, source, options) {
   const destination = target.slice();
   source.forEach((item, index) => {
@@ -4532,14 +4530,6 @@ function merge(x, y, opt) {
   return deepmerge(x, y, opt);
 }
 
-function setOptions(optns) {
-  options = optns;
-}
-
-function getOptions() {
-  return options;
-}
-
 function isObject(val) {
   return val && typeof val === 'object' && !(val instanceof Array);
 }
@@ -4621,7 +4611,7 @@ function defaultMethods(api, uri, methods) {
   };
 }
 
-async function vaultRequest(method, url, data) {
+async function vaultRequest(method, url, data, options) {
   const { vaultUrl, timeout, key } = options;
   const requestData = {
     $jsonp: {
@@ -4805,7 +4795,6 @@ const utils = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   findIndex,
   get,
   getLocationParams,
-  getOptions,
   isEmpty,
   isEqual,
   isFunction,
@@ -4820,7 +4809,6 @@ const utils = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   removeUrlParams,
   round: round$1,
   set,
-  setOptions,
   snakeCase,
   stringifyQuery,
   toCamel,
@@ -4835,171 +4823,173 @@ const utils = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   vaultRequest
 }, Symbol.toStringTag, { value: 'Module' }));
 
-const cardApi = {
-  async createToken(data) {
-    let error = null;
-    let code = null;
-    let param = null;
-    if (!data) {
-      error = 'Card details are missing in `swell.card.createToken(card)`';
-      param = '';
-    }
-    const card = toSnake(data);
-    if (!card.nonce) {
-      if (!this.validateNumber(card.number)) {
-        error = 'Card number appears to be invalid';
-        code = 'invalid_card_number';
-        param = 'number';
+function methods$e(options) {
+  return {
+    async createToken(data) {
+      let error = null;
+      let code = null;
+      let param = null;
+      if (!data) {
+        error = 'Card details are missing in `swell.card.createToken(card)`';
+        param = '';
+      }
+      const card = toSnake(data);
+      if (!card.nonce) {
+        if (!this.validateNumber(card.number)) {
+          error = 'Card number appears to be invalid';
+          code = 'invalid_card_number';
+          param = 'number';
+        }
+        if (card.exp) {
+          const exp = this.expiry(card.exp);
+          card.exp_month = exp.month;
+          card.exp_year = exp.year;
+        }
+        if (!this.validateExpiry(card.exp_month, card.exp_year)) {
+          error = 'Card expiry appears to be invalid';
+          code = 'invalid_card_expiry';
+          param = 'exp_month';
+        }
+        if (!this.validateCVC(card.cvc)) {
+          error = 'Card CVC code appears to be invalid';
+          code = 'invalid_card_cvc';
+          param = 'exp_cvc';
+        }
       }
-      if (card.exp) {
-        const exp = this.expiry(card.exp);
-        card.exp_month = exp.month;
-        card.exp_year = exp.year;
+
+      if (error) {
+        const err = new Error(error);
+        err.code = code || 'invalid_card';
+        err.status = 402;
+        err.param = param;
+        throw err;
       }
-      if (!this.validateExpiry(card.exp_month, card.exp_year)) {
-        error = 'Card expiry appears to be invalid';
-        code = 'invalid_card_expiry';
-        param = 'exp_month';
+
+      // Get a token from the vault
+      const result = await vaultRequest('post', '/tokens', card, options);
+      if (result.errors) {
+        const param = Object.keys(result.errors)[0];
+        const err = new Error(result.errors[param].message || 'Unknown error');
+        err.code = 'vault_error';
+        err.status = 402;
+        err.param = param;
+        throw err;
       }
-      if (!this.validateCVC(card.cvc)) {
-        error = 'Card CVC code appears to be invalid';
-        code = 'invalid_card_cvc';
-        param = 'exp_cvc';
+      return result;
+    },
+
+    expiry(value) {
+      if (value && value.month && value.year) {
+        return value;
       }
-    }
 
-    if (error) {
-      const err = new Error(error);
-      err.code = code || 'invalid_card';
-      err.status = 402;
-      err.param = param;
-      throw err;
-    }
+      const parts = new String(value).split(/[\s/-]+/, 2);
+      const month = parts[0];
 
-    // Get a token from the vault
-    const result = await vaultRequest('post', '/tokens', card);
-    if (result.errors) {
-      const param = Object.keys(result.errors)[0];
-      const err = new Error(result.errors[param].message || 'Unknown error');
-      err.code = 'vault_error';
-      err.status = 402;
-      err.param = param;
-      throw err;
-    }
-    return result;
-  },
+      const currentYear = new Date().getUTCFullYear().toString();
+      let strYear = parts[1];
 
-  expiry(value) {
-    if (value && value.month && value.year) {
-      return value;
-    }
+      if (strYear.length < currentYear.length) {
+        let fullYear =
+          currentYear.slice(0, currentYear.length - strYear.length) + strYear;
 
-    const parts = new String(value).split(/[\s/-]+/, 2);
-    const month = parts[0];
+        // If the expiration year is less than the current year,
+        // then the expiration year is in the next century.
+        if (fullYear < currentYear) {
+          let year = Number(fullYear);
+          year += 10 ** strYear.length;
+          fullYear = year.toString();
+        }
 
-    const currentYear = new Date().getUTCFullYear().toString();
-    let strYear = parts[1];
+        strYear = fullYear;
+      }
 
-    if (strYear.length < currentYear.length) {
-      let fullYear =
-        currentYear.slice(0, currentYear.length - strYear.length) + strYear;
+      return {
+        month: Number.parseInt(month, 10),
+        year: Number.parseInt(strYear, 10),
+      };
+    },
 
-      // If the expiration year is less than the current year,
-      // then the expiration year is in the next century.
-      if (fullYear < currentYear) {
-        let year = Number(fullYear);
-        year += 10 ** strYear.length;
-        fullYear = year.toString();
-      }
+    types() {
+      let t = {};
+      for (let e = 40; e <= 49; ++e) t[e] = 'Visa';
+      for (let e = 50; e <= 59; ++e) t[e] = 'MasterCard';
+      t[34] = t[37] = 'American Express';
+      t[60] = t[62] = t[64] = t[65] = 'Discover';
+      t[35] = 'JCB';
+      t[30] = t[36] = t[38] = t[39] = 'Diners Club';
+      return t;
+    },
 
-      strYear = fullYear;
-    }
+    type(num) {
+      return this.types()[num.slice(0, 2)] || 'Unknown';
+    },
 
-    return {
-      month: Number.parseInt(month, 10),
-      year: Number.parseInt(strYear, 10),
-    };
-  },
-
-  types() {
-    let t = {};
-    for (let e = 40; e <= 49; ++e) t[e] = 'Visa';
-    for (let e = 50; e <= 59; ++e) t[e] = 'MasterCard';
-    t[34] = t[37] = 'American Express';
-    t[60] = t[62] = t[64] = t[65] = 'Discover';
-    t[35] = 'JCB';
-    t[30] = t[36] = t[38] = t[39] = 'Diners Club';
-    return t;
-  },
-
-  type(num) {
-    return this.types()[num.slice(0, 2)] || 'Unknown';
-  },
-
-  luhnCheck(num) {
-    const numbers = String(num);
-    let odd = false;
-    let sum = 0;
-
-    for (let i = numbers.length - 1; i >= 0; --i) {
-      let digit = Number.parseInt(numbers[i], 10);
-
-      if (odd) {
-        digit *= 2;
-
-        if (digit > 9) {
-          digit -= 9;
+    luhnCheck(num) {
+      const numbers = String(num);
+      let odd = false;
+      let sum = 0;
+
+      for (let i = numbers.length - 1; i >= 0; --i) {
+        let digit = Number.parseInt(numbers[i], 10);
+
+        if (odd) {
+          digit *= 2;
+
+          if (digit > 9) {
+            digit -= 9;
+          }
         }
-      }
 
-      sum += digit;
-      odd = !odd;
-    }
+        sum += digit;
+        odd = !odd;
+      }
 
-    return sum % 10 === 0;
-  },
+      return sum % 10 === 0;
+    },
 
-  validateNumber(num) {
-    num = String(num).replace(/\s+|-/g, '');
+    validateNumber(num) {
+      num = String(num).replace(/\s+|-/g, '');
 
-    return num.length >= 10 && num.length <= 16 && this.luhnCheck(num);
-  },
+      return num.length >= 10 && num.length <= 16 && this.luhnCheck(num);
+    },
 
-  validateExpiry(month, year) {
-    month = String(month).trim();
-    year = String(year).trim();
+    validateExpiry(month, year) {
+      month = String(month).trim();
+      year = String(year).trim();
 
-    if (!/^\d+$/.test(month) || !/^\d+$/.test(year)) {
-      return false;
-    }
+      if (!/^\d+$/.test(month) || !/^\d+$/.test(year)) {
+        return false;
+      }
 
-    const numMonth = Number.parseInt(month, 10);
+      const numMonth = Number.parseInt(month, 10);
 
-    if (numMonth <= 0 || numMonth > 12) {
-      return false;
-    }
+      if (numMonth <= 0 || numMonth > 12) {
+        return false;
+      }
 
-    const date = new Date(year, month);
-    date.setMonth(date.getMonth() - 1);
-    date.setMonth(date.getMonth() + 1, 1);
+      const date = new Date(year, month);
+      date.setMonth(date.getMonth() - 1);
+      date.setMonth(date.getMonth() + 1, 1);
 
-    const diff = date.getTime() - Date.now();
+      const diff = date.getTime() - Date.now();
 
-    // The card has expired
-    if (diff < 0) {
-      return false;
-    }
+      // The card has expired
+      if (diff < 0) {
+        return false;
+      }
 
-    // The card's validity period must not exceed 50 years from the current time.
-    return Math.round(diff / 31_557_600_000) < 50;
-  },
+      // The card's validity period must not exceed 50 years from the current time.
+      return Math.round(diff / 31_557_600_000) < 50;
+    },
 
-  validateCVC(val) {
-    val = String(val).trim();
+    validateCVC(val) {
+      val = String(val).trim();
 
-    return /^\d+$/.test(val) && val.length >= 3 && val.length <= 4;
-  },
-};
+      return /^\d+$/.test(val) && val.length >= 3 && val.length <= 4;
+    },
+  };
+}
 
 const COOKIE_MAX_AGE = 604800; // 1 week
 
@@ -5050,191 +5040,191 @@ function setCookie(name, value, options = {}) {
 
 const RECORD_TIMEOUT = 5000;
 
-let VALUES = {
-  /*
-  [model]: {
-    [id]: {
-      data,
-      record,
-      recordTimer,
-      presets,
+function methods$d(opt) {
+  let VALUES = {
+    /*
+    [model]: {
+      [id]: {
+        data,
+        record,
+        recordTimer,
+        presets,
+      }
     }
-  }
-*/
-};
-
-const cacheApi = {
-  options: {
-    enabled: true,
-    debug: false,
-  },
+  */
+  };
 
-  debug(...args) {
-    if (this.options.debug) {
-      console.log(...args);
-    }
-  },
+  return {
+    options: {
+      enabled: true,
+      debug: false,
+    },
 
-  values({ model, id }, setValues = undefined) {
-    this.debug('cache.values', ...arguments);
-    if (setValues !== undefined) {
-      for (let key in setValues) {
-        set(VALUES, `${model}.${id}.${key}`, setValues[key]);
+    debug(...args) {
+      if (this.options.debug) {
+        console.log(...args);
       }
-      return;
-    }
-    return get(VALUES, `${model}.${id}`, {});
-  },
+    },
 
-  preset(details) {
-    this.debug('cache.preset', ...arguments);
-    const { presets = [] } = this.values(details);
-    presets.push(details);
-    this.values(details, { presets });
-  },
+    values({ model, id }, setValues = undefined) {
+      this.debug('cache.values', ...arguments);
+      if (setValues !== undefined) {
+        for (let key in setValues) {
+          set(VALUES, `${model}.${id}.${key}`, setValues[key]);
+        }
+        return;
+      }
+      return get(VALUES, `${model}.${id}`, {});
+    },
 
-  set(details) {
-    this.debug('cache.set', ...arguments);
-    let { model, id, path, value } = details;
-    let { data = {}, record } = this.values(details);
+    preset(details) {
+      this.debug('cache.preset', ...arguments);
+      const { presets = [] } = this.values(details);
+      presets.push(details);
+      this.values(details, { presets });
+    },
 
-    if (id === null) {
-      return;
-    }
+    set(details) {
+      this.debug('cache.set', ...arguments);
+      let { model, id, path, value } = details;
+      let { data = {}, record } = this.values(details);
 
-    if (record === undefined) {
-      return this.preset(details);
-    }
+      if (id === null) {
+        return;
+      }
 
-    data = merge(record || {}, data);
+      if (record === undefined) {
+        return this.preset(details);
+      }
 
-    const { useCamelCase } = getOptions();
-    if (useCamelCase && value && typeof value === 'object') {
-      value = toCamel(value);
-    }
+      data = merge(record || {}, data);
 
-    if (path || value instanceof Array) {
-      let upData = { ...(data || {}) };
-      let upPath = useCamelCase ? toCamelPath(path) : path;
-      set(upData, upPath || '', value);
-      data = upData;
-    } else if (value && typeof value === 'object') {
-      data = data || {};
-      data = merge(data, value);
-    } else {
-      data = value;
-    }
+      const { useCamelCase } = opt;
+      if (useCamelCase && value && typeof value === 'object') {
+        value = toCamel(value);
+      }
+
+      if (path || value instanceof Array) {
+        let upData = { ...(data || {}) };
+        let upPath = useCamelCase ? toCamelPath(path) : path;
+        set(upData, upPath || '', value);
+        data = upData;
+      } else if (value && typeof value === 'object') {
+        data = data || {};
+        data = merge(data, value);
+      } else {
+        data = value;
+      }
 
-    this.values(details, { data });
+      this.values(details, { data });
 
-    try {
-      // Make sure values have clean refs
-      const cache = VALUES[model][id];
-      if (cache !== undefined) {
-        if (cache.data !== undefined) {
-          cache.data = JSON.parse(JSON.stringify(cache.data));
-        }
-        if (cache.record !== undefined) {
-          cache.record = JSON.parse(JSON.stringify(cache.record));
+      try {
+        // Make sure values have clean refs
+        const cache = VALUES[model][id];
+        if (cache !== undefined) {
+          if (cache.data !== undefined) {
+            cache.data = JSON.parse(JSON.stringify(cache.data));
+          }
+          if (cache.record !== undefined) {
+            cache.record = JSON.parse(JSON.stringify(cache.record));
+          }
         }
+      } catch (err) {
+        // noop
       }
-    } catch (err) {
-      // noop
-    }
-  },
+    },
 
-  get(model, id) {
-    this.debug('cache.get', ...arguments);
-    const { data, recordTimer } = this.values({ model, id });
-    this.debug('cache.get:data+recordTimer', ...arguments);
-    if (recordTimer) {
-      return data;
-    }
-  },
+    get(model, id) {
+      this.debug('cache.get', ...arguments);
+      const { data, recordTimer } = this.values({ model, id });
+      this.debug('cache.get:data+recordTimer', ...arguments);
+      if (recordTimer) {
+        return data;
+      }
+    },
 
-  setRecord(record, details) {
-    this.debug('cache.setRecord', ...arguments);
-    let { recordTimer, presets } = this.values(details);
+    setRecord(record, details) {
+      this.debug('cache.setRecord', ...arguments);
+      let { recordTimer, presets } = this.values(details);
 
-    if (recordTimer) {
-      clearTimeout(recordTimer);
-    }
+      if (recordTimer) {
+        clearTimeout(recordTimer);
+      }
 
-    recordTimer = setTimeout(() => {
-      this.values(details, { record: undefined, recordTimer: undefined });
-    }, RECORD_TIMEOUT);
+      recordTimer = setTimeout(() => {
+        this.values(details, { record: undefined, recordTimer: undefined });
+      }, RECORD_TIMEOUT);
 
-    // Record has to be null at minimum, not undefined
-    this.values(details, {
-      record: record !== undefined ? record : null,
-      recordTimer,
-    });
+      // Record has to be null at minimum, not undefined
+      this.values(details, {
+        record: record !== undefined ? record : null,
+        recordTimer,
+      });
 
-    if (presets) {
-      for (let preset of presets) {
-        this.set(preset);
+      if (presets) {
+        for (let preset of presets) {
+          this.set(preset);
+        }
+        this.values(details, { presets: undefined });
       }
-      this.values(details, { presets: undefined });
-    }
 
-    const result = this.get(details.model, details.id);
+      const result = this.get(details.model, details.id);
 
-    return result !== undefined ? result : record;
-  },
+      return result !== undefined ? result : record;
+    },
 
-  async getFetch(model, id, fetch) {
-    if (this.options.enabled) {
-      this.debug('cache.getFetch', ...arguments);
-      const value = this.get(model, id);
+    async getFetch(model, id, fetch) {
+      if (this.options.enabled) {
+        this.debug('cache.getFetch', ...arguments);
+        const value = this.get(model, id);
 
-      if (value !== undefined) {
-        return value;
+        if (value !== undefined) {
+          return value;
+        }
       }
-    }
 
-    const record = await fetch();
-    return this.setRecord(record, { model, id });
-  },
+      const record = await fetch();
+      return this.setRecord(record, { model, id });
+    },
 
-  clear(model = undefined, id = undefined) {
-    this.debug('cache.clear', ...arguments);
-    if (model) {
-      if (id) {
-        set(VALUES, `${model}.${id}`, undefined);
+    clear(model = undefined, id = undefined) {
+      this.debug('cache.clear', ...arguments);
+      if (model) {
+        if (id) {
+          set(VALUES, `${model}.${id}`, undefined);
+        } else {
+          set(VALUES, model, undefined);
+        }
       } else {
-        set(VALUES, model, undefined);
+        VALUES = {};
       }
-    } else {
-      VALUES = {};
-    }
-  },
-};
+    },
+  };
+}
 
 function methods$c(api) {
   const { get, list } = defaultMethods(api, '/attributes', ['list', 'get']);
 
   return {
     get: (id, ...args) => {
-      return cacheApi.getFetch('attributes', id, () => get(id, ...args));
+      return api.cache.getFetch('attributes', id, () => get(id, ...args));
     },
 
     list,
   };
 }
 
-let OPTIONS;
-
 function methods$b(api, opt) {
-  OPTIONS = opt;
   const { get, list } = defaultMethods(api, '/products', ['list', 'get']);
   return {
     get: (id, ...args) => {
-      return cacheApi.getFetch('products', id, () => get(id, ...args));
+      return api.cache.getFetch('products', id, () => get(id, ...args));
     },
 
     list,
 
-    variation: calculateVariation,
+    variation: (input, options, purchaseOption) =>
+      calculateVariation(input, options, purchaseOption, opt),
 
     categories: getCategories,
 
@@ -5314,8 +5304,8 @@ function findVariantWithOptionValueIds(product, ids) {
   return null;
 }
 
-function calculateVariation(input, options, purchaseOption) {
-  const product = OPTIONS.useCamelCase ? toSnake(input) : input;
+function calculateVariation(input, options, purchaseOption, opt) {
+  const product = opt.useCamelCase ? toSnake(input) : input;
   const purchaseOp = findPurchaseOption(product, purchaseOption);
   const variation = {
     ...product,
@@ -5378,7 +5368,7 @@ function calculateVariation(input, options, purchaseOption) {
   if (variation.orig_price === undefined) {
     delete variation.orig_price;
   }
-  return OPTIONS.useCamelCase ? toCamel(variation) : variation;
+  return opt.useCamelCase ? toCamel(variation) : variation;
 }
 
 function findPurchaseOption(product, purchaseOption) {
@@ -5433,8 +5423,7 @@ function findPurchaseOption(product, purchaseOption) {
 }
 
 async function getFilterableAttributeFilters(api, products, options) {
-  const { results: filterableAttributes } = await methods$c(
-    api).list({
+  const { results: filterableAttributes } = await methods$c(api).list({
     filterable: true,
   });
 
@@ -6041,19 +6030,29 @@ class AppPaymentComponent extends AppComponent {
   }
 
   #getIntent(data) {
-    return vaultRequest('GET', '/intent', {
-      gateway: this.#gateway,
-      account_id: this.#accountId,
-      intent: data,
-    });
+    return vaultRequest(
+      'GET',
+      '/intent',
+      {
+        gateway: this.#gateway,
+        account_id: this.#accountId,
+        intent: data,
+      },
+      this.options,
+    );
   }
 
   #createIntent(data) {
-    return vaultRequest('POST', '/intent', {
-      gateway: this.#gateway,
-      account_id: this.#accountId,
-      intent: data,
-    });
+    return vaultRequest(
+      'POST',
+      '/intent',
+      {
+        gateway: this.#gateway,
+        account_id: this.#accountId,
+        intent: data,
+      },
+      this.options,
+    );
   }
 }
 
@@ -6208,7 +6207,7 @@ function methods$8(api) {
 
   return {
     get: (id, ...args) => {
-      return cacheApi.getFetch('categories', id, () => get(id, ...args));
+      return api.cache.getFetch('categories', id, () => get(id, ...args));
     },
 
     list,
@@ -6219,7 +6218,7 @@ function methods$7(api) {
   const { get, list } = defaultMethods(api, '/subscriptions', ['list', 'get']);
   return {
     get: (id, ...args) => {
-      return cacheApi.getFetch('subscriptions', id, () => get(id, ...args));
+      return api.cache.getFetch('subscriptions', id, () => get(id, ...args));
     },
 
     list,
@@ -6284,7 +6283,7 @@ function methods$6(api) {
   const { get, list } = defaultMethods(api, '/invoices', ['list', 'get']);
   return {
     get: (id, ...args) => {
-      return cacheApi.getFetch('invoices', id, () => get(id, ...args));
+      return api.cache.getFetch('invoices', id, () => get(id, ...args));
     },
 
     list,
@@ -6294,7 +6293,7 @@ function methods$6(api) {
 function methods$5(api, opt) {
   return {
     get: (type, id, query) => {
-      return cacheApi.getFetch(`content_${type}`, id, () =>
+      return api.cache.getFetch(`content_${type}`, id, () =>
         api.request('get', `/content/${type}`, id, {
           $preview: opt.previewContent,
           ...(query || {}),
@@ -6665,13 +6664,18 @@ async function loadStripe() {
 
 async function loadPaypal(params) {
   if (!window.paypal) {
-    const { currency, client_id, merchant_id } = params;
+    const { vault, currency, client_id, merchant_id } = params;
+
     const paypalParams = {
       currency,
       'client-id': client_id,
       commit: false,
     };
 
+    if (vault) {
+      paypalParams.vault = vault;
+    }
+
     if (merchant_id) {
       // paypal express and ppcp onboarded
       paypalParams['merchant-id'] = merchant_id;
@@ -7036,7 +7040,7 @@ class Payment {
    * @returns {Promise<object>}
    */
   async createIntent(data) {
-    return vaultRequest('post', '/intent', data);
+    return vaultRequest('post', '/intent', data, this.options);
   }
 
   /**
@@ -7046,7 +7050,7 @@ class Payment {
    * @returns {Promise<object>}
    */
   async updateIntent(data) {
-    return vaultRequest('put', '/intent', data);
+    return vaultRequest('put', '/intent', data, this.options);
   }
 
   /**
@@ -7056,7 +7060,7 @@ class Payment {
    * @returns {Promise<object>}
    */
   async authorizeGateway(data) {
-    return vaultRequest('post', '/authorization', data);
+    return vaultRequest('post', '/authorization', data, this.options);
   }
 
   /**
@@ -8798,7 +8802,7 @@ async function onPaymentDataChanged(intermediatePaymentData) {
 
         // Update cart with new shipping address and force tax recalculation
         let cart = await this.updateCart({
-          shipping: convertToSwellAddress$2(
+          shipping: convertToSwellAddress$3(
             intermediatePaymentData.shippingAddress,
           ),
         });
@@ -9064,7 +9068,7 @@ function getOfferInfo(cart) {
  * @param {google.payments.api.Address} address
  * @returns {Address}
  */
-function convertToSwellAddress$2(address) {
+function convertToSwellAddress$3(address) {
   return {
     name: address.name,
     address1: address.address1,
@@ -9328,11 +9332,11 @@ class BraintreeGooglePayment extends Payment {
           nonce,
           gateway: 'braintree',
         },
-        ...convertToSwellAddress$2(billingAddress),
+        ...convertToSwellAddress$3(billingAddress),
       },
       ...(shippingAddress && {
         shipping: {
-          ...convertToSwellAddress$2(shippingAddress),
+          ...convertToSwellAddress$3(shippingAddress),
           service: shippingOptionData?.id || undefined,
         },
       }),
@@ -9340,7 +9344,7 @@ class BraintreeGooglePayment extends Payment {
 
     if (cart.subscription_delivery) {
       try {
-        const card = await cardApi.createToken({
+        const card = await this.api.card.createToken({
           gateway: 'braintree',
           account_id: cart.account_id,
           nonce,
@@ -9369,6 +9373,7 @@ class BraintreeGooglePayment extends Payment {
 /** @typedef {import('./payment').default} Payment */
 /** @typedef {import('../../types').Cart} Cart */
 /** @typedef {import('../../types').Address} Address */
+/** @typedef {import('../../types').CartItemBillingSchedule} CartItemBillingSchedule */
 
 /**
  * @this {Payment}
@@ -9380,7 +9385,7 @@ async function onShippingAddressChange(shippingContact) {
     // Update cart with Apple Pay shipping address to get shipping options and tax
     // This happens immediately when the sheet opens with the default address
     const cart = await this.updateCart({
-      shipping: convertToSwellAddress$1(shippingContact),
+      shipping: convertToSwellAddress$2(shippingContact),
     });
 
     if (!cart.shipment_rating?.services?.length) {
@@ -9669,7 +9674,7 @@ function getShippingMethods(cart) {
  * @param {ApplePayJS.ApplePayPaymentContact} [address]
  * @returns {Address}
  */
-function convertToSwellAddress$1(address = {}) {
+function convertToSwellAddress$2(address = {}) {
   return {
     first_name: address.givenName,
     last_name: address.familyName,
@@ -9712,6 +9717,99 @@ function getRequiredContactFields(params) {
   return { requiredBillingContactFields, requiredShippingContactFields };
 }
 
+/**
+ * @param {CartItemBillingSchedule} schedule
+ * @returns {{ intervalUnit: ApplePayJS.ApplePayRecurringPaymentDateUnit, intervalCount: number }}
+ */
+function convertSwellScheduleToAppleRecurringInterval(schedule) {
+  let intervalCount = schedule.interval_count || 1;
+  let intervalUnit = 'day';
+
+  switch (schedule.interval) {
+    case 'daily':
+      intervalUnit = 'day';
+      break;
+
+    case 'weekly':
+      intervalUnit = 'day';
+      intervalCount *= 7;
+      break;
+
+    case 'monthly':
+      intervalUnit = 'month';
+      break;
+
+    case 'yearly':
+      intervalUnit = 'year';
+      break;
+  }
+
+  return { intervalUnit, intervalCount };
+}
+
+/**
+ * @param {Cart} cart
+ * @param {string} managementUrl
+ * @returns {ApplePayJS.ApplePayRecurringPaymentRequest | undefined}
+ */
+function getRecurringPaymentRequest(cart, managementUrl) {
+  if (!cart.subscription_delivery) {
+    return undefined;
+  }
+
+  const item = cart.items.find(
+    (item) =>
+      item.purchase_option?.type === 'subscription' &&
+      item.purchase_option.billing_schedule,
+  );
+
+  if (item === undefined) {
+    return undefined;
+  }
+
+  const { intervalUnit, intervalCount } =
+    convertSwellScheduleToAppleRecurringInterval(
+      item.purchase_option.billing_schedule,
+    );
+
+  /** @type {ApplePayJS.ApplePayRecurringPaymentRequest} */
+  const recurringPaymentRequest = {
+    paymentDescription:
+      item.purchase_option.plan_description ||
+      item.purchase_option.plan_name ||
+      item.product_name ||
+      item.product?.name,
+    regularBilling: {
+      type: 'final',
+      label: item.purchase_option.plan_name || 'Subscription',
+      // Calculate the subscription price manually if a trial period is specified.
+      // However, discounts are not included in the calculation due to the difficulty of taking into account all scenarios.
+      amount: (item.purchase_option.billing_schedule.trial_days
+        ? (item.price || 0) * (item.quantity || 1)
+        : item.price_total
+      ).toFixed(2),
+      paymentTiming: 'recurring',
+      recurringPaymentIntervalUnit: intervalUnit,
+      recurringPaymentIntervalCount: intervalCount,
+    },
+    trialBilling: item.purchase_option.billing_schedule.trial_days
+      ? {
+          type: 'final',
+          label: 'Trial',
+          // When a trial period is set, price_total is 0 (usually)
+          amount: Number(item.price_total || 0).toFixed(2),
+          paymentTiming: 'recurring',
+          recurringPaymentIntervalUnit: 'day',
+          recurringPaymentIntervalCount:
+            item.purchase_option.billing_schedule.trial_days,
+        }
+      : undefined,
+    managementURL: managementUrl,
+  };
+
+  return recurringPaymentRequest;
+}
+
 /** @typedef {import('../../../types').Cart} Cart */
 
 const VERSION$1 = 14;
@@ -9914,16 +10012,16 @@ class BraintreeApplePayment extends Payment {
             nonce: payload.nonce,
             gateway: 'braintree',
           },
-          ...convertToSwellAddress$1(billingContact),
+          ...convertToSwellAddress$2(billingContact),
         },
         ...(shippingContact && {
-          shipping: convertToSwellAddress$1(shippingContact),
+          shipping: convertToSwellAddress$2(shippingContact),
         }),
       });
 
       if (cart.subscription_delivery) {
         try {
-          const card = await cardApi.createToken({
+          const card = await this.api.card.createToken({
             gateway: 'braintree',
             account_id: cart.account_id,
             nonce: payload.nonce,
@@ -10123,7 +10221,7 @@ class AbstractGooglePayment extends Payment {
    * @returns {Promise<object>}
    */
   // eslint-disable-next-line no-unused-vars
-  async preparePaymentDataForCartUpdate(paymentData) {
+  async processPaymentData(paymentData) {
     throw new Error('Implement this!');
   }
 
@@ -10145,9 +10243,7 @@ class AbstractGooglePayment extends Payment {
       throw new Error('Google Pay token is missing');
     }
 
-    await this.preparePaymentDataForCartUpdate(paymentData).then((data) =>
-      this.updateCart(data),
-    );
+    await this.processPaymentData(paymentData);
 
     this.onSuccess();
   }
@@ -10270,7 +10366,7 @@ class AuthorizeNetGooglePayment extends AbstractGooglePayment {
    * @param {google.payments.api.PaymentData} paymentData
    * @returns {Promise<object>}
    */
-  async preparePaymentDataForCartUpdate(paymentData) {
+  async processPaymentData(paymentData) {
     const { email, shippingAddress, shippingOptionData, paymentMethodData } =
       paymentData;
 
@@ -10279,7 +10375,7 @@ class AuthorizeNetGooglePayment extends AbstractGooglePayment {
       tokenizationData: { token },
     } = paymentMethodData;
 
-    return {
+    await this.updateCart({
       account: { email },
       billing: {
         method: 'google',
@@ -10289,15 +10385,15 @@ class AuthorizeNetGooglePayment extends AbstractGooglePayment {
           gateway: 'authorizenet',
           token: base64Encode(token),
         },
-        ...convertToSwellAddress$2(billingAddress),
+        ...convertToSwellAddress$3(billingAddress),
       },
       ...(shippingAddress && {
         shipping: {
-          ...convertToSwellAddress$2(shippingAddress),
+          ...convertToSwellAddress$3(shippingAddress),
           service: shippingOptionData?.id || undefined,
         },
       }),
-    };
+    });
   }
 }
 
@@ -10412,6 +10508,10 @@ class AbstractApplePayment extends Payment {
       requiredShippingContactFields,
       requiredBillingContactFields,
       supportsCouponCode: true,
+      recurringPaymentRequest: getRecurringPaymentRequest(
+        cart,
+        this.params.managementUrl,
+      ),
       lineItems: getLineItems(cart),
     };
   }
@@ -10434,7 +10534,7 @@ class AbstractApplePayment extends Payment {
    * @returns {Promise<object>}
    */
   // eslint-disable-next-line no-unused-vars
-  async preparePaymentDataForCartUpdate(event) {
+  async processPaymentData(event) {
     throw new Error('Implement this!');
   }
 
@@ -10492,9 +10592,7 @@ class AbstractApplePayment extends Payment {
         //
         // We store the payment token but DO NOT process the order yet.
         // The user must manually click "Place Order" to complete the transaction.
-        await this.preparePaymentDataForCartUpdate(event).then((data) =>
-          this.updateCart(data),
-        );
+        await this.processPaymentData(event);
 
         // Complete Apple Pay session successfully
         // This closes the Apple Pay sheet and shows success to the user
@@ -10630,12 +10728,12 @@ class AuthorizeNetApplePayment extends AbstractApplePayment {
    * @param {ApplePayJS.ApplePayPaymentAuthorizedEvent} event
    * @returns {Promise<object>}
    */
-  async preparePaymentDataForCartUpdate(event) {
+  async processPaymentData(event) {
     const {
       payment: { token, shippingContact, billingContact },
     } = event;
 
-    return {
+    return this.updateCart({
       account: {
         email: shippingContact?.emailAddress || billingContact?.emailAddress,
       },
@@ -10647,12 +10745,12 @@ class AuthorizeNetApplePayment extends AbstractApplePayment {
           gateway: 'authorizenet',
           token: base64Encode(JSON.stringify(token.paymentData)),
         },
-        ...convertToSwellAddress$1(billingContact),
+        ...convertToSwellAddress$2(billingContact),
       },
       ...(shippingContact && {
-        shipping: convertToSwellAddress$1(shippingContact),
+        shipping: convertToSwellAddress$2(shippingContact),
       }),
-    };
+    });
   }
 }
 
@@ -10829,7 +10927,7 @@ class ConvesioCardPayment extends Payment {
       ''
     ).replace(/[^0-9]+/g, '');
 
-    const cardExpiry = cardApi.expiry(
+    const cardExpiry = this.api.card.expiry(
       this.params.exp ||
         document.getElementById(
           this.params.cardExpiry?.elementId || 'cardExpiry-element',
@@ -10853,7 +10951,7 @@ class ConvesioCardPayment extends Payment {
       ''
     ).trim();
 
-    const cardBrand = cardApi.type(cardNumber).toLowerCase();
+    const cardBrand = this.api.card.type(cardNumber).toLowerCase();
 
     const payment = await createConvesioCardPaymentToken(this.method, {
       paymentMethod: {
@@ -11020,7 +11118,7 @@ class ConvesioPayApplePayment extends AbstractApplePayment {
    * @param {ApplePayJS.ApplePayPaymentAuthorizedEvent} event
    * @returns {Promise<object>}
    */
-  async preparePaymentDataForCartUpdate(event) {
+  async processPaymentData(event) {
     const {
       payment: { token, shippingContact, billingContact },
     } = event;
@@ -11044,7 +11142,7 @@ class ConvesioPayApplePayment extends AbstractApplePayment {
       },
     );
 
-    return {
+    return this.updateCart({
       account: {
         email: shippingContact?.emailAddress || billingContact?.emailAddress,
       },
@@ -11059,12 +11157,12 @@ class ConvesioPayApplePayment extends AbstractApplePayment {
         convesiopay: {
           return_url: this.params.returnUrl,
         },
-        ...convertToSwellAddress$1(billingContact),
+        ...convertToSwellAddress$2(billingContact),
       },
       ...(shippingContact && {
-        shipping: convertToSwellAddress$1(shippingContact),
+        shipping: convertToSwellAddress$2(shippingContact),
       }),
-    };
+    });
   }
 }
 
@@ -11190,7 +11288,7 @@ class ConvesioPayGooglePayment extends AbstractGooglePayment {
    * @param {google.payments.api.PaymentData} paymentData
    * @returns {Promise<object>}
    */
-  async preparePaymentDataForCartUpdate(paymentData) {
+  async processPaymentData(paymentData) {
     const { email, shippingAddress, shippingOptionData, paymentMethodData } =
       paymentData;
 
@@ -11218,7 +11316,7 @@ class ConvesioPayGooglePayment extends AbstractGooglePayment {
       },
     );
 
-    return {
+    return this.updateCart({
       account: { email },
       billing: {
         method: 'google',
@@ -11231,15 +11329,15 @@ class ConvesioPayGooglePayment extends AbstractGooglePayment {
         convesiopay: {
           return_url: this.params.returnUrl,
         },
-        ...convertToSwellAddress$2(billingAddress),
+        ...convertToSwellAddress$3(billingAddress),
       },
       ...(shippingAddress && {
         shipping: {
-          ...convertToSwellAddress$2(shippingAddress),
+          ...convertToSwellAddress$3(shippingAddress),
           service: shippingOptionData?.id || undefined,
         },
       }),
-    };
+    });
   }
 }
 
@@ -11442,12 +11540,26 @@ function getKlarnaSessionData(cart) {
   };
 }
 
+/** @typedef {import('@paypal/paypal-js').PayPalNamespace} PayPal */
+/** @typedef {import('@paypal/paypal-js').ShippingAddress} ShippingAddress */
+/** @typedef {import('@paypal/paypal-js').CreateOrderData} CreateOrderData */
+/** @typedef {import('@paypal/paypal-js').CreateOrderActions} CreateOrderActions */
+/** @typedef {import('@paypal/paypal-js').OnShippingAddressChangeData} OnShippingAddressChangeData */
+/** @typedef {import('@paypal/paypal-js').OnShippingAddressChangeActions} OnShippingAddressChangeActions */
+/** @typedef {import('@paypal/paypal-js').OnShippingOptionsChangeData} OnShippingOptionsChangeData */
+/** @typedef {import('@paypal/paypal-js').OnShippingOptionsChangeActions} OnShippingOptionsChangeActions */
+/** @typedef {import('@paypal/paypal-js').OnApproveData} OnApproveData */
+/** @typedef {import('@paypal/paypal-js').OnApproveActions} OnApproveActions */
+/** @typedef {import('../../../types').Cart} Cart */
+/** @typedef {import('../../../types').Address} Address */
+
 class PaypalDirectPayment extends Payment {
   constructor(api, options, params, methods) {
     super(api, options, params, methods.paypal);
   }
 
-  get scripts() {
+  /** @param {Cart} cart */
+  getScripts(cart) {
     const { client_id } = this.method;
 
     return [
@@ -11457,11 +11569,13 @@ class PaypalDirectPayment extends Payment {
           client_id,
           merchant_id: this.merchantId,
           cart: ['currency'],
+          vault: cart.subscription_delivery,
         },
       },
     ];
   }
 
+  /** @returns {PayPal} */
   get paypal() {
     if (!window.paypal) {
       throw new LibraryNotLoadedError('PayPal');
@@ -11485,7 +11599,6 @@ class PaypalDirectPayment extends Payment {
   async createElements(cart) {
     const {
       elementId = 'paypal-button',
-      locale = 'en_US',
       style: {
         layout = 'horizontal',
         height = 45,
@@ -11494,15 +11607,16 @@ class PaypalDirectPayment extends Payment {
         label = 'paypal',
         tagline = false,
       } = {},
+      require: { shipping: requireShipping = true } = {},
     } = this.params;
 
     this.setElementContainer(elementId);
 
     this._validateCart(cart);
-    await this.loadScripts(this.scripts);
+    await this.loadScripts(this.getScripts(cart));
 
-    this.element = this.paypal.Buttons({
-      locale,
+    /** @type {import('@paypal/paypal-js').PayPalButtonsComponentOptions} */
+    const buttonsOptions = {
       style: {
         layout,
         height,
@@ -11511,11 +11625,27 @@ class PaypalDirectPayment extends Payment {
         label,
         tagline,
       },
+      fundingSource: this.paypal.FUNDING.PAYPAL,
       createOrder: this._onCreateOrder.bind(this, cart),
-      onShippingChange: this._onShippingChange.bind(this),
       onApprove: this._onApprove.bind(this),
       onError: this.onError.bind(this),
-    });
+    };
+
+    if (requireShipping) {
+      buttonsOptions.onShippingAddressChange =
+        this._onShippingAddressChange.bind(this);
+
+      buttonsOptions.onShippingOptionsChange =
+        this._onShippingOptionsChange.bind(this);
+    }
+
+    const component = this.paypal.Buttons(buttonsOptions);
+
+    if (!component.isEligible()) {
+      throw new Error('PayPal button with provided options is not eligible.');
+    }
+
+    this.element = component;
   }
 
   mountElements() {
@@ -11529,6 +11659,7 @@ class PaypalDirectPayment extends Payment {
     }
   }
 
+  /** @param {Cart} cart */
   _validateCart(cart) {
     const hasSubscriptionProduct = Boolean(cart.subscription_delivery);
 
@@ -11538,27 +11669,35 @@ class PaypalDirectPayment extends Payment {
       );
     }
 
-    if (!(cart.capture_total > 0)) {
+    if ((cart.capture_total || 0) <= 0) {
       throw new Error(
         'Invalid PayPal button amount. Value should be greater than zero.',
       );
     }
   }
 
+  /**
+   * @param {Cart} cart
+   * @param {CreateOrderData} _data
+   * @param {CreateOrderActions} _actions
+   * @returns {Promise<string>}
+   */
   async _onCreateOrder(cart, _data, _actions) {
-    const { require: { shipping: requireShipping = true } = {} } = this.params;
+    const {
+      locale = 'en-US',
+      require: { shipping: requireShipping = true } = {},
+    } = this.params;
+
     const { capture_total, currency, subscription_delivery } = cart;
     const hasSubscriptionProduct = Boolean(subscription_delivery);
     const merchantId = this.merchantId;
     const returnUrl = this.returnUrl;
-    const orderData = {
-      application_context: {
-        shipping_preference: requireShipping ? 'GET_FROM_FILE' : 'NO_SHIPPING',
-      },
-    };
+    /** @type {import('@paypal/paypal-js').CreateOrderRequestBody} */
+    const orderData = {};
+    /** @type {import('@paypal/paypal-js').PurchaseUnit} */
     const purchaseUnit = {
       amount: {
-        value: Number(capture_total.toFixed(2)),
+        value: Number(capture_total).toFixed(2),
         currency_code: currency,
       },
     };
@@ -11566,29 +11705,44 @@ class PaypalDirectPayment extends Payment {
     if (merchantId) {
       // express checkout and ppcp
       orderData.intent = 'AUTHORIZE';
+
+      orderData.payment_source = {
+        paypal: {
+          experience_context: {
+            locale,
+            shipping_preference: requireShipping
+              ? 'GET_FROM_FILE'
+              : 'NO_SHIPPING',
+          },
+        },
+      };
+
       purchaseUnit.payee = {
         merchant_id: merchantId,
       };
 
       if (hasSubscriptionProduct) {
-        orderData.payment_source = {
-          paypal: {
-            attributes: {
-              vault: {
-                store_in_vault: 'ON_SUCCESS',
-                usage_type: 'MERCHANT',
-              },
-            },
-            experience_context: {
-              return_url: `${returnUrl}&redirect_status=succeeded`,
-              cancel_url: `${returnUrl}&redirect_status=canceled`,
-            },
+        orderData.payment_source.paypal.attributes = {
+          vault: {
+            store_in_vault: 'ON_SUCCESS',
+            usage_type: 'MERCHANT',
           },
         };
+
+        Object.assign(orderData.payment_source.paypal.experience_context, {
+          return_url: `${returnUrl}&redirect_status=succeeded`,
+          cancel_url: `${returnUrl}&redirect_status=canceled`,
+        });
       }
     } else {
       // progressive checkout
       orderData.intent = 'CAPTURE';
+
+      orderData.application_context = {
+        locale,
+        shipping_preference: requireShipping ? 'GET_FROM_FILE' : 'NO_SHIPPING',
+      };
+
       purchaseUnit.payee = {
         email_address: this.method.store_owner_email,
       };
@@ -11604,44 +11758,37 @@ class PaypalDirectPayment extends Payment {
     return order.id;
   }
 
-  async _onShippingChange(data, actions) {
+  /**
+   * @param {OnShippingAddressChangeData} data
+   * @param {OnShippingAddressChangeActions} actions
+   */
+  async _onShippingAddressChange(data, actions) {
     try {
-      const { orderID, shipping_address, selected_shipping_option } = data;
-      const updateData = {
+      const { orderID, shippingAddress } = data;
+
+      const cart = await this.updateCart({
         shipping: {
-          state: shipping_address.state,
-          city: shipping_address.city,
-          zip: shipping_address.postal_code,
-          country: shipping_address.country_code,
+          state: shippingAddress.state,
+          city: shippingAddress.city,
+          zip: shippingAddress.postalCode,
+          country: shippingAddress.countryCode,
         },
         shipment_rating: null,
-      };
-
-      if (selected_shipping_option) {
-        updateData.shipping.service = selected_shipping_option.id;
-        updateData.$taxes = true;
-      }
+      });
 
-      const cart = await this.updateCart(updateData);
-      const shippingServices = get(cart, 'shipment_rating.services');
+      const shippingServices = cart.shipment_rating?.services;
 
-      // can't fulfill shipping to selected address
+      // Can't fulfill shipping to selected address
       if (isEmpty(shippingServices)) {
         return actions.reject();
       }
 
-      let selectedShippingService;
-
-      if (selected_shipping_option) {
-        selectedShippingService = shippingServices.find(
-          (shippingService) =>
-            shippingService.id === selected_shipping_option.id,
-        );
-      }
+      let selectedShippingService = cart.shipping?.service;
 
       // need to set first service for cart by default
       if (!selectedShippingService) {
         const [firstShippingService] = shippingServices;
+        selectedShippingService = firstShippingService.id;
 
         await this.updateCart({
           shipping: {
@@ -11658,8 +11805,33 @@ class PaypalDirectPayment extends Payment {
           paypal_order_id: orderID,
         },
       });
+    } catch (error) {
+      this.onError(error);
+
+      return actions.reject();
+    }
+  }
+
+  /**
+   * @param {OnShippingOptionsChangeData} data
+   * @param {OnShippingOptionsChangeActions} actions
+   */
+  async _onShippingOptionsChange(data, actions) {
+    try {
+      const { orderID, selectedShippingOption } = data;
+
+      const cart = await this.updateCart({
+        shipping: { service: selectedShippingOption.id },
+        $taxes: true,
+      });
 
-      return orderID;
+      await this.updateIntent({
+        gateway: 'paypal',
+        intent: {
+          cart_id: cart.id,
+          paypal_order_id: orderID,
+        },
+      });
     } catch (error) {
       this.onError(error);
 
@@ -11667,14 +11839,17 @@ class PaypalDirectPayment extends Payment {
     }
   }
 
+  /**
+   * @param {OnApproveData} data
+   * @param {OnApproveActions} actions
+   */
   async _onApprove(data, actions) {
-    const { require: { shipping: requireShipping = true } = {} } = this.params;
     const order = await actions.order.get();
     const orderId = order.id;
-    const payer = order.payer;
+    const payer = order.payment_source?.paypal || order.payer;
     const billing = payer.address;
-    const shipping = get(order, 'purchase_units[0].shipping');
-    const name = `${payer.name.given_name} ${payer.name.surname}`;
+    const shipping = order.purchase_units?.[0]?.shipping;
+    const name = `${payer.name?.given_name} ${payer.name?.surname}`;
 
     await this.updateCart({
       account: {
@@ -11686,31 +11861,35 @@ class PaypalDirectPayment extends Payment {
           order_id: orderId,
         },
         name,
-        ...this._mapAddress(billing),
+        ...convertToSwellAddress$1(billing),
       },
-      ...(requireShipping && {
+      ...(shipping?.address && {
         shipping: {
           first_name: payer.name.given_name,
           last_name: payer.name.surname,
           name: shipping.name.full_name,
-          ...this._mapAddress(shipping.address),
+          ...convertToSwellAddress$1(shipping.address),
         },
       }),
     });
 
     this.onSuccess();
   }
+}
 
-  _mapAddress(address) {
-    return {
-      address1: address.address_line_1,
-      address2: address.address_line_2,
-      state: address.admin_area_1,
-      city: address.admin_area_2,
-      zip: address.postal_code,
-      country: address.country_code,
-    };
-  }
+/**
+ * @param {ShippingAddress} address
+ * @returns {Address}
+ */
+function convertToSwellAddress$1(address) {
+  return {
+    address1: address.address_line_1,
+    address2: address.address_line_2,
+    state: address.admin_area_1,
+    city: address.admin_area_2,
+    zip: address.postal_code,
+    country: address.country_code,
+  };
 }
 
 class AmazonDirectPayment extends Payment {
@@ -12477,7 +12656,7 @@ class PaymentController {
   }
 
   async _vaultRequest(method, url, data) {
-    const response = await vaultRequest(method, url, data);
+    const response = await vaultRequest(method, url, data, this.options);
 
     if (this.options.useCamelCase) {
       return toCamel(response);
@@ -13031,7 +13210,7 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
   const api = {};
 
   Object.assign(api, {
-    version: '5.8.1',
+    version: '5.9.0',
     options,
     request,
 
@@ -13061,8 +13240,6 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
       options.getCart = opt.getCart;
       options.updateCart = opt.updateCart;
       options.headers = opt.headers || {};
-
-      setOptions(options);
     },
 
     // Backward compatibility
@@ -13086,9 +13263,9 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
       return api.request('delete', url, data);
     },
 
-    cache: cacheApi,
+    cache: methods$d(options),
 
-    card: cardApi,
+    card: methods$e(options),
 
     cart: methods$a(api, options),
 
@@ -13122,9 +13299,13 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
 
     utils,
 
-    getCookie,
+    getCookie(name) {
+      return (options.getCookie || getCookie)(name);
+    },
 
-    setCookie,
+    setCookie(name, value, cookieOptions) {
+      return (options.setCookie || setCookie)(name, value, cookieOptions);
+    },
   });
 
   async function request(