@pack/hydrogen 3.2.3 → 3.2.5

package/dist/index.js

@@ -6009,28 +6009,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 +6237,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 +6272,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 +6288,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 +6331,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 +6346,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
@@ -6382,7 +6374,9 @@ function createPackClient(options) {
           queryVariables.language = i18n.language;
           queryVariables.country = i18n.country;
         }
-        if (packClient && token && !testInfoForRequest && currentRequest) {
+        const explicitTest = testFromQueryParams || test;
+        const resolveTestInfo = !previewEnabled && !explicitTest;
+        if (resolveTestInfo && packClient && token && !testInfoForRequest && currentRequest) {
           try {
             if (!testInfoPromise) {
               debug4(
@@ -6415,20 +6409,19 @@ function createPackClient(options) {
             testInfoForRequest = void 0;
             testInfoPromise = void 0;
           }
-        } else if (packClient && token && testInfoForRequest) {
+        } else if (resolveTestInfo && packClient && token && testInfoForRequest) {
           debug4("[Pack Test] Using cached testInfo - subsequent query");
           if (process.env.NODE_ENV === "development") {
             console.log("[Pack Test] Using cached testInfo - subsequent query");
           }
         }
-        if (testInfoForRequest?.isFirstExposure) {
+        if (resolveTestInfo && testInfoForRequest?.isFirstExposure) {
           const { isFirstExposure: _isFirstExposure, ...testInfo } = testInfoForRequest;
           testInfoForLoader = testInfo;
         }
         headers = setTestHeaders(headers, {
-          previewEnabled,
           testInfoForRequest,
-          testFromQueryParams: testFromQueryParams || test
+          testFromQueryParams: explicitTest
         });
         if (previewEnabled) {
           try {