swell-js 4.0.2 → 4.0.3

package/dist/api.mjs

@@ -7,7 +7,7 @@ import methods$5 from './products.mjs';
 import methods$6 from './categories.mjs';
 import methods$7 from './attributes.mjs';
 import methods$8 from './subscriptions.mjs';
-import { d as defaultMethods, z as trimEnd, A as utils, B as trimStart, C as trimBoth, t as toSnake, D as stringifyQuery, E as base64Encode, a as toCamel, F as setOptions } from './index.78b6af02.mjs';
+import { d as defaultMethods, z as trimEnd, A as utils, B as trimStart, C as trimBoth, t as toSnake, D as stringifyQuery, E as base64Encode, a as toCamel, F as setOptions } from './index.6938673d.mjs';
 import methods$9 from './content.mjs';
 import methods$a from './settings.mjs';
 import PaymentController from './payment.mjs';
@@ -135,7 +135,7 @@ const options = {
 };
 
 const api = {
-  version: '4.0.2',
+  version: '4.0.3',
   options,
   request,
 

package/dist/attributes.mjs

@@ -1,4 +1,4 @@
-import { d as defaultMethods } from './index.78b6af02.mjs';
+import { d as defaultMethods } from './index.6938673d.mjs';
 import cacheApi from './cache.mjs';
 import 'qs';
 import './find.fd7de00e.mjs';

package/dist/cache.mjs

@@ -1,4 +1,4 @@
-import { s as set, m as merge, a as toCamel, h as toCamelPath, j as getOptions } from './index.78b6af02.mjs';
+import { s as set, m as merge, a as toCamel, h as toCamelPath, j as getOptions } from './index.6938673d.mjs';
 import { g as get } from './find.fd7de00e.mjs';
 import 'qs';
 import './round.a606b844.mjs';

package/dist/card.mjs

@@ -1,4 +1,4 @@
-import { t as toSnake, v as vaultRequest } from './index.78b6af02.mjs';
+import { t as toSnake, v as vaultRequest } from './index.6938673d.mjs';
 import 'qs';
 import './find.fd7de00e.mjs';
 import './round.a606b844.mjs';

package/dist/cart.mjs

@@ -1,5 +1,5 @@
 import 'qs';
-import { c as cloneDeep } from './index.78b6af02.mjs';
+import { c as cloneDeep } from './index.6938673d.mjs';
 import 'deepmerge';
 import 'fast-case';
 import { cleanProductOptions } from './products.mjs';
@@ -38,9 +38,12 @@ function methods(request, options) {
 
       const { handler, resolve, reject } = this.pendingRequests.shift();
 
-      return Promise.resolve().then(handler).then(resolve, reject).finally(() => {
-        this.nextRequest();
-      });
+      return Promise.resolve()
+        .then(handler)
+        .then(resolve, reject)
+        .finally(() => {
+          this.nextRequest();
+        });
     },
 
     async requestStateSync(handler) {

package/dist/categories.mjs

@@ -1,4 +1,4 @@
-import { d as defaultMethods } from './index.78b6af02.mjs';
+import { d as defaultMethods } from './index.6938673d.mjs';
 import cacheApi from './cache.mjs';
 import 'qs';
 import './find.fd7de00e.mjs';

package/dist/content.mjs

@@ -1,5 +1,5 @@
 import cacheApi from './cache.mjs';
-import './index.78b6af02.mjs';
+import './index.6938673d.mjs';
 import 'qs';
 import './find.fd7de00e.mjs';
 import './round.a606b844.mjs';

package/dist/cookie.mjs

@@ -1,4 +1,4 @@
-import { i as isServer } from './index.78b6af02.mjs';
+import { i as isServer } from './index.6938673d.mjs';
 import 'qs';
 import './find.fd7de00e.mjs';
 import './round.a606b844.mjs';

package/dist/currency.mjs

@@ -25,7 +25,8 @@ function methods(request, opt) {
     selected() {
       if (!this.code) {
         this.set(
-          opt.getCookie('swell-currency') || opt.api.settings.get('store.currency'),
+          opt.getCookie('swell-currency') ||
+            opt.api.settings.get('store.currency'),
         );
       }
 
@@ -69,8 +70,7 @@ function methods(request, opt) {
       const formatCode = params.code || code;
       const formatRate = params.rate || rate;
       const formatLocale = params.locale || this.locale;
-      const formatDecimals =
-        'decimals' in params ? params.decimals : decimals;
+      const formatDecimals = 'decimals' in params ? params.decimals : decimals;
       const { convert = true } = params;
 
       let formatAmount = amount;
@@ -171,8 +171,8 @@ function methods(request, opt) {
               ? 'up'
               : 'down'
             : diff <= -0.5
-            ? 'down'
-            : 'up'
+              ? 'down'
+              : 'up'
           : config.round;
 
       switch (direction) {

package/dist/{index.78b6af02.mjs → index.6938673d.mjs}

@@ -1590,64 +1590,62 @@ function defaultMethods(request, uri, methods) {
   };
 }
 
-async function vaultRequest(method, url, data, opt = undefined) {
-  const vaultUrl = options.vaultUrl;
-  const timeout = options.timeout;
-  const requestId = vaultRequestId();
-  const callback = `swell_vault_response_${requestId}`;
-
-  data = {
+async function vaultRequest(method, url, data) {
+  const { vaultUrl, timeout, key } = options;
+  const requestData = {
     $jsonp: {
       method,
-      callback,
+      callback: 'none',
     },
     $data: data,
-    $key: options.key,
+    $key: key,
   };
-
-  return new Promise((resolve, reject) => {
-    const script = document.createElement('script');
-    script.type = 'text/javascript';
-    script.src = `${trimEnd(vaultUrl)}/${trimStart(url)}?${serializeData(
-      data,
-    )}`;
-
-    const errorTimeout = setTimeout(() => {
-      window[callback]({
-        $error: `Request timed out after ${timeout / 1000} seconds`,
-        $status: 500,
-      });
-    }, timeout);
-
-    window[callback] = (result) => {
-      clearTimeout(errorTimeout);
-      if (result && result.$error) {
-        const err = new Error(result.$error);
-        err.code = 'request_error';
-        err.status = result.$status;
-        reject(err);
-      } else if (!result || result.$status >= 300) {
-        const err = new Error(
-          'A connection error occurred while making the request',
+  const requestUrl = `${trimEnd(vaultUrl)}/${trimStart(url)}?${serializeData(
+    requestData,
+  )}`;
+
+  const abortController = new AbortController();
+  const id = setTimeout(() => abortController.abort(), timeout);
+
+  const result = await fetch(requestUrl, {
+    signal: abortController.signal,
+  })
+    .then((response) => response.json())
+    .catch((error) => {
+      if (error.name === 'AbortError') {
+        const timeoutError = new Error(
+          `Request timed out after ${timeout / 1000} seconds`,
         );
-        err.code = 'connection_error';
-        err.status = result.$status;
-        reject(err);
-      } else {
-        resolve(result.$data);
+
+        timeoutError.status = 500;
+
+        throw timeoutError;
       }
-      delete window[callback];
-      script.parentNode.removeChild(script);
-    };
 
-    document.getElementsByTagName('head')[0].appendChild(script);
-  });
-}
+      throw new Error(error.message);
+    });
+
+  clearTimeout(id);
 
-function vaultRequestId() {
-  window.__swell_vault_request_id = window.__swell_vault_request_id || 0;
-  window.__swell_vault_request_id++;
-  return window.__swell_vault_request_id;
+  if (result?.$error) {
+    const requestError = new Error(result.$error);
+
+    requestError.code = 'request_error';
+    requestError.status = result.$status;
+
+    throw requestError;
+  } else if (!result || result.$status >= 300) {
+    const connectionError = new Error(
+      'A connection error occurred while making the request',
+    );
+
+    connectionError.code = 'connection_error';
+    connectionError.status = result?.$status;
+
+    throw connectionError;
+  }
+
+  return result.$data;
 }
 
 function serializeData(data) {
@@ -1666,7 +1664,9 @@ function serializeData(data) {
   }
   return s.join('&').replace(' ', '+');
 }
+
 const rbracket = /\[\]$/;
+
 function buildParams(key, obj, add) {
   let name;
   if (obj instanceof Array) {

package/dist/index.mjs

@@ -1,6 +1,6 @@
 export { default } from './api.mjs';
 import './card.mjs';
-import './index.78b6af02.mjs';
+import './index.6938673d.mjs';
 import 'qs';
 import './find.fd7de00e.mjs';
 import './round.a606b844.mjs';

package/dist/payment.mjs

@@ -1,6 +1,6 @@
 import methods from './cart.mjs';
 import methods$1 from './settings.mjs';
-import { b as isObject, k as isFunction, l as loadScript, c as cloneDeep, t as toSnake, v as vaultRequest, p as pick, n as toLower, o as isEmpty, r as reduce, q as isLiveMode, w as map, x as getLocationParams, y as removeUrlParams, a as toCamel } from './index.78b6af02.mjs';
+import { b as isObject, k as isFunction, l as loadScript, c as cloneDeep, t as toSnake, v as vaultRequest, p as pick, n as toLower, o as isEmpty, r as reduce, q as isLiveMode, w as map, x as getLocationParams, y as removeUrlParams, a as toCamel } from './index.6938673d.mjs';
 import { g as get, t as toNumber } from './find.fd7de00e.mjs';
 import 'qs';
 import 'deepmerge';
@@ -638,8 +638,8 @@ function setBancontactOwner(source, data) {
     ...(billingData.phone
       ? { phone: billingData.phone }
       : account.phone
-      ? { phone: account.phone }
-      : {}),
+        ? { phone: account.phone }
+        : {}),
     ...(!isEmpty(billingAddress) ? { address: billingAddress } : {}),
   };
 }
@@ -2053,9 +2053,8 @@ class BraintreeGooglePayment extends Payment {
 
   async _onClick(googlePayment, paymentDataRequest) {
     try {
-      const paymentData = await this.googleClient.loadPaymentData(
-        paymentDataRequest,
-      );
+      const paymentData =
+        await this.googleClient.loadPaymentData(paymentDataRequest);
 
       if (paymentData) {
         await this._submitPayment(googlePayment, paymentData);

package/dist/products.mjs

@@ -1,4 +1,4 @@
-import { d as defaultMethods, r as reduce, t as toSnake, a as toCamel, f as snakeCase, u as uniq, g as isEqual } from './index.78b6af02.mjs';
+import { d as defaultMethods, r as reduce, t as toSnake, a as toCamel, f as snakeCase, u as uniq, g as isEqual } from './index.6938673d.mjs';
 import cacheApi from './cache.mjs';
 import methods$1 from './attributes.mjs';
 import { g as get, f as find } from './find.fd7de00e.mjs';
@@ -191,8 +191,8 @@ function findPurchaseOption(product, purchaseOption) {
     typeof purchaseOption === 'string'
       ? purchaseOption
       : plan !== undefined
-      ? 'subscription'
-      : 'standard',
+        ? 'subscription'
+        : 'standard',
   );
   let option = get(product, `purchase_options.${type}`);
   if (!option && type !== 'standard') {

package/dist/settings.mjs

@@ -1,4 +1,4 @@
-import { s as set, a as toCamel, m as merge, c as cloneDeep, b as isObject, e as camelCase } from './index.78b6af02.mjs';
+import { s as set, a as toCamel, m as merge, c as cloneDeep, b as isObject, e as camelCase } from './index.6938673d.mjs';
 import { g as get, f as find } from './find.fd7de00e.mjs';
 import 'qs';
 import './round.a606b844.mjs';

package/dist/subscriptions.mjs

@@ -1,5 +1,5 @@
 import { cleanProductOptions } from './products.mjs';
-import { d as defaultMethods } from './index.78b6af02.mjs';
+import { d as defaultMethods } from './index.6938673d.mjs';
 import cacheApi from './cache.mjs';
 import './attributes.mjs';
 import './find.fd7de00e.mjs';

package/dist/swell.cjs

@@ -4614,64 +4614,62 @@ function defaultMethods(request, uri, methods) {
   };
 }
 
-async function vaultRequest(method, url, data, opt = undefined) {
-  const vaultUrl = options$1.vaultUrl;
-  const timeout = options$1.timeout;
-  const requestId = vaultRequestId();
-  const callback = `swell_vault_response_${requestId}`;
-
-  data = {
+async function vaultRequest(method, url, data) {
+  const { vaultUrl, timeout, key } = options$1;
+  const requestData = {
     $jsonp: {
       method,
-      callback,
+      callback: 'none',
     },
     $data: data,
-    $key: options$1.key,
+    $key: key,
   };
+  const requestUrl = `${trimEnd(vaultUrl)}/${trimStart(url)}?${serializeData(
+    requestData,
+  )}`;
+
+  const abortController = new AbortController();
+  const id = setTimeout(() => abortController.abort(), timeout);
+
+  const result = await fetch(requestUrl, {
+    signal: abortController.signal,
+  })
+    .then((response) => response.json())
+    .catch((error) => {
+      if (error.name === 'AbortError') {
+        const timeoutError = new Error(
+          `Request timed out after ${timeout / 1000} seconds`,
+        );
 
-  return new Promise((resolve, reject) => {
-    const script = document.createElement('script');
-    script.type = 'text/javascript';
-    script.src = `${trimEnd(vaultUrl)}/${trimStart(url)}?${serializeData(
-      data,
-    )}`;
+        timeoutError.status = 500;
 
-    const errorTimeout = setTimeout(() => {
-      window[callback]({
-        $error: `Request timed out after ${timeout / 1000} seconds`,
-        $status: 500,
-      });
-    }, timeout);
-
-    window[callback] = (result) => {
-      clearTimeout(errorTimeout);
-      if (result && result.$error) {
-        const err = new Error(result.$error);
-        err.code = 'request_error';
-        err.status = result.$status;
-        reject(err);
-      } else if (!result || result.$status >= 300) {
-        const err = new Error(
-          'A connection error occurred while making the request',
-        );
-        err.code = 'connection_error';
-        err.status = result.$status;
-        reject(err);
-      } else {
-        resolve(result.$data);
+        throw timeoutError;
       }
-      delete window[callback];
-      script.parentNode.removeChild(script);
-    };
 
-    document.getElementsByTagName('head')[0].appendChild(script);
-  });
-}
+      throw new Error(error.message);
+    });
+
+  clearTimeout(id);
+
+  if (result?.$error) {
+    const requestError = new Error(result.$error);
+
+    requestError.code = 'request_error';
+    requestError.status = result.$status;
 
-function vaultRequestId() {
-  window.__swell_vault_request_id = window.__swell_vault_request_id || 0;
-  window.__swell_vault_request_id++;
-  return window.__swell_vault_request_id;
+    throw requestError;
+  } else if (!result || result.$status >= 300) {
+    const connectionError = new Error(
+      'A connection error occurred while making the request',
+    );
+
+    connectionError.code = 'connection_error';
+    connectionError.status = result?.$status;
+
+    throw connectionError;
+  }
+
+  return result.$data;
 }
 
 function serializeData(data) {
@@ -4690,7 +4688,9 @@ function serializeData(data) {
   }
   return s.join('&').replace(' ', '+');
 }
+
 const rbracket = /\[\]$/;
+
 function buildParams(key, obj, add) {
   let name;
   if (obj instanceof Array) {
@@ -5343,8 +5343,8 @@ function findPurchaseOption(product, purchaseOption) {
     typeof purchaseOption === 'string'
       ? purchaseOption
       : plan !== undefined
-      ? 'subscription'
-      : 'standard',
+        ? 'subscription'
+        : 'standard',
   );
   let option = get(product, `purchase_options.${type}`);
   if (!option && type !== 'standard') {
@@ -5602,9 +5602,12 @@ function methods$a(request, options) {
 
       const { handler, resolve, reject } = this.pendingRequests.shift();
 
-      return Promise.resolve().then(handler).then(resolve, reject).finally(() => {
-        this.nextRequest();
-      });
+      return Promise.resolve()
+        .then(handler)
+        .then(resolve, reject)
+        .finally(() => {
+          this.nextRequest();
+        });
     },
 
     async requestStateSync(handler) {
@@ -6901,8 +6904,8 @@ function setBancontactOwner(source, data) {
     ...(billingData.phone
       ? { phone: billingData.phone }
       : account.phone
-      ? { phone: account.phone }
-      : {}),
+        ? { phone: account.phone }
+        : {}),
     ...(!isEmpty(billingAddress) ? { address: billingAddress } : {}),
   };
 }
@@ -8316,9 +8319,8 @@ class BraintreeGooglePayment extends Payment {
 
   async _onClick(googlePayment, paymentDataRequest) {
     try {
-      const paymentData = await this.googleClient.loadPaymentData(
-        paymentDataRequest,
-      );
+      const paymentData =
+        await this.googleClient.loadPaymentData(paymentDataRequest);
 
       if (paymentData) {
         await this._submitPayment(googlePayment, paymentData);
@@ -9810,7 +9812,8 @@ function methods$1(request, opt) {
     selected() {
       if (!this.code) {
         this.set(
-          opt.getCookie('swell-currency') || opt.api.settings.get('store.currency'),
+          opt.getCookie('swell-currency') ||
+            opt.api.settings.get('store.currency'),
         );
       }
 
@@ -9854,8 +9857,7 @@ function methods$1(request, opt) {
       const formatCode = params.code || code;
       const formatRate = params.rate || rate;
       const formatLocale = params.locale || this.locale;
-      const formatDecimals =
-        'decimals' in params ? params.decimals : decimals;
+      const formatDecimals = 'decimals' in params ? params.decimals : decimals;
       const { convert = true } = params;
 
       let formatAmount = amount;
@@ -9956,8 +9958,8 @@ function methods$1(request, opt) {
               ? 'up'
               : 'down'
             : diff <= -0.5
-            ? 'down'
-            : 'up'
+              ? 'down'
+              : 'up'
           : config.round;
 
       switch (direction) {
@@ -10057,7 +10059,7 @@ const options = {
 };
 
 const api = {
-  version: '4.0.2',
+  version: '4.0.3',
   options,
   request,