@guardian/commercial-core 34.0.0 → 34.1.0

package/dist/cjs/geo/geo-utils.js

@@ -1,22 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._ = exports.isInRow = exports.isInAuOrNz = exports.isInUsOrCa = exports.isInNewZealand = exports.isInAustralia = exports.isInCanada = exports.isInUsa = exports.isInUk = void 0;
-const country_code_1 = require("./country-code.js");
-// cache the users location so we only have to look it up once
-let geo;
-const currentGeoLocation = () => {
-    geo = geo ?? (0, country_code_1.getCountryCode)();
-    return geo;
-};
-const isInUk = () => currentGeoLocation() === 'GB';
+const get_locale_1 = require("./get-locale.js");
+const isInUk = () => (0, get_locale_1.getLocale)() === 'GB';
 exports.isInUk = isInUk;
-const isInUsa = () => currentGeoLocation() === 'US';
+const isInUsa = () => (0, get_locale_1.getLocale)() === 'US';
 exports.isInUsa = isInUsa;
-const isInCanada = () => currentGeoLocation() === 'CA';
+const isInCanada = () => (0, get_locale_1.getLocale)() === 'CA';
 exports.isInCanada = isInCanada;
-const isInAustralia = () => currentGeoLocation() === 'AU';
+const isInAustralia = () => (0, get_locale_1.getLocale)() === 'AU';
 exports.isInAustralia = isInAustralia;
-const isInNewZealand = () => currentGeoLocation() === 'NZ';
+const isInNewZealand = () => (0, get_locale_1.getLocale)() === 'NZ';
 exports.isInNewZealand = isInNewZealand;
 const isInUsOrCa = () => (0, exports.isInUsa)() || (0, exports.isInCanada)();
 exports.isInUsOrCa = isInUsOrCa;
@@ -26,6 +20,6 @@ const isInRow = () => !(0, exports.isInUk)() && !(0, exports.isInUsOrCa)() && !(
 exports.isInRow = isInRow;
 exports._ = {
     resetModule: () => {
-        geo = undefined;
+        (0, get_locale_1.__resetCachedValue)();
     },
 };

package/dist/cjs/geo/get-locale.js

@@ -15,7 +15,6 @@ const editionToGeolocationMap = {
     AU: 'AU',
 };
 const editionToGeolocation = (editionKey) => editionToGeolocationMap[editionKey];
-// just used for tests
 const __resetCachedValue = () => (locale = undefined);
 exports.__resetCachedValue = __resetCachedValue;
 /**

package/dist/esm/geo/geo-utils.js

@@ -1,20 +1,14 @@
-import { getCountryCode } from './country-code.js';
-// cache the users location so we only have to look it up once
-let geo;
-const currentGeoLocation = () => {
-    geo = geo ?? getCountryCode();
-    return geo;
-};
-export const isInUk = () => currentGeoLocation() === 'GB';
-export const isInUsa = () => currentGeoLocation() === 'US';
-export const isInCanada = () => currentGeoLocation() === 'CA';
-export const isInAustralia = () => currentGeoLocation() === 'AU';
-export const isInNewZealand = () => currentGeoLocation() === 'NZ';
+import { __resetCachedValue, getLocale } from './get-locale.js';
+export const isInUk = () => getLocale() === 'GB';
+export const isInUsa = () => getLocale() === 'US';
+export const isInCanada = () => getLocale() === 'CA';
+export const isInAustralia = () => getLocale() === 'AU';
+export const isInNewZealand = () => getLocale() === 'NZ';
 export const isInUsOrCa = () => isInUsa() || isInCanada();
 export const isInAuOrNz = () => isInAustralia() || isInNewZealand();
 export const isInRow = () => !isInUk() && !isInUsOrCa() && !isInAuOrNz();
 export const _ = {
     resetModule: () => {
-        geo = undefined;
+        __resetCachedValue();
     },
 };

package/dist/esm/geo/get-locale.js

@@ -12,7 +12,6 @@ const editionToGeolocationMap = {
     AU: 'AU',
 };
 const editionToGeolocation = (editionKey) => editionToGeolocationMap[editionKey];
-// just used for tests
 export const __resetCachedValue = () => (locale = undefined);
 /**
  * Fetches the user's current location as an ISO 3166-1 alpha-2 string e.g. 'GB', 'AU' etc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guardian/commercial-core",
-  "version": "34.0.0",
+  "version": "34.1.0",
   "description": "Guardian advertising business logic",
   "homepage": "https://github.com/guardian/commercial#readme",
   "bugs": {

package/dist/cjs/geo/country-code.d.ts

@@ -1,3 +0,0 @@
-import type { CountryCode } from '@guardian/libs';
-declare const getCountryCode: () => CountryCode;
-export { getCountryCode };

package/dist/cjs/geo/country-code.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCountryCode = void 0;
-const libs_1 = require("@guardian/libs");
-const editionToCountryCodeMap = {
-    UK: 'GB',
-    US: 'US',
-    AU: 'AU',
-};
-const editionToCountryCode = (editionKey = 'UK') => editionToCountryCodeMap[editionKey];
-const countryCookieName = 'GU_geo_country';
-const countryOverrideName = 'gu.geo.override';
-/*
-   This method can be used as a non async way of getting the country code
-   after init has been called. Returning locale should cover all/most
-   of the cases but if a race condition happen or the cookie is not set,
-   we keep fallbacks to cookie or geo from edition.
-*/
-const getCountryCode = () => {
-    const pageEdition = window.guardian.config.page.edition;
-    const maybeCountryOverride = libs_1.storage.local.get(countryOverrideName);
-    const countryOverride = (0, libs_1.isString)(maybeCountryOverride)
-        ? maybeCountryOverride
-        : null;
-    return (countryOverride ??
-        (0, libs_1.getCookie)({
-            name: countryCookieName,
-            shouldMemoize: true,
-        }) ??
-        editionToCountryCode(pageEdition));
-};
-exports.getCountryCode = getCountryCode;

package/dist/esm/geo/country-code.d.ts

@@ -1,3 +0,0 @@
-import type { CountryCode } from '@guardian/libs';
-declare const getCountryCode: () => CountryCode;
-export { getCountryCode };

package/dist/esm/geo/country-code.js

@@ -1,29 +0,0 @@
-import { getCookie, isString, storage } from '@guardian/libs';
-const editionToCountryCodeMap = {
-    UK: 'GB',
-    US: 'US',
-    AU: 'AU',
-};
-const editionToCountryCode = (editionKey = 'UK') => editionToCountryCodeMap[editionKey];
-const countryCookieName = 'GU_geo_country';
-const countryOverrideName = 'gu.geo.override';
-/*
-   This method can be used as a non async way of getting the country code
-   after init has been called. Returning locale should cover all/most
-   of the cases but if a race condition happen or the cookie is not set,
-   we keep fallbacks to cookie or geo from edition.
-*/
-const getCountryCode = () => {
-    const pageEdition = window.guardian.config.page.edition;
-    const maybeCountryOverride = storage.local.get(countryOverrideName);
-    const countryOverride = isString(maybeCountryOverride)
-        ? maybeCountryOverride
-        : null;
-    return (countryOverride ??
-        getCookie({
-            name: countryCookieName,
-            shouldMemoize: true,
-        }) ??
-        editionToCountryCode(pageEdition));
-};
-export { getCountryCode };