swell-js 5.9.1 → 5.9.2

package/dist/api.mjs

@@ -15,7 +15,7 @@ import methods$b from './content.mjs';
 import methods$c from './settings.mjs';
 import PaymentController from './payment.mjs';
 import methods$d from './locale.mjs';
-import methods$e from './currency.mjs';
+import methods$e, { isCurrencyCode } from './currency.mjs';
 import './round.c68b8be5.mjs';
 
 class AppComponent {
@@ -455,7 +455,7 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
   const api = {};
 
   Object.assign(api, {
-    version: '5.9.1',
+    version: '5.9.2',
     options,
     request,
 
@@ -571,8 +571,10 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
 
     const session = allOptions.session || allOptions.getCookie('swell-session');
     const locale = allOptions.locale || allOptions.getCookie('swell-locale');
+    const cookieCurrency = allOptions.getCookie('swell-currency');
     const currency =
-      allOptions.currency || allOptions.getCookie('swell-currency');
+      allOptions.currency ||
+      (isCurrencyCode(cookieCurrency) ? cookieCurrency : undefined);
     const path = allOptions.path || '/api';
 
     const baseUrl = `${allOptions.url}${allOptions.base || ''}${path}`;

package/dist/currency.mjs

@@ -5,7 +5,30 @@ import 'fast-case';
 
 const FORMATTERS = {};
 
+// A currency code is three letters. Anything else, such as a pending settings
+// Promise that was stringified to "[object Promise]", is not a currency.
+function isCurrencyCode(value) {
+  return typeof value === 'string' && /^[a-z]{3}$/i.test(value);
+}
+
+function defaultLocale() {
+  return typeof navigator === 'object' ? navigator.language : 'en-US';
+}
+
 function methods(api, opt) {
+  // Reads a store setting without ever returning a Promise. Until settings
+  // load, this starts the request and reports `loaded: false`.
+  function readSetting(path, def) {
+    const value = opt.api.settings.get(path, def);
+
+    if (value && typeof value.then === 'function') {
+      value.catch(() => {}); // callers that await settings report the error
+      return { loaded: false, value: def };
+    }
+
+    return { loaded: true, value };
+  }
+
   return {
     code: null,
     state: null,
@@ -23,52 +46,72 @@ function methods(api, opt) {
 
     selected() {
       if (!this.code) {
-        this.set(
-          opt.getCookie('swell-currency') ||
-            opt.api.settings.get('store.currency'),
-        );
+        const cookieCode = opt.getCookie('swell-currency');
+
+        if (isCurrencyCode(cookieCode)) {
+          this.set(cookieCode);
+        } else {
+          const storeCode = readSetting('store.currency');
+
+          if (!storeCode.loaded) {
+            // Settings are still loading: use a stand-in without saving it,
+            // so the store currency is picked up once they arrive.
+            return 'USD';
+          }
+
+          this.set(isCurrencyCode(storeCode.value) ? storeCode.value : 'USD');
+        }
       }
 
       return this.code;
     },
 
     get() {
-      if (!this.code) {
-        this.code = this.selected();
+      const code = this.selected();
+
+      if (this.state) {
+        return this.state;
       }
-      if (!this.state) {
-        this.state = this.set(this.code);
+
+      if (!readSetting('store.currencies').loaded) {
+        // Not cached, so the currency's rate and decimals apply once
+        // settings load.
+        return { code };
       }
-      return this.state;
+
+      return this.set(code);
     },
 
     set(code = 'USD') {
-      this.code = code;
-      this.state = find(this.list(), { code }) || { code };
+      if (!isCurrencyCode(code)) {
+        // Never store or persist something that isn't a currency code.
+        return this.state || { code: this.code || 'USD' };
+      }
 
-      this.locale = String(
-        opt.api.settings.get(
-          'store.locale',
-          typeof navigator === 'object' ? navigator.language : 'en-US',
-        ),
-      );
+      const list = readSetting('store.currencies', []);
+      const state = (list.loaded && find(list.value, { code })) || { code };
+
+      this.code = code;
+      // Only cache a state built from the loaded currency list.
+      this.state = list.loaded ? state : null;
+      this.locale = String(readSetting('store.locale', defaultLocale()).value);
 
       opt.setCookie('swell-currency', code);
 
-      return this.state;
+      return state;
     },
 
     format(amount, params = {}) {
       let state = this.get();
       if (params.code && params.code !== state.code) {
-        const list = this.list();
+        const list = readSetting('store.currencies', []).value;
         state = find(list, { code: params.code }) || { code: params.code };
       }
 
       const { code = 'USD', type, decimals, rate } = state;
       const formatCode = params.code || code;
       const formatRate = params.rate || rate;
-      const formatLocale = params.locale || this.locale;
+      const formatLocale = params.locale || this.locale || defaultLocale();
       const formatDecimals = 'decimals' in params ? params.decimals : decimals;
       const { convert = true } = params;
 
@@ -193,4 +236,4 @@ function methods(api, opt) {
   };
 }
 
-export { methods as default };
+export { methods as default, isCurrencyCode };

package/dist/swell.cjs

@@ -13037,7 +13037,30 @@ function methods$2(api, opt) {
 
 const FORMATTERS = {};
 
+// A currency code is three letters. Anything else, such as a pending settings
+// Promise that was stringified to "[object Promise]", is not a currency.
+function isCurrencyCode(value) {
+  return typeof value === 'string' && /^[a-z]{3}$/i.test(value);
+}
+
+function defaultLocale() {
+  return typeof navigator === 'object' ? navigator.language : 'en-US';
+}
+
 function methods$1(api, opt) {
+  // Reads a store setting without ever returning a Promise. Until settings
+  // load, this starts the request and reports `loaded: false`.
+  function readSetting(path, def) {
+    const value = opt.api.settings.get(path, def);
+
+    if (value && typeof value.then === 'function') {
+      value.catch(() => {}); // callers that await settings report the error
+      return { loaded: false, value: def };
+    }
+
+    return { loaded: true, value };
+  }
+
   return {
     code: null,
     state: null,
@@ -13055,52 +13078,72 @@ function methods$1(api, opt) {
 
     selected() {
       if (!this.code) {
-        this.set(
-          opt.getCookie('swell-currency') ||
-            opt.api.settings.get('store.currency'),
-        );
+        const cookieCode = opt.getCookie('swell-currency');
+
+        if (isCurrencyCode(cookieCode)) {
+          this.set(cookieCode);
+        } else {
+          const storeCode = readSetting('store.currency');
+
+          if (!storeCode.loaded) {
+            // Settings are still loading: use a stand-in without saving it,
+            // so the store currency is picked up once they arrive.
+            return 'USD';
+          }
+
+          this.set(isCurrencyCode(storeCode.value) ? storeCode.value : 'USD');
+        }
       }
 
       return this.code;
     },
 
     get() {
-      if (!this.code) {
-        this.code = this.selected();
+      const code = this.selected();
+
+      if (this.state) {
+        return this.state;
       }
-      if (!this.state) {
-        this.state = this.set(this.code);
+
+      if (!readSetting('store.currencies').loaded) {
+        // Not cached, so the currency's rate and decimals apply once
+        // settings load.
+        return { code };
       }
-      return this.state;
+
+      return this.set(code);
     },
 
     set(code = 'USD') {
-      this.code = code;
-      this.state = find$1(this.list(), { code }) || { code };
+      if (!isCurrencyCode(code)) {
+        // Never store or persist something that isn't a currency code.
+        return this.state || { code: this.code || 'USD' };
+      }
 
-      this.locale = String(
-        opt.api.settings.get(
-          'store.locale',
-          typeof navigator === 'object' ? navigator.language : 'en-US',
-        ),
-      );
+      const list = readSetting('store.currencies', []);
+      const state = (list.loaded && find$1(list.value, { code })) || { code };
+
+      this.code = code;
+      // Only cache a state built from the loaded currency list.
+      this.state = list.loaded ? state : null;
+      this.locale = String(readSetting('store.locale', defaultLocale()).value);
 
       opt.setCookie('swell-currency', code);
 
-      return this.state;
+      return state;
     },
 
     format(amount, params = {}) {
       let state = this.get();
       if (params.code && params.code !== state.code) {
-        const list = this.list();
+        const list = readSetting('store.currencies', []).value;
         state = find$1(list, { code: params.code }) || { code: params.code };
       }
 
       const { code = 'USD', type, decimals, rate } = state;
       const formatCode = params.code || code;
       const formatRate = params.rate || rate;
-      const formatLocale = params.locale || this.locale;
+      const formatLocale = params.locale || this.locale || defaultLocale();
       const formatDecimals = 'decimals' in params ? params.decimals : decimals;
       const { convert = true } = params;
 
@@ -13325,7 +13368,7 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
   const api = {};
 
   Object.assign(api, {
-    version: '5.9.1',
+    version: '5.9.2',
     options,
     request,
 
@@ -13441,8 +13484,10 @@ function swell(initStore = undefined, initKey, initOptions = {}) {
 
     const session = allOptions.session || allOptions.getCookie('swell-session');
     const locale = allOptions.locale || allOptions.getCookie('swell-locale');
+    const cookieCurrency = allOptions.getCookie('swell-currency');
     const currency =
-      allOptions.currency || allOptions.getCookie('swell-currency');
+      allOptions.currency ||
+      (isCurrencyCode(cookieCurrency) ? cookieCurrency : undefined);
     const path = allOptions.path || '/api';
 
     const baseUrl = `${allOptions.url}${allOptions.base || ''}${path}`;