@pack/hydrogen 3.2.4 → 3.2.6

package/dist/index.js

@@ -5811,71 +5811,62 @@ async function getTestInfo({
   );
   if (testSessionData?.id && testSessionData?.testVariant) {
     debug3("[Pack Test] Found existing test data in session");
-    if (!testSessionExpireAt || new Date(testSessionExpireAt) >= /* @__PURE__ */ new Date()) {
-      debug3(
-        "[Pack Test] Test session not expired by time, fetching rules to validate if test is still active"
+    try {
+      const validationResult = await packClientFetchTestByRules(
+        packClient,
+        testTargetAudienceAttributes,
+        testSession,
+        request,
+        withCache,
+        token,
+        null,
+        true
+        // validateOnly - but will assign new test if current is inactive
       );
-      try {
-        const validationResult = await packClientFetchTestByRules(
-          packClient,
-          testTargetAudienceAttributes,
-          testSession,
-          request,
-          withCache,
-          token,
-          null,
-          true
-          // validateOnly - but will assign new test if current is inactive
-        );
-        if (validationResult) {
-          if (validationResult.id === testSessionData.id) {
-            debug3(
-              "[Pack Test] Test is still active, using refreshed data",
-              JSON.stringify({
-                testId: validationResult.id,
-                testHandle: validationResult.handle,
-                variantId: validationResult.testVariant.id,
-                variantHandle: validationResult.testVariant.handle
-              })
-            );
-            return validationResult;
-          } else {
-            debug3(
-              "[Pack Test] Original test no longer active, new test assigned",
-              JSON.stringify({
-                oldTestId: testSessionData.id,
-                newTestId: validationResult.id,
-                newTestHandle: validationResult.handle,
-                newVariantId: validationResult.testVariant.id,
-                newVariantHandle: validationResult.testVariant.handle
-              })
-            );
-            return {
-              ...validationResult,
-              isFirstExposure: true
-            };
-          }
+      if (validationResult) {
+        if (validationResult.id === testSessionData.id) {
+          debug3(
+            "[Pack Test] Test is still active, using refreshed data",
+            JSON.stringify({
+              testId: validationResult.id,
+              testHandle: validationResult.handle,
+              variantId: validationResult.testVariant.id,
+              variantHandle: validationResult.testVariant.handle
+            })
+          );
+          return validationResult;
         } else {
           debug3(
-            "[Pack Test] Test is no longer active and no new test was assigned"
+            "[Pack Test] Original test no longer active, new test assigned",
+            JSON.stringify({
+              oldTestId: testSessionData.id,
+              newTestId: validationResult.id,
+              newTestHandle: validationResult.handle,
+              newVariantId: validationResult.testVariant.id,
+              newVariantHandle: validationResult.testVariant.handle
+            })
           );
-          return void 0;
+          return {
+            ...validationResult,
+            isFirstExposure: true
+          };
         }
-      } catch (error) {
+      } else {
         debug3(
-          "[Pack Test] Error validating test, using cached data:",
-          JSON.stringify(error)
-        );
-        console.error(
-          "[Pack Test] Error validating test, using cached data:",
-          error
+          "[Pack Test] Test is no longer active and no new test was assigned"
         );
-        return { ...testSessionData, isFirstExposure: void 0 };
+        return void 0;
       }
-    } else {
-      debug3("[Pack Test] Test session has expired by time");
-      debug3("[Pack Test] Clearing expired test session data");
-      testSession.clearTestData();
+    } catch (error) {
+      debug3(
+        "[Pack Test] Error validating test, using cached data:",
+        JSON.stringify(error)
+      );
+      console.error(
+        "[Pack Test] Error validating test, using cached data:",
+        error
+      );
+      return { ...testSessionData, isFirstExposure: void 0 };
     }
   }
   if (exposedTestCookieString) {
@@ -6009,28 +6000,33 @@ async function getTestInfo({
   );
   return testInfo;
 }
-function getTestSession(testSession, testFromQueryParams = null, previewEnabled = false) {
+function hasCompleteTestInput(testInput) {
+  if (!testInput) return false;
+  const hasTest = Boolean(testInput.testId || testInput.testHandle);
+  const hasVariant = Boolean(
+    testInput.testVariantId || testInput.testVariantHandle
+  );
+  return hasTest && hasVariant;
+}
+function getTestSession(testSession, explicitTest = null, previewEnabled = false) {
   debug3(
     "[Pack Test] Getting test session:",
     JSON.stringify({
       hasTestSession: !!testSession,
-      hasQueryParams: !!testFromQueryParams,
+      hasExplicitTest: hasCompleteTestInput(explicitTest),
       previewEnabled
     })
   );
-  if (testFromQueryParams) {
+  if (hasCompleteTestInput(explicitTest)) {
     const result = {
-      id: testFromQueryParams.testId || "",
-      handle: testFromQueryParams.testHandle || "",
+      id: explicitTest.testId || "",
+      handle: explicitTest.testHandle || "",
       testVariant: {
-        id: testFromQueryParams.testVariantId || "",
-        handle: testFromQueryParams.testVariantHandle || ""
+        id: explicitTest.testVariantId || "",
+        handle: explicitTest.testVariantHandle || ""
       }
     };
-    debug3(
-      "[Pack Test] Using test from query parameters:",
-      JSON.stringify(result)
-    );
+    debug3("[Pack Test] Using explicit test input:", JSON.stringify(result));
     return result;
   }
   if (previewEnabled) {
@@ -6232,6 +6228,9 @@ function createPackClient(options) {
   let testInfoPromise = void 0;
   let currentRequest = request;
   let testFromQueryParams = request ? getTestFromQueryParams(request) : null;
+  const testFromPreviewSession = previewEnabled && testHandle && testVariantHandle ? { testId: "", testHandle, testVariantId: "", testVariantHandle } : null;
+  const getExplicitTestForSession = () => hasCompleteTestInput(testFromQueryParams) ? testFromQueryParams : testFromPreviewSession;
+  const getCurrentAbTest = () => getTestSession(testSession, getExplicitTestForSession(), previewEnabled);
   if (!token && !defaultThemeData) {
     throw new Error(
       "ERR_HY_MISSING_TOKEN: The Pack client token is missing or empty. Please provide a valid token or default theme data. Doc: https://docs.packdigital.com/err/ERR_HY_MISSING_TOKEN"
@@ -6264,18 +6263,14 @@ function createPackClient(options) {
   if (!token) {
     return {
       get abTest() {
-        return getTestSession(testSession, testFromQueryParams, previewEnabled);
+        return getCurrentAbTest();
       },
       handleRequest: handleRequest2,
       getPackSessionData: () => {
         return {
           storeId,
           sessionId: session.id,
-          abTest: getTestSession(
-            testSession,
-            testFromQueryParams,
-            previewEnabled
-          ),
+          abTest: getCurrentAbTest(),
           isPreviewModeEnabled: previewEnabled,
           customizerMeta: session.get("customizerMeta")
         };
@@ -6284,11 +6279,7 @@ function createPackClient(options) {
         return {
           packStoreId: storeId,
           packSessionId: session.id,
-          packAbTest: getTestSession(
-            testSession,
-            testFromQueryParams,
-            previewEnabled
-          ),
+          packAbTest: getCurrentAbTest(),
           packIsPreviewMode: previewEnabled,
           packCustomizerMeta: session.get("customizerMeta"),
           packErrorTracking: errorTracking
@@ -6331,17 +6322,13 @@ function createPackClient(options) {
   });
   return {
     get abTest() {
-      return getTestSession(testSession, testFromQueryParams, previewEnabled);
+      return getCurrentAbTest();
     },
     getPackSessionData: () => {
       return {
         storeId,
         sessionId: session.id,
-        abTest: getTestSession(
-          testSession,
-          testFromQueryParams,
-          previewEnabled
-        ),
+        abTest: getCurrentAbTest(),
         isPreviewModeEnabled: previewEnabled,
         customizerMeta: session.get("customizerMeta")
       };
@@ -6350,11 +6337,7 @@ function createPackClient(options) {
       return {
         packStoreId: storeId,
         packSessionId: session.id,
-        packAbTest: getTestSession(
-          testSession,
-          testFromQueryParams,
-          previewEnabled
-        ),
+        packAbTest: getCurrentAbTest(),
         packIsPreviewMode: previewEnabled,
         packCustomizerMeta: session.get("customizerMeta"),
         packErrorTracking: errorTracking