@shopify/hydrogen 2023.7.10 → 2023.7.12

package/dist/development/index.cjs

@@ -424,14 +424,13 @@ async function fetchWithServerCache(url, requestInit, {
     }
   ).then(fromSerializableResponse);
 }
-var getCallerStackLine = () => {
-  const stackInfo = { stack: "" };
-  Error.captureStackTrace(stackInfo);
-  return stackInfo.stack.split("\n").slice(3, 4).join("\n") || "";
-} ;
 
 // src/constants.ts
 var STOREFRONT_REQUEST_GROUP_ID_HEADER = "Custom-Storefront-Request-Group-ID";
+var STOREFRONT_ACCESS_TOKEN_HEADER = "X-Shopify-Storefront-Access-Token";
+var SDK_VARIANT_HEADER = "X-SDK-Variant";
+var SDK_VARIANT_SOURCE_HEADER = "X-SDK-Variant-Source";
+var SDK_VERSION_HEADER = "X-SDK-Version";
 
 // src/utils/uuid.ts
 function generateUUID() {
@@ -452,7 +451,7 @@ var warnOnce = (string) => {
 };
 
 // src/version.ts
-var LIB_VERSION = "2023.7.10";
+var LIB_VERSION = "2023.7.12";
 
 // src/storefront.ts
 var StorefrontApiError = class extends Error {
@@ -514,8 +513,7 @@ function createStorefrontClient(options) {
     variables,
     cache: cacheOptions,
     headers = [],
-    storefrontApiVersion,
-    stackLine
+    storefrontApiVersion
   }) {
     const userHeaders = headers instanceof Headers ? Object.fromEntries(headers.entries()) : Array.isArray(headers) ? Object.fromEntries(headers) : headers;
     query = query ?? mutation;
@@ -541,11 +539,11 @@ function createStorefrontClient(options) {
         method: requestInit.method,
         headers: {
           "content-type": defaultHeaders["content-type"],
-          "X-SDK-Variant": defaultHeaders["X-SDK-Variant"],
-          "X-SDK-Variant-Source": defaultHeaders["X-SDK-Variant-Source"],
-          "X-SDK-Version": defaultHeaders["X-SDK-Version"],
-          "X-Shopify-Storefront-Access-Token": defaultHeaders["X-Shopify-Storefront-Access-Token"],
-          "user-agent": defaultHeaders["user-agent"]
+          "user-agent": defaultHeaders["user-agent"],
+          [SDK_VARIANT_HEADER]: defaultHeaders[SDK_VARIANT_HEADER],
+          [SDK_VARIANT_SOURCE_HEADER]: defaultHeaders[SDK_VARIANT_SOURCE_HEADER],
+          [SDK_VERSION_HEADER]: defaultHeaders[SDK_VERSION_HEADER],
+          [STOREFRONT_ACCESS_TOKEN_HEADER]: defaultHeaders[STOREFRONT_ACCESS_TOKEN_HEADER]
         },
         body: requestInit.body
       }
@@ -556,7 +554,11 @@ function createStorefrontClient(options) {
       cacheKey,
       shouldCacheResponse: checkGraphQLErrors,
       waitUntil,
-      debugInfo: { stackLine, graphql: graphqlData }
+      debugInfo: {
+        graphql: graphqlData,
+        requestId: requestInit.headers[STOREFRONT_REQUEST_GROUP_ID_HEADER],
+        purpose: storefrontHeaders?.purpose
+      }
     });
     const errorOptions = {
       response,
@@ -609,8 +611,7 @@ function createStorefrontClient(options) {
         }
         const result = fetchStorefrontApi({
           ...payload,
-          query,
-          stackLine: getCallerStackLine?.()
+          query
         });
         result.catch(() => {
         });
@@ -638,8 +639,7 @@ function createStorefrontClient(options) {
         }
         const result = fetchStorefrontApi({
           ...payload,
-          mutation,
-          stackLine: getCallerStackLine?.()
+          mutation
         });
         result.catch(() => {
         });
@@ -706,17 +706,30 @@ function throwError({
   );
 }
 
+// src/utils/request.ts
+function getHeader(request, key) {
+  const value = request.headers?.get?.(key) ?? request.headers?.[key];
+  return typeof value === "string" ? value : null;
+}
+function getDebugHeaders(request) {
+  return request ? {
+    requestId: getHeader(request, "request-id"),
+    purpose: getHeader(request, "purpose")
+  } : {};
+}
+
 // src/with-cache.ts
-function createWithCache(options) {
-  const { cache, waitUntil } = options;
+function createWithCache({
+  cache,
+  waitUntil,
+  request
+}) {
   return function withCache(cacheKey, strategy, actionFn) {
     return runWithCache(cacheKey, actionFn, {
       strategy,
       cacheInstance: cache,
       waitUntil,
-      debugInfo: {
-        stackLine: getCallerStackLine?.()
-      }
+      debugInfo: getDebugHeaders(request)
     });
   };
 }
@@ -2549,6 +2562,7 @@ exports.OptimisticInput = OptimisticInput;
 exports.Pagination = Pagination;
 exports.Script = Script;
 exports.Seo = Seo;
+exports.StorefrontApiError = StorefrontApiError;
 exports.VariantSelector = VariantSelector;
 exports.cartAttributesUpdateDefault = cartAttributesUpdateDefault;
 exports.cartBuyerIdentityUpdateDefault = cartBuyerIdentityUpdateDefault;