@dintero/checkout-web-sdk 0.12.11 → 0.12.13

package/dist/declarations/src/index.d.ts

@@ -19,7 +19,7 @@ export interface DinteroCheckoutInstance {
         handler: SubscriptionHandler;
         eventTypes: InternalCheckoutEvents[];
     } | {
-        handler: SubscriptionHandler;
+        handler: SubscriptionHandler | undefined;
         eventTypes: CheckoutEvents[];
     })[];
     session: Session | undefined;

package/dist/declarations/src/subscribe.d.ts

@@ -10,7 +10,7 @@ interface SubscriptionOptions {
     handler: SubscriptionHandler;
     eventTypes: (CheckoutEvents | InternalCheckoutEvents)[];
     checkout: DinteroCheckoutInstance;
-    source: Window;
+    source: Window | null;
 }
 export type Subscription = {
     /**

package/dist/dintero-checkout-web-sdk.cjs.dev.js

@@ -6,7 +6,7 @@ require('native-promise-only');
 
 var pkg = {
 	name: "@dintero/checkout-web-sdk",
-	version: "0.12.11",
+	version: "0.12.13",
 	description: "Dintero Checkout SDK for web frontends",
 	main: "dist/dintero-checkout-web-sdk.cjs.js",
 	module: "dist/dintero-checkout-web-sdk.esm.js",
@@ -40,15 +40,15 @@ var pkg = {
 	devDependencies: {
 		"@babel/core": "7.29.0",
 		"@babel/preset-typescript": "7.28.5",
-		"@biomejs/biome": "2.4.10",
+		"@biomejs/biome": "2.4.13",
 		"@preconstruct/cli": "2.8.12",
 		"@semantic-release/exec": "7.1.0",
 		"@semantic-release/git": "10.0.1",
-		"@vitest/browser": "4.1.2",
+		"@vitest/browser": "4.1.5",
 		"@vitest/browser-webdriverio": "^4.0.4",
 		"semantic-release": "25.0.3",
-		typescript: "5.9.3",
-		vitest: "4.1.2",
+		typescript: "6.0.3",
+		vitest: "4.1.5",
 		webdriverio: "9.27.0"
 	},
 	dependencies: {
@@ -88,7 +88,7 @@ let InternalCheckoutEvents = /*#__PURE__*/function (InternalCheckoutEvents) {
  * Rejects the promise if there is a problem loading the iframe.
  */
 const createIframeAsync = (container, url) => {
-  if (!container || !container.appendChild) {
+  if (!container?.appendChild) {
     throw new Error("Invalid container");
   }
   const iframe = document.createElement("iframe");
@@ -240,8 +240,8 @@ const hostnameIsTop = () => {
       return true;
     }
     const hostname = getHostname();
-    const topHostname = window.top.location.hostname;
-    return topHostname && hostname && hostname === topHostname;
+    const topHostname = window.top?.location.hostname;
+    return Boolean(topHostname && hostname && hostname === topHostname);
   } catch (_) {
     return false;
   }
@@ -276,7 +276,7 @@ const createPopOutWindow = (sid, url, width, height) => {
       };
       window.addEventListener("message", handleAppLoaded);
       // Open pop out
-      popOut = window.open(url, "dintero-checkout", features);
+      popOut = window.open(url, "dintero-checkout", features) ?? undefined;
       // Check that pop out was opened
       if (!popOut) {
         console.log("createPopOutWindow no popOut");
@@ -299,7 +299,11 @@ const openPopOut = async options => {
   let popOutWindow;
   if (popOutWindow && !popOutWindow.closed) {
     // Skip if already open.
-    return;
+    return {
+      close: () => {},
+      focus: () => {},
+      popOutWindow: undefined
+    };
   }
 
   // Open popup window
@@ -339,7 +343,9 @@ const openPopOut = async options => {
   intervalId = window.setInterval(checkIfPopupClosed, 200);
 
   // Set up pub/sub of messages from pop out to SDK
-  unsubscribe = options.onOpen(popOutWindow);
+  if (popOutWindow) {
+    unsubscribe = options.onOpen(popOutWindow);
+  }
   return {
     close: closePopOut,
     focus: focusPopOut,
@@ -395,7 +401,7 @@ const getBackdropZIndex = () => {
   const elements = document.getElementsByTagName("*");
   const highest = Array.from(elements).reduce((acc, element) => {
     try {
-      const zIndexStr = document.defaultView.getComputedStyle(element, null).getPropertyValue("z-index");
+      const zIndexStr = document.defaultView?.getComputedStyle(element, null).getPropertyValue("z-index");
       const zIndex = Number.parseInt(zIndexStr || "0", 10);
       if (!Number.isNaN(zIndex) && zIndex > acc) {
         return zIndex;
@@ -614,11 +620,11 @@ const focusTrap = e => {
   const closeButton = document.getElementById(CLOSE_BACKDROP_BUTTON_ID);
   if (e.key === "Tab" || e.code === "Tab") {
     if (document.activeElement === focusButton) {
-      closeButton.focus();
+      closeButton?.focus();
       e.preventDefault();
     } else {
       // Tab
-      focusButton.focus();
+      focusButton?.focus();
       e.preventDefault();
     }
   }
@@ -746,6 +752,8 @@ const configureButton = (button, {
     ...directStyles
   } = styles;
   for (const [key, value] of Object.entries(directStyles)) {
+    // TODO: CSSStyleDeclaration lost its string index signature in TS6;
+    // styles from checkout are camelCase property names sent at runtime.
     button.style[key] = value;
   }
 
@@ -1068,6 +1076,7 @@ const createPopOutMessageHandler = (source, checkout) => {
   const popOutChangedLanguageHandler = {
     internalPopOutHandler: true,
     eventTypes: [InternalCheckoutEvents.LanguageChanged],
+    // biome-ignore lint/suspicious/noExplicitAny: internal LanguageChanged event, not part of SessionEvent
     handler: (eventData, checkout) => {
       // Tell the embedded checkout to change language.
       postSetLanguage(checkout.iframe, checkout.options.sid, eventData.language);
@@ -1079,6 +1088,7 @@ const createPopOutMessageHandler = (source, checkout) => {
   const popOutCompletedHandler = {
     internalPopOutHandler: true,
     eventTypes: paymentCompletedEvents,
+    // biome-ignore lint/suspicious/noExplicitAny: href is not present on all SessionEvent subtypes
     handler: (eventData, _checkout) => {
       if (eventData.href) {
         // Remove open pop out button rendered by SDK
@@ -1108,8 +1118,11 @@ const createPopOutMessageHandler = (source, checkout) => {
       ...checkout.handlers]) {
         if (handlerObject.eventTypes.includes(event.data.type) && handlerObject.handler) {
           // Invoking the handler function if the event type matches the handler.
+          const {
+            handler
+          } = handlerObject;
           safelyInvoke(() => {
-            handlerObject.handler(event.data, checkout);
+            handler(event.data, checkout);
           });
         }
       }
@@ -1128,13 +1141,9 @@ const createPopOutMessageHandler = (source, checkout) => {
  * Configures and shows the pop out with the payment options.
  */
 const showPopOut = async (event, checkout) => {
-  const {
-    close,
-    focus,
-    popOutWindow
-  } = await popOutModule.openPopOut({
+  const openPopOutResult = await popOutModule.openPopOut({
     sid: checkout.options.sid,
-    endpoint: checkout.options.endpoint,
+    endpoint: checkout.options.endpoint ?? "https://checkout.dintero.com",
     shouldCallValidateSession: Boolean(checkout.options.onValidateSession),
     shouldCallAddressCallback: false,
     // handled by embedded checkout not the pop out window
@@ -1147,6 +1156,11 @@ const showPopOut = async (event, checkout) => {
       checkout.popOutWindow = undefined;
     }
   });
+  const {
+    close,
+    focus,
+    popOutWindow
+  } = openPopOutResult;
   if (popOutWindow) {
     postOpenPopOutEvent(checkout.iframe, checkout.options.sid);
     // Add pop out window to checkout instance
@@ -1177,7 +1191,7 @@ const createPopOutValidationCallback = (event, checkout) => {
       // Redirect user to session in pop out window
       checkout.popOutWindow.location.href = url.getPopOutUrl({
         sid: checkout.options.sid,
-        endpoint: checkout.options.endpoint,
+        endpoint: checkout.options.endpoint ?? "https://checkout.dintero.com",
         shouldCallValidateSession: false,
         shouldCallAddressCallback: false,
         language: event.language
@@ -1212,6 +1226,8 @@ const handlePopOutButtonClick = async (event, checkout) => {
     try {
       checkout.options.onValidateSession({
         type: CheckoutEvents.ValidateSession,
+        // TODO: session may be undefined before SessionLoaded fires;
+        // ValidateSession.session is typed as Session (non-optional).
         session: checkout.session,
         callback
       }, checkout, callback);
@@ -1229,7 +1245,7 @@ const handlePopOutButtonClick = async (event, checkout) => {
  * Type guard for ShowPopOutButton
  */
 const isShowPopOutButton = event => {
-  return event && event.type === InternalCheckoutEvents.ShowPopOutButton;
+  return typeof event === "object" && event !== null && event.type === InternalCheckoutEvents.ShowPopOutButton;
 };
 
 /**
@@ -1291,7 +1307,7 @@ const embed = async options => {
   // Create inner container to offset any styling on the container.
   const innerContainer = document.createElement("div");
   innerContainer.style.position = "relative";
-  innerContainer.style["box-sizing"] = "border-box";
+  innerContainer.style.boxSizing = "border-box";
   const internalOptions = {
     endpoint: "https://checkout.dintero.com",
     innerContainer: innerContainer,
@@ -1342,7 +1358,9 @@ const embed = async options => {
    * Function that removes the iframe, pop out and all event listeners.
    */
   const destroy = () => {
-    cleanUpPopOut(checkout);
+    if (checkout) {
+      cleanUpPopOut(checkout);
+    }
     if (iframe) {
       if (internalOptions.popOut) {
         // Try to remove backdrop if it exists
@@ -1368,6 +1386,7 @@ const embed = async options => {
     if (!checkout) {
       throw new Error("Unable to create action promise: checkout is undefined");
     }
+    const checkoutInstance = checkout;
     return new Promise((resolve, reject) => {
       const eventSubscriptions = [];
       eventSubscriptions.push(subscribe({
@@ -1380,8 +1399,8 @@ const embed = async options => {
           resolve(sessionEvent);
         },
         eventTypes: [resolveEvent],
-        checkout,
-        source: checkout.iframe.contentWindow
+        checkout: checkoutInstance,
+        source: checkoutInstance.iframe.contentWindow
       }));
       eventSubscriptions.push(subscribe({
         sid,
@@ -1393,8 +1412,8 @@ const embed = async options => {
           reject(`Received unexpected event: ${rejectEvent}`);
         },
         eventTypes: [rejectEvent],
-        checkout,
-        source: checkout.iframe.contentWindow
+        checkout: checkoutInstance,
+        source: checkoutInstance.iframe.contentWindow
       }));
       action();
     });
@@ -1434,6 +1453,7 @@ const embed = async options => {
    *  If no custom handler is set the followHref handler is used instead.
    */
   const handleWithResult = (_sid, endpoint, handler) => {
+    // biome-ignore lint/suspicious/noExplicitAny: requires dynamic key access on event payload
     return (event, checkout) => {
       if (!has_delivered_final_event) {
         has_delivered_final_event = true;
@@ -1514,15 +1534,17 @@ const embed = async options => {
     eventTypes: [CheckoutEvents.SessionLoaded, CheckoutEvents.SessionUpdated]
   }, {
     eventTypes: [CheckoutEvents.SessionPaymentOnHold],
-    handler: handleWithResult(sid, endpoint, onPayment || followHref)
+    // TODO: user callbacks have narrower event param types than SubscriptionHandler;
+    // casts are safe because handleWithResult only invokes them with the matching event type.
+    handler: handleWithResult(sid, endpoint, onPayment ?? followHref)
   }, {
     eventTypes: [CheckoutEvents.SessionPaymentAuthorized],
-    handler: handleWithResult(sid, endpoint, onPaymentAuthorized || onPayment || followHref)
+    handler: handleWithResult(sid, endpoint, onPaymentAuthorized ?? onPayment ?? followHref)
   }, {
-    handler: handleWithResult(sid, endpoint, onSessionCancel || followHref),
+    handler: handleWithResult(sid, endpoint, onSessionCancel ?? followHref),
     eventTypes: [CheckoutEvents.SessionCancel]
   }, {
-    handler: handleWithResult(sid, endpoint, onPaymentError || followHref),
+    handler: handleWithResult(sid, endpoint, onPaymentError ?? followHref),
     eventTypes: [CheckoutEvents.SessionPaymentError]
   }, {
     handler: onSessionNotFound,
@@ -1553,7 +1575,7 @@ const embed = async options => {
   checkout = {
     destroy,
     iframe,
-    language,
+    language: language ?? "",
     lockSession,
     refreshSession,
     setActivePaymentProductType,
@@ -1564,6 +1586,7 @@ const embed = async options => {
     session: undefined,
     popOutWindow: undefined
   };
+  const checkoutInstance = checkout;
   for (const {
     handler,
     eventTypes
@@ -1574,8 +1597,8 @@ const embed = async options => {
         endpoint,
         handler,
         eventTypes,
-        checkout,
-        source: checkout.iframe.contentWindow
+        checkout: checkoutInstance,
+        source: checkoutInstance.iframe.contentWindow
       }));
     }
   }
@@ -1583,7 +1606,7 @@ const embed = async options => {
   // Add iframe to DOM
   await initiate();
   // Return object with function to destroy the checkout.
-  return checkout;
+  return checkoutInstance;
 };
 
 /**

package/dist/dintero-checkout-web-sdk.cjs.prod.js

@@ -6,7 +6,7 @@ require('native-promise-only');
 
 var pkg = {
 	name: "@dintero/checkout-web-sdk",
-	version: "0.12.11",
+	version: "0.12.13",
 	description: "Dintero Checkout SDK for web frontends",
 	main: "dist/dintero-checkout-web-sdk.cjs.js",
 	module: "dist/dintero-checkout-web-sdk.esm.js",
@@ -40,15 +40,15 @@ var pkg = {
 	devDependencies: {
 		"@babel/core": "7.29.0",
 		"@babel/preset-typescript": "7.28.5",
-		"@biomejs/biome": "2.4.10",
+		"@biomejs/biome": "2.4.13",
 		"@preconstruct/cli": "2.8.12",
 		"@semantic-release/exec": "7.1.0",
 		"@semantic-release/git": "10.0.1",
-		"@vitest/browser": "4.1.2",
+		"@vitest/browser": "4.1.5",
 		"@vitest/browser-webdriverio": "^4.0.4",
 		"semantic-release": "25.0.3",
-		typescript: "5.9.3",
-		vitest: "4.1.2",
+		typescript: "6.0.3",
+		vitest: "4.1.5",
 		webdriverio: "9.27.0"
 	},
 	dependencies: {
@@ -88,7 +88,7 @@ let InternalCheckoutEvents = /*#__PURE__*/function (InternalCheckoutEvents) {
  * Rejects the promise if there is a problem loading the iframe.
  */
 const createIframeAsync = (container, url) => {
-  if (!container || !container.appendChild) {
+  if (!container?.appendChild) {
     throw new Error("Invalid container");
   }
   const iframe = document.createElement("iframe");
@@ -240,8 +240,8 @@ const hostnameIsTop = () => {
       return true;
     }
     const hostname = getHostname();
-    const topHostname = window.top.location.hostname;
-    return topHostname && hostname && hostname === topHostname;
+    const topHostname = window.top?.location.hostname;
+    return Boolean(topHostname && hostname && hostname === topHostname);
   } catch (_) {
     return false;
   }
@@ -276,7 +276,7 @@ const createPopOutWindow = (sid, url, width, height) => {
       };
       window.addEventListener("message", handleAppLoaded);
       // Open pop out
-      popOut = window.open(url, "dintero-checkout", features);
+      popOut = window.open(url, "dintero-checkout", features) ?? undefined;
       // Check that pop out was opened
       if (!popOut) {
         console.log("createPopOutWindow no popOut");
@@ -299,7 +299,11 @@ const openPopOut = async options => {
   let popOutWindow;
   if (popOutWindow && !popOutWindow.closed) {
     // Skip if already open.
-    return;
+    return {
+      close: () => {},
+      focus: () => {},
+      popOutWindow: undefined
+    };
   }
 
   // Open popup window
@@ -339,7 +343,9 @@ const openPopOut = async options => {
   intervalId = window.setInterval(checkIfPopupClosed, 200);
 
   // Set up pub/sub of messages from pop out to SDK
-  unsubscribe = options.onOpen(popOutWindow);
+  if (popOutWindow) {
+    unsubscribe = options.onOpen(popOutWindow);
+  }
   return {
     close: closePopOut,
     focus: focusPopOut,
@@ -395,7 +401,7 @@ const getBackdropZIndex = () => {
   const elements = document.getElementsByTagName("*");
   const highest = Array.from(elements).reduce((acc, element) => {
     try {
-      const zIndexStr = document.defaultView.getComputedStyle(element, null).getPropertyValue("z-index");
+      const zIndexStr = document.defaultView?.getComputedStyle(element, null).getPropertyValue("z-index");
       const zIndex = Number.parseInt(zIndexStr || "0", 10);
       if (!Number.isNaN(zIndex) && zIndex > acc) {
         return zIndex;
@@ -614,11 +620,11 @@ const focusTrap = e => {
   const closeButton = document.getElementById(CLOSE_BACKDROP_BUTTON_ID);
   if (e.key === "Tab" || e.code === "Tab") {
     if (document.activeElement === focusButton) {
-      closeButton.focus();
+      closeButton?.focus();
       e.preventDefault();
     } else {
       // Tab
-      focusButton.focus();
+      focusButton?.focus();
       e.preventDefault();
     }
   }
@@ -746,6 +752,8 @@ const configureButton = (button, {
     ...directStyles
   } = styles;
   for (const [key, value] of Object.entries(directStyles)) {
+    // TODO: CSSStyleDeclaration lost its string index signature in TS6;
+    // styles from checkout are camelCase property names sent at runtime.
     button.style[key] = value;
   }
 
@@ -1068,6 +1076,7 @@ const createPopOutMessageHandler = (source, checkout) => {
   const popOutChangedLanguageHandler = {
     internalPopOutHandler: true,
     eventTypes: [InternalCheckoutEvents.LanguageChanged],
+    // biome-ignore lint/suspicious/noExplicitAny: internal LanguageChanged event, not part of SessionEvent
     handler: (eventData, checkout) => {
       // Tell the embedded checkout to change language.
       postSetLanguage(checkout.iframe, checkout.options.sid, eventData.language);
@@ -1079,6 +1088,7 @@ const createPopOutMessageHandler = (source, checkout) => {
   const popOutCompletedHandler = {
     internalPopOutHandler: true,
     eventTypes: paymentCompletedEvents,
+    // biome-ignore lint/suspicious/noExplicitAny: href is not present on all SessionEvent subtypes
     handler: (eventData, _checkout) => {
       if (eventData.href) {
         // Remove open pop out button rendered by SDK
@@ -1108,8 +1118,11 @@ const createPopOutMessageHandler = (source, checkout) => {
       ...checkout.handlers]) {
         if (handlerObject.eventTypes.includes(event.data.type) && handlerObject.handler) {
           // Invoking the handler function if the event type matches the handler.
+          const {
+            handler
+          } = handlerObject;
           safelyInvoke(() => {
-            handlerObject.handler(event.data, checkout);
+            handler(event.data, checkout);
           });
         }
       }
@@ -1128,13 +1141,9 @@ const createPopOutMessageHandler = (source, checkout) => {
  * Configures and shows the pop out with the payment options.
  */
 const showPopOut = async (event, checkout) => {
-  const {
-    close,
-    focus,
-    popOutWindow
-  } = await popOutModule.openPopOut({
+  const openPopOutResult = await popOutModule.openPopOut({
     sid: checkout.options.sid,
-    endpoint: checkout.options.endpoint,
+    endpoint: checkout.options.endpoint ?? "https://checkout.dintero.com",
     shouldCallValidateSession: Boolean(checkout.options.onValidateSession),
     shouldCallAddressCallback: false,
     // handled by embedded checkout not the pop out window
@@ -1147,6 +1156,11 @@ const showPopOut = async (event, checkout) => {
       checkout.popOutWindow = undefined;
     }
   });
+  const {
+    close,
+    focus,
+    popOutWindow
+  } = openPopOutResult;
   if (popOutWindow) {
     postOpenPopOutEvent(checkout.iframe, checkout.options.sid);
     // Add pop out window to checkout instance
@@ -1177,7 +1191,7 @@ const createPopOutValidationCallback = (event, checkout) => {
       // Redirect user to session in pop out window
       checkout.popOutWindow.location.href = url.getPopOutUrl({
         sid: checkout.options.sid,
-        endpoint: checkout.options.endpoint,
+        endpoint: checkout.options.endpoint ?? "https://checkout.dintero.com",
         shouldCallValidateSession: false,
         shouldCallAddressCallback: false,
         language: event.language
@@ -1212,6 +1226,8 @@ const handlePopOutButtonClick = async (event, checkout) => {
     try {
       checkout.options.onValidateSession({
         type: CheckoutEvents.ValidateSession,
+        // TODO: session may be undefined before SessionLoaded fires;
+        // ValidateSession.session is typed as Session (non-optional).
         session: checkout.session,
         callback
       }, checkout, callback);
@@ -1229,7 +1245,7 @@ const handlePopOutButtonClick = async (event, checkout) => {
  * Type guard for ShowPopOutButton
  */
 const isShowPopOutButton = event => {
-  return event && event.type === InternalCheckoutEvents.ShowPopOutButton;
+  return typeof event === "object" && event !== null && event.type === InternalCheckoutEvents.ShowPopOutButton;
 };
 
 /**
@@ -1291,7 +1307,7 @@ const embed = async options => {
   // Create inner container to offset any styling on the container.
   const innerContainer = document.createElement("div");
   innerContainer.style.position = "relative";
-  innerContainer.style["box-sizing"] = "border-box";
+  innerContainer.style.boxSizing = "border-box";
   const internalOptions = {
     endpoint: "https://checkout.dintero.com",
     innerContainer: innerContainer,
@@ -1342,7 +1358,9 @@ const embed = async options => {
    * Function that removes the iframe, pop out and all event listeners.
    */
   const destroy = () => {
-    cleanUpPopOut(checkout);
+    if (checkout) {
+      cleanUpPopOut(checkout);
+    }
     if (iframe) {
       if (internalOptions.popOut) {
         // Try to remove backdrop if it exists
@@ -1368,6 +1386,7 @@ const embed = async options => {
     if (!checkout) {
       throw new Error("Unable to create action promise: checkout is undefined");
     }
+    const checkoutInstance = checkout;
     return new Promise((resolve, reject) => {
       const eventSubscriptions = [];
       eventSubscriptions.push(subscribe({
@@ -1380,8 +1399,8 @@ const embed = async options => {
           resolve(sessionEvent);
         },
         eventTypes: [resolveEvent],
-        checkout,
-        source: checkout.iframe.contentWindow
+        checkout: checkoutInstance,
+        source: checkoutInstance.iframe.contentWindow
       }));
       eventSubscriptions.push(subscribe({
         sid,
@@ -1393,8 +1412,8 @@ const embed = async options => {
           reject(`Received unexpected event: ${rejectEvent}`);
         },
         eventTypes: [rejectEvent],
-        checkout,
-        source: checkout.iframe.contentWindow
+        checkout: checkoutInstance,
+        source: checkoutInstance.iframe.contentWindow
       }));
       action();
     });
@@ -1434,6 +1453,7 @@ const embed = async options => {
    *  If no custom handler is set the followHref handler is used instead.
    */
   const handleWithResult = (_sid, endpoint, handler) => {
+    // biome-ignore lint/suspicious/noExplicitAny: requires dynamic key access on event payload
     return (event, checkout) => {
       if (!has_delivered_final_event) {
         has_delivered_final_event = true;
@@ -1514,15 +1534,17 @@ const embed = async options => {
     eventTypes: [CheckoutEvents.SessionLoaded, CheckoutEvents.SessionUpdated]
   }, {
     eventTypes: [CheckoutEvents.SessionPaymentOnHold],
-    handler: handleWithResult(sid, endpoint, onPayment || followHref)
+    // TODO: user callbacks have narrower event param types than SubscriptionHandler;
+    // casts are safe because handleWithResult only invokes them with the matching event type.
+    handler: handleWithResult(sid, endpoint, onPayment ?? followHref)
   }, {
     eventTypes: [CheckoutEvents.SessionPaymentAuthorized],
-    handler: handleWithResult(sid, endpoint, onPaymentAuthorized || onPayment || followHref)
+    handler: handleWithResult(sid, endpoint, onPaymentAuthorized ?? onPayment ?? followHref)
   }, {
-    handler: handleWithResult(sid, endpoint, onSessionCancel || followHref),
+    handler: handleWithResult(sid, endpoint, onSessionCancel ?? followHref),
     eventTypes: [CheckoutEvents.SessionCancel]
   }, {
-    handler: handleWithResult(sid, endpoint, onPaymentError || followHref),
+    handler: handleWithResult(sid, endpoint, onPaymentError ?? followHref),
     eventTypes: [CheckoutEvents.SessionPaymentError]
   }, {
     handler: onSessionNotFound,
@@ -1553,7 +1575,7 @@ const embed = async options => {
   checkout = {
     destroy,
     iframe,
-    language,
+    language: language ?? "",
     lockSession,
     refreshSession,
     setActivePaymentProductType,
@@ -1564,6 +1586,7 @@ const embed = async options => {
     session: undefined,
     popOutWindow: undefined
   };
+  const checkoutInstance = checkout;
   for (const {
     handler,
     eventTypes
@@ -1574,8 +1597,8 @@ const embed = async options => {
         endpoint,
         handler,
         eventTypes,
-        checkout,
-        source: checkout.iframe.contentWindow
+        checkout: checkoutInstance,
+        source: checkoutInstance.iframe.contentWindow
       }));
     }
   }
@@ -1583,7 +1606,7 @@ const embed = async options => {
   // Add iframe to DOM
   await initiate();
   // Return object with function to destroy the checkout.
-  return checkout;
+  return checkoutInstance;
 };
 
 /**