@saasquatch/component-environment 1.0.0-5 → 1.0.1-1

package/dist/index.d.ts

@@ -253,6 +253,7 @@ declare function setUserIdentity(identity?: UserIdentity): void;
  */
 declare function getUserIdentity(): UserIdentity | undefined;
 
+declare function validateLocale(locale?: string): string | undefined;
 /**
  * Lazily start the locale context provider. If it already exists, the existing provider is
  * returned. This function is safe to call multiple times.
@@ -289,4 +290,4 @@ declare function setProgramId(programId: string | undefined): void;
  */
 declare function getProgramId(): string | undefined;
 
-export { BrowserHistory, DEFAULT_MEDIUM, DecodedSquatchJWT, DecodedWidgetAPIJWT, EngagementMedium, Environment, EnvironmentSDK, HistoryEntry, LOCALE_CONTEXT_NAME, LazyHistory, LocaleContextName, MemoryHistory, PROGRAM_CONTEXT_NAME, PortalEnv, ProgramContextName, SquatchAdmin, SquatchAndroid, SquatchJS2, USER_CONTEXT_NAME, UserContextName, UserId, UserIdentity, WidgetIdent, getAppDomain, getEngagementMedium, getEnvironment, getEnvironmentSDK, getLocale, getProgramId, getTenantAlias, getUserIdentity, _default as history, isDemo, lazilyStartLocaleContext, lazilyStartProgramContext, lazilyStartUserContext, setLocale, setProgramId, setUserIdentity, userIdentityFromJwt };
+export { BrowserHistory, DEFAULT_MEDIUM, DecodedSquatchJWT, DecodedWidgetAPIJWT, EngagementMedium, Environment, EnvironmentSDK, HistoryEntry, LOCALE_CONTEXT_NAME, LazyHistory, LocaleContextName, MemoryHistory, PROGRAM_CONTEXT_NAME, PortalEnv, ProgramContextName, SquatchAdmin, SquatchAndroid, SquatchJS2, USER_CONTEXT_NAME, UserContextName, UserId, UserIdentity, WidgetIdent, getAppDomain, getEngagementMedium, getEnvironment, getEnvironmentSDK, getLocale, getProgramId, getTenantAlias, getUserIdentity, _default as history, isDemo, lazilyStartLocaleContext, lazilyStartProgramContext, lazilyStartUserContext, setLocale, setProgramId, setUserIdentity, userIdentityFromJwt, validateLocale };

package/dist/index.js

@@ -63,7 +63,8 @@ __export(src_exports, {
   setLocale: () => setLocale,
   setProgramId: () => setProgramId,
   setUserIdentity: () => setUserIdentity,
-  userIdentityFromJwt: () => userIdentityFromJwt
+  userIdentityFromJwt: () => userIdentityFromJwt,
+  validateLocale: () => validateLocale
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -288,8 +289,8 @@ var MemoryHistory = class {
     if (typeof to === "string") {
       this.history[this.index] = {
         pathname: to,
-        search: this.history[this.index].search,
-        hash: this.history[this.index].hash,
+        search: "",
+        hash: "",
         state
       };
     } else {
@@ -359,14 +360,20 @@ var import_dom_context2 = require("dom-context");
 // src/contexts/LocaleContext.ts
 var import_dom_context = require("dom-context");
 var debug3 = (...args) => debug(LOCALE_CONTEXT_NAME, ...args);
+function validateLocale(locale) {
+  if (locale && /^[a-z]{2}_(?:[A-Z]{2}|[0-9]{3})$/.test(locale)) {
+    return locale;
+  }
+}
 function lazilyStartLocaleContext() {
   var _a;
   let globalProvider = window.squatchLocale;
   if (!globalProvider) {
     debug3("Creating locale context provider");
+    const locale = ((_a = window.widgetIdent) == null ? void 0 : _a.locale) ?? validateLocale(navigator.language.replace("-", "_"));
     globalProvider = new import_dom_context.ContextProvider({
       element: document.documentElement,
-      initialState: ((_a = window.widgetIdent) == null ? void 0 : _a.locale) || navigator.language.replace("-", "_"),
+      initialState: locale,
       contextName: LOCALE_CONTEXT_NAME
     }).start();
     window.squatchLocale = globalProvider;
@@ -594,7 +601,7 @@ function setProgramId(programId) {
 }
 function getProgramId() {
   var _a;
-  return (_a = window.squatchLocale) == null ? void 0 : _a.context;
+  return (_a = window.squatchProgramId) == null ? void 0 : _a.context;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -621,5 +628,6 @@ function getProgramId() {
   setLocale,
   setProgramId,
   setUserIdentity,
-  userIdentityFromJwt
+  userIdentityFromJwt,
+  validateLocale
 });

package/dist/index.mjs

@@ -240,8 +240,8 @@ var MemoryHistory = class {
     if (typeof to === "string") {
       this.history[this.index] = {
         pathname: to,
-        search: this.history[this.index].search,
-        hash: this.history[this.index].hash,
+        search: "",
+        hash: "",
         state
       };
     } else {
@@ -311,14 +311,20 @@ import { ContextListener } from "dom-context";
 // src/contexts/LocaleContext.ts
 import { ContextProvider } from "dom-context";
 var debug3 = (...args) => debug(LOCALE_CONTEXT_NAME, ...args);
+function validateLocale(locale) {
+  if (locale && /^[a-z]{2}_(?:[A-Z]{2}|[0-9]{3})$/.test(locale)) {
+    return locale;
+  }
+}
 function lazilyStartLocaleContext() {
   var _a;
   let globalProvider = window.squatchLocale;
   if (!globalProvider) {
     debug3("Creating locale context provider");
+    const locale = ((_a = window.widgetIdent) == null ? void 0 : _a.locale) ?? validateLocale(navigator.language.replace("-", "_"));
     globalProvider = new ContextProvider({
       element: document.documentElement,
-      initialState: ((_a = window.widgetIdent) == null ? void 0 : _a.locale) || navigator.language.replace("-", "_"),
+      initialState: locale,
       contextName: LOCALE_CONTEXT_NAME
     }).start();
     window.squatchLocale = globalProvider;
@@ -546,7 +552,7 @@ function setProgramId(programId) {
 }
 function getProgramId() {
   var _a;
-  return (_a = window.squatchLocale) == null ? void 0 : _a.context;
+  return (_a = window.squatchProgramId) == null ? void 0 : _a.context;
 }
 export {
   BrowserHistory,
@@ -572,5 +578,6 @@ export {
   setLocale,
   setProgramId,
   setUserIdentity,
-  userIdentityFromJwt
+  userIdentityFromJwt,
+  validateLocale
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saasquatch/component-environment",
-  "version": "1.0.0-5",
+  "version": "1.0.1-1",
   "description": "Environment and contexts for SaaSquatch components",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -9,7 +9,7 @@
   ],
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest"
   },
   "engines": {
     "node": ">=16.15"
@@ -22,6 +22,11 @@
   "author": "Johan Venter <johan@saasquatch.com>",
   "license": "ISC",
   "devDependencies": {
+    "@types/jest": "^28.1.4",
+    "jest": "^28.1.2",
+    "jest-environment-jsdom": "^28.1.2",
+    "ts-jest": "^28.0.5",
+    "ts-node": "^10.8.2",
     "tsup": "^6.1.2",
     "typescript": "^4.7.3"
   },