@shopify/cli 3.72.2 → 3.73.1

package/dist/{chunk-HYGCZ6GV.js → chunk-HYVCBINV.js}

@@ -1,6 +1,6 @@
 import {
   platformAndArch
-} from "./chunk-UIAIRQSP.js";
+} from "./chunk-OFYEMT6X.js";
 import {
   ClientError,
   GraphQLClient,
@@ -20,7 +20,7 @@ import {
   sanitizedHeadersOutput,
   shopifyFetch,
   z
-} from "./chunk-VWNWE4HG.js";
+} from "./chunk-X5WKMCE4.js";
 import {
   cacheRetrieveOrRepopulate,
   getCachedPartnerAccountStatus,
@@ -30,7 +30,7 @@ import {
   removeSession,
   setCachedPartnerAccountStatus,
   setSession
-} from "./chunk-ZESD7DR7.js";
+} from "./chunk-I72O5WWR.js";
 import {
   AbortError,
   BugError,
@@ -63,16 +63,16 @@ import {
   stringifyMessage,
   themeKitAccessDomain,
   themeToken
-} from "./chunk-4HTVLK2H.js";
+} from "./chunk-OXS42VB7.js";
 import {
   cwd
-} from "./chunk-K6Y4FYT5.js";
+} from "./chunk-K7HGDAI4.js";
 import {
   __commonJS,
   __require,
   __toESM,
   init_cjs_shims
-} from "./chunk-POZ5MGPT.js";
+} from "./chunk-PKR7KJ6P.js";
 
 // ../../node_modules/.pnpm/network-interfaces@1.1.0/node_modules/network-interfaces/index.js
 var require_network_interfaces = __commonJS({
@@ -1535,15 +1535,13 @@ var require_IORedisConnection = __commonJS({
         try {
           !_n && _i.return != null && _i.return();
         } finally {
-          if (_d)
-            throw _e;
+          if (_d) throw _e;
         }
       }
       return _arr;
     }
     function _arrayWithHoles(arr) {
-      if (Array.isArray(arr))
-        return arr;
+      if (Array.isArray(arr)) return arr;
     }
     function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
       try {
@@ -1666,15 +1664,13 @@ var require_RedisDatastore = __commonJS({
         try {
           !_n && _i.return != null && _i.return();
         } finally {
-          if (_d)
-            throw _e;
+          if (_d) throw _e;
         }
       }
       return _arr;
     }
     function _arrayWithHoles2(arr) {
-      if (Array.isArray(arr))
-        return arr;
+      if (Array.isArray(arr)) return arr;
     }
     function asyncGeneratorStep2(gen, resolve, reject, _next, _throw, key, arg) {
       try {
@@ -2036,15 +2032,13 @@ var require_Group = __commonJS({
         try {
           !_n && _i.return != null && _i.return();
         } finally {
-          if (_d)
-            throw _e;
+          if (_d) throw _e;
         }
       }
       return _arr;
     }
     function _arrayWithHoles2(arr) {
-      if (Array.isArray(arr))
-        return arr;
+      if (Array.isArray(arr)) return arr;
     }
     function asyncGeneratorStep2(gen, resolve, reject, _next, _throw, key, arg) {
       try {
@@ -2223,8 +2217,7 @@ var require_Bottleneck = __commonJS({
         try {
           !_n && _i.return != null && _i.return();
         } finally {
-          if (_d)
-            throw _e;
+          if (_d) throw _e;
         }
       }
       return _arr;
@@ -2236,12 +2229,10 @@ var require_Bottleneck = __commonJS({
       throw new TypeError("Invalid attempt to destructure non-iterable instance");
     }
     function _iterableToArray(iter) {
-      if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]")
-        return Array.from(iter);
+      if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
     }
     function _arrayWithHoles2(arr) {
-      if (Array.isArray(arr))
-        return arr;
+      if (Array.isArray(arr)) return arr;
     }
     function asyncGeneratorStep2(gen, resolve, reject, _next, _throw, key, arg) {
       try {
@@ -2753,8 +2744,7 @@ var DevServer = class {
         throw new Error(`DevServer for '${this.name}' not present in this spin environment`);
       let match = new RegExp(`^(.+)${this.name}$`).exec(services[0]), organization = match ? match[1] : "";
       return `${organization !== "shopify--" ? `${organization}` : ""}${this.name}.${process.env.SPIN_FQDN}`;
-    } else
-      return DevServerUtils.inferenceModeAndProjectIsEdition2016(this.name) ? (this.assertRunningLocally2016(), `${prefix}.myshopify.io`) : (this.assertRunningLocally2024(), `${prefix}.shop.dev`);
+    } else return DevServerUtils.inferenceModeAndProjectIsEdition2016(this.name) ? (this.assertRunningLocally2016(), `${prefix}.myshopify.io`) : (this.assertRunningLocally2024(), `${prefix}.shop.dev`);
   }
   assertRunningLocally2024() {
     let [addr, port] = DevServerUtils.getAddrPort2024(this.name);
@@ -2776,8 +2766,7 @@ var DevServer = class {
       if (!fs.readdirSync("/run/ports2").find((file) => file.endsWith(`--${this.name}`)))
         throw new Error(`DevServer for '${this.name}' not present in this spin environment`);
       return `${prefix}.${this.name}.${process.env.SPIN_FQDN}`;
-    } else
-      return DevServerUtils.inferenceModeAndProjectIsEdition2016("shopify") ? (this.assertRunningLocally2016(), `${prefix}.myshopify.io`) : (this.assertRunningLocally2024(), `${prefix}.my.shop.dev`);
+    } else return DevServerUtils.inferenceModeAndProjectIsEdition2016("shopify") ? (this.assertRunningLocally2016(), `${prefix}.myshopify.io`) : (this.assertRunningLocally2024(), `${prefix}.my.shop.dev`);
   }
   assertRunningLocally2024() {
     let [addr, port] = DevServerUtils.getAddrPort2024("shopify");
@@ -3144,14 +3133,6 @@ var JWTInvalid = class extends JOSEError {
   }
   code = "ERR_JWT_INVALID";
 };
-var JWKSMultipleMatchingKeys = class extends JOSEError {
-  [Symbol.asyncIterator];
-  static get code() {
-    return "ERR_JWKS_MULTIPLE_MATCHING_KEYS";
-  }
-  code = "ERR_JWKS_MULTIPLE_MATCHING_KEYS";
-  message = "multiple matching keys found in the JSON Web Key Set";
-};
 
 // ../../node_modules/.pnpm/jose@5.8.0/node_modules/jose/dist/node/esm/lib/is_object.js
 init_cjs_shims();
@@ -3441,6 +3422,36 @@ Request ID: ${requestId}
   };
 }
 
+// ../cli-kit/dist/private/node/request-ids.js
+init_cjs_shims();
+var RequestIDCollection = class _RequestIDCollection {
+  constructor() {
+    this.requestIds = [];
+  }
+  static getInstance() {
+    return _RequestIDCollection.instance || (_RequestIDCollection.instance = new _RequestIDCollection()), _RequestIDCollection.instance;
+  }
+  /**
+   * Add a request ID to the collection
+   * We only report the first MAX_REQUEST_IDS request IDs.
+   */
+  addRequestId(requestId) {
+    requestId && this.requestIds.length < 100 && this.requestIds.push(requestId);
+  }
+  /**
+   * Get all collected request IDs
+   */
+  getRequestIds() {
+    return this.requestIds;
+  }
+  /**
+   * Clear all stored request IDs
+   */
+  clear() {
+    this.requestIds = [];
+  }
+}, requestIdsCollection = RequestIDCollection.getInstance();
+
 // ../cli-kit/dist/public/node/api/graphql.js
 async function performGraphQLRequest(options2) {
   let { token, addedHeaders, queryAsString, variables, api, url, responseOptions, unauthorizedHandler } = options2, headers = {
@@ -3448,20 +3459,28 @@ async function performGraphQLRequest(options2) {
     ...buildHeaders(token)
   };
   debugLogRequestInfo(api, queryAsString, url, variables, headers);
-  let clientOptions = { agent: await httpsAgent(), headers }, client = new GraphQLClient(url, clientOptions);
-  return runWithTimer("cmd_all_timing_network_ms")(async () => {
-    let response = await retryAwareRequest({ request: () => client.rawRequest(queryAsString, variables), url }, responseOptions?.handleErrors === !1 ? void 0 : errorHandler(api), unauthorizedHandler);
-    responseOptions?.onResponse && responseOptions.onResponse(response);
+  let clientOptions = { agent: await httpsAgent(), headers }, client = new GraphQLClient(url, clientOptions), performRequest = async () => {
+    let fullResponse;
     try {
-      let requestId = response.headers.get("x-request-id");
-      await addPublicMetadata(async () => ({
-        cmd_all_last_graphql_request_id: requestId ?? void 0
-      }));
-    } catch {
+      return fullResponse = await client.rawRequest(queryAsString, variables), await logLastRequestIdFromResponse(fullResponse), fullResponse;
+    } catch (error) {
+      throw error instanceof ClientError && await logLastRequestIdFromResponse(error.response), error;
     }
-    return response.data;
+  };
+  return runWithTimer("cmd_all_timing_network_ms")(async () => {
+    let response = await retryAwareRequest({ request: performRequest, url }, responseOptions?.handleErrors === !1 ? void 0 : errorHandler(api), unauthorizedHandler);
+    return responseOptions?.onResponse && responseOptions.onResponse(response), response.data;
   });
 }
+async function logLastRequestIdFromResponse(response) {
+  try {
+    let requestId = response.headers.get("x-request-id");
+    requestIdsCollection.addRequestId(requestId), await addPublicMetadata(() => ({
+      cmd_all_last_graphql_request_id: requestId ?? void 0
+    }));
+  } catch {
+  }
+}
 async function graphqlRequest(options2) {
   return performGraphQLRequest({
     ...options2,
@@ -3594,8 +3613,7 @@ The CLI is currently unable to prompt for reauthentication.`, "Restart the CLI p
     } catch (error) {
       if (error instanceof InvalidGrantError)
         throwOnNoPrompt(), newSession = await executeCompleteFlow(applications, fqdn);
-      else
-        throw error instanceof InvalidRequestError ? (await remove(), new AbortError(`
+      else throw error instanceof InvalidRequestError ? (await remove(), new AbortError(`
 Error validating auth session`, "We've cleared the current session, please try again")) : error;
     }
   }
@@ -3773,6 +3791,7 @@ export {
   restRequestUrl,
   restRequestHeaders,
   isThemeAccessSession,
+  requestIdsCollection,
   graphqlRequest,
   graphqlRequestDoc,
   getNextDeprecationDate,
@@ -3789,4 +3808,4 @@ export {
   getEnvironmentData,
   getSensitiveEnvironmentData
 };
-//# sourceMappingURL=chunk-HYGCZ6GV.js.map
+//# sourceMappingURL=chunk-HYVCBINV.js.map