@shopify/shopify-api 6.1.0 → 6.2.0

package/lib/clients/graphql/graphql_proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql_proxy.js","sourceRoot":"","sources":["graphql_proxy.ts"],"names":[],"mappings":";;;;AAEA,iEAA6C;AAG7C,mDAAoD;AAEpD,SAAgB,YAAY,CAAC,MAAuB;IAApD,iBAiBC;IAhBC,OAAO,UAAO,EAGO;YAFnB,OAAO,aAAA,EACP,OAAO,aAAA;;;;gBAEP,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBACxB,MAAM,IAAI,aAAa,CAAC,cAAc,CACpC,gDAAgD,CACjD,CAAC;iBACH;gBAEK,aAAa,GAAG,IAAA,mCAAkB,EAAC,EAAC,MAAM,QAAA,EAAC,CAAC,CAAC;gBAC7C,MAAM,GAAG,IAAI,aAAa,CAAC,EAAC,OAAO,SAAA,EAAC,CAAC,CAAC;gBAC5C,sBAAO,MAAM,CAAC,KAAK,CAAC;wBAClB,IAAI,EAAE,OAAO;qBACd,CAAC,EAAC;;;KACJ,CAAC;AACJ,CAAC;AAjBD,oCAiBC"}
+{"version":3,"file":"graphql_proxy.js","sourceRoot":"","sources":["graphql_proxy.ts"],"names":[],"mappings":";;;;AAEA,mEAA6C;AAG7C,qDAAoD;AAEpD,SAAgB,YAAY,CAAC,MAAuB;IAClD,OAAO,CAAO,EACZ,OAAO,EACP,OAAO,GACY,EAA0B,EAAE;QAC/C,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,MAAM,IAAI,aAAa,CAAC,cAAc,CACpC,gDAAgD,CACjD,CAAC;SACH;QAED,MAAM,aAAa,GAAG,IAAA,mCAAkB,EAAC,EAAC,MAAM,EAAC,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,EAAC,OAAO,EAAC,CAAC,CAAC;QAC5C,OAAO,MAAM,CAAC,KAAK,CAAC;YAClB,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;AACJ,CAAC;AAjBD,oCAiBC"}

package/lib/clients/graphql/storefront_client.js

@@ -1,71 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storefrontClientClass = exports.StorefrontClient = void 0;
-var tslib_1 = require("tslib");
-var version_1 = require("../../version");
-var types_1 = require("../../types");
-var http_client_1 = require("../http_client/http_client");
-var session_1 = require("../../session/session");
-var logger_1 = require("../../logger");
-var graphql_client_1 = require("./graphql_client");
-var StorefrontClient = /** @class */ (function (_super) {
-    tslib_1.__extends(StorefrontClient, _super);
-    function StorefrontClient(params) {
-        var _this = this;
-        var session = new session_1.Session({
+const version_1 = require("../../version");
+const types_1 = require("../../types");
+const http_client_1 = require("../http_client/http_client");
+const session_1 = require("../../session/session");
+const logger_1 = require("../../logger");
+const graphql_client_1 = require("./graphql_client");
+class StorefrontClient extends graphql_client_1.GraphqlClient {
+    constructor(params) {
+        const session = new session_1.Session({
             shop: params.domain,
             id: '',
             state: '',
             isOnline: true,
             accessToken: params.storefrontAccessToken,
         });
-        _this = _super.call(this, { session: session, apiVersion: params.apiVersion }) || this;
-        _this.baseApiPath = '/api';
-        var config = _this.storefrontClass().config;
+        super({ session, apiVersion: params.apiVersion });
+        this.baseApiPath = '/api';
+        const config = this.storefrontClass().config;
         if (params.apiVersion) {
-            var message = params.apiVersion === config.apiVersion
-                ? "Storefront client has a redundant API version override to the default ".concat(params.apiVersion)
-                : "Storefront client overriding default API version ".concat(config.apiVersion, " with ").concat(params.apiVersion);
+            const message = params.apiVersion === config.apiVersion
+                ? `Storefront client has a redundant API version override to the default ${params.apiVersion}`
+                : `Storefront client overriding default API version ${config.apiVersion} with ${params.apiVersion}`;
             (0, logger_1.logger)(config).debug(message);
         }
-        _this.domain = params.domain;
-        _this.storefrontAccessToken = params.storefrontAccessToken;
-        return _this;
+        this.domain = params.domain;
+        this.storefrontAccessToken = params.storefrontAccessToken;
     }
-    StorefrontClient.prototype.getApiHeaders = function () {
-        var _a;
-        var sdkVariant = types_1.LIBRARY_NAME.toLowerCase().split(' ').join('-');
-        return _a = {},
-            _a[types_1.ShopifyHeader.StorefrontAccessToken] = this.storefrontClass().config
-                .isPrivateApp
+    getApiHeaders() {
+        const sdkVariant = types_1.LIBRARY_NAME.toLowerCase().split(' ').join('-');
+        return {
+            [types_1.ShopifyHeader.StorefrontAccessToken]: this.storefrontClass().config
+                .isCustomStoreApp
                 ? this.storefrontClass().config.privateAppStorefrontAccessToken ||
                     this.storefrontAccessToken
                 : this.storefrontAccessToken,
-            _a[types_1.ShopifyHeader.StorefrontSDKVariant] = sdkVariant,
-            _a[types_1.ShopifyHeader.StorefrontSDKVersion] = version_1.SHOPIFY_API_LIBRARY_VERSION,
-            _a;
-    };
-    StorefrontClient.prototype.storefrontClass = function () {
+            [types_1.ShopifyHeader.StorefrontSDKVariant]: sdkVariant,
+            [types_1.ShopifyHeader.StorefrontSDKVersion]: version_1.SHOPIFY_API_LIBRARY_VERSION,
+        };
+    }
+    storefrontClass() {
         return this.constructor;
-    };
-    return StorefrontClient;
-}(graphql_client_1.GraphqlClient));
+    }
+}
 exports.StorefrontClient = StorefrontClient;
 function storefrontClientClass(params) {
-    var config = params.config;
-    var HttpClient = params.HttpClient;
+    const { config } = params;
+    let { HttpClient } = params;
     if (!HttpClient) {
         HttpClient = (0, http_client_1.httpClientClass)(config);
     }
-    var NewStorefrontClient = /** @class */ (function (_super) {
-        tslib_1.__extends(NewStorefrontClient, _super);
-        function NewStorefrontClient() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        NewStorefrontClient.config = config;
-        NewStorefrontClient.HttpClient = HttpClient;
-        return NewStorefrontClient;
-    }(StorefrontClient));
+    class NewStorefrontClient extends StorefrontClient {
+    }
+    NewStorefrontClient.config = config;
+    NewStorefrontClient.HttpClient = HttpClient;
     Reflect.defineProperty(NewStorefrontClient, 'name', {
         value: 'StorefrontClient',
     });

package/lib/clients/graphql/storefront_client.js.map

@@ -1 +1 @@
-{"version":3,"file":"storefront_client.js","sourceRoot":"","sources":["storefront_client.ts"],"names":[],"mappings":";;;;AAAA,yCAA0D;AAC1D,qCAAwD;AACxD,0DAA2D;AAC3D,iDAA8C;AAE9C,uCAAoC;AAEpC,mDAAyE;AAGzE;IAAsC,4CAAa;IAKjD,0BAAY,MAA8B;QAA1C,iBAwBC;QAvBC,IAAM,OAAO,GAAG,IAAI,iBAAO,CAAC;YAC1B,IAAI,EAAE,MAAM,CAAC,MAAM;YACnB,EAAE,EAAE,EAAE;YACN,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,MAAM,CAAC,qBAAqB;SAC1C,CAAC,CAAC;gBAEH,kBAAM,EAAC,OAAO,SAAA,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAC,CAAC;QAbjD,iBAAW,GAAG,MAAM,CAAC;QAenB,IAAM,MAAM,GAAG,KAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC;QAE7C,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,IAAM,OAAO,GACX,MAAM,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU;gBACrC,CAAC,CAAC,gFAAyE,MAAM,CAAC,UAAU,CAAE;gBAC9F,CAAC,CAAC,2DAAoD,MAAM,CAAC,UAAU,mBAAS,MAAM,CAAC,UAAU,CAAE,CAAC;YAExG,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC/B;QAED,KAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,KAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,CAAC;;IAC5D,CAAC;IAES,wCAAa,GAAvB;;QACE,IAAM,UAAU,GAAG,oBAAY,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnE;YACE,GAAC,qBAAa,CAAC,qBAAqB,IAAG,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM;iBACjE,YAAY;gBACb,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,+BAA+B;oBAC7D,IAAI,CAAC,qBAAqB;gBAC5B,CAAC,CAAC,IAAI,CAAC,qBAAqB;YAC9B,GAAC,qBAAa,CAAC,oBAAoB,IAAG,UAAU;YAChD,GAAC,qBAAa,CAAC,oBAAoB,IAAG,qCAA2B;eACjE;IACJ,CAAC;IAEO,0CAAe,GAAvB;QACE,OAAO,IAAI,CAAC,WAAsC,CAAC;IACrD,CAAC;IACH,uBAAC;AAAD,CAAC,AAhDD,CAAsC,8BAAa,GAgDlD;AAhDY,4CAAgB;AAkD7B,SAAgB,qBAAqB,CAAC,MAAgC;IAC7D,IAAA,MAAM,GAAI,MAAM,OAAV,CAAW;IACnB,IAAA,UAAU,GAAI,MAAM,WAAV,CAAW;IAC1B,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,IAAA,6BAAe,EAAC,MAAM,CAAC,CAAC;KACtC;IACD;QAAkC,+CAAgB;QAAlD;;QAGA,CAAC;QAFe,0BAAM,GAAG,MAAM,CAAC;QAChB,8BAAU,GAAG,UAAW,CAAC;QACzC,0BAAC;KAAA,AAHD,CAAkC,gBAAgB,GAGjD;IAED,OAAO,CAAC,cAAc,CAAC,mBAAmB,EAAE,MAAM,EAAE;QAClD,KAAK,EAAE,kBAAkB;KAC1B,CAAC,CAAC;IAEH,OAAO,mBAA8C,CAAC;AACxD,CAAC;AAhBD,sDAgBC"}
+{"version":3,"file":"storefront_client.js","sourceRoot":"","sources":["storefront_client.ts"],"names":[],"mappings":";;;AAAA,2CAA0D;AAC1D,uCAAwD;AACxD,4DAA2D;AAC3D,mDAA8C;AAE9C,yCAAoC;AAEpC,qDAAyE;AAGzE,MAAa,gBAAiB,SAAQ,8BAAa;IAKjD,YAAY,MAA8B;QACxC,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC;YAC1B,IAAI,EAAE,MAAM,CAAC,MAAM;YACnB,EAAE,EAAE,EAAE;YACN,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,MAAM,CAAC,qBAAqB;SAC1C,CAAC,CAAC;QAEH,KAAK,CAAC,EAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAC,CAAC,CAAC;QAblD,gBAAW,GAAG,MAAM,CAAC;QAenB,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC;QAE7C,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,MAAM,OAAO,GACX,MAAM,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU;gBACrC,CAAC,CAAC,yEAAyE,MAAM,CAAC,UAAU,EAAE;gBAC9F,CAAC,CAAC,oDAAoD,MAAM,CAAC,UAAU,SAAS,MAAM,CAAC,UAAU,EAAE,CAAC;YAExG,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC/B;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,CAAC;IAC5D,CAAC;IAES,aAAa;QACrB,MAAM,UAAU,GAAG,oBAAY,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnE,OAAO;YACL,CAAC,qBAAa,CAAC,qBAAqB,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM;iBACjE,gBAAgB;gBACjB,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,+BAA+B;oBAC7D,IAAI,CAAC,qBAAqB;gBAC5B,CAAC,CAAC,IAAI,CAAC,qBAAqB;YAC9B,CAAC,qBAAa,CAAC,oBAAoB,CAAC,EAAE,UAAU;YAChD,CAAC,qBAAa,CAAC,oBAAoB,CAAC,EAAE,qCAA2B;SAClE,CAAC;IACJ,CAAC;IAEO,eAAe;QACrB,OAAO,IAAI,CAAC,WAAsC,CAAC;IACrD,CAAC;CACF;AAhDD,4CAgDC;AAED,SAAgB,qBAAqB,CAAC,MAAgC;IACpE,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,CAAC;IACxB,IAAI,EAAC,UAAU,EAAC,GAAG,MAAM,CAAC;IAC1B,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,IAAA,6BAAe,EAAC,MAAM,CAAC,CAAC;KACtC;IACD,MAAM,mBAAoB,SAAQ,gBAAgB;;IAClC,0BAAM,GAAG,MAAM,CAAC;IAChB,8BAAU,GAAG,UAAW,CAAC;IAGzC,OAAO,CAAC,cAAc,CAAC,mBAAmB,EAAE,MAAM,EAAE;QAClD,KAAK,EAAE,kBAAkB;KAC1B,CAAC,CAAC;IAEH,OAAO,mBAA8C,CAAC;AACxD,CAAC;AAhBD,sDAgBC"}

package/lib/clients/http_client/http_client.js

@@ -1,301 +1,261 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpClientClass = exports.HttpClient = void 0;
-var tslib_1 = require("tslib");
-var network_1 = require("@shopify/network");
-var ShopifyErrors = tslib_1.__importStar(require("../../error"));
-var types_1 = require("../../types");
-var version_1 = require("../../version");
-var processed_query_1 = tslib_1.__importDefault(require("../../utils/processed-query"));
-var crypto_1 = require("../../../runtime/crypto");
-var types_2 = require("../../../runtime/crypto/types");
-var http_1 = require("../../../runtime/http");
-var platform_1 = require("../../../runtime/platform");
-var logger_1 = require("../../logger");
-var types_3 = require("./types");
-var HttpClient = /** @class */ (function () {
-    function HttpClient(params) {
+const tslib_1 = require("tslib");
+const network_1 = require("@shopify/network");
+const ShopifyErrors = tslib_1.__importStar(require("../../error"));
+const types_1 = require("../../types");
+const version_1 = require("../../version");
+const processed_query_1 = tslib_1.__importDefault(require("../../utils/processed-query"));
+const crypto_1 = require("../../../runtime/crypto");
+const types_2 = require("../../../runtime/crypto/types");
+const http_1 = require("../../../runtime/http");
+const platform_1 = require("../../../runtime/platform");
+const logger_1 = require("../../logger");
+const types_3 = require("./types");
+class HttpClient {
+    constructor(params) {
         this.loggedDeprecations = {};
         this.domain = params.domain;
     }
     /**
      * Performs a GET request on the given path.
      */
-    HttpClient.prototype.get = function (params) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.request(tslib_1.__assign({ method: network_1.Method.Get }, params))];
-            });
+    get(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return this.request(Object.assign({ method: network_1.Method.Get }, params));
         });
-    };
+    }
     /**
      * Performs a POST request on the given path.
      */
-    HttpClient.prototype.post = function (params) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.request(tslib_1.__assign({ method: network_1.Method.Post }, params))];
-            });
+    post(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return this.request(Object.assign({ method: network_1.Method.Post }, params));
         });
-    };
+    }
     /**
      * Performs a PUT request on the given path.
      */
-    HttpClient.prototype.put = function (params) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.request(tslib_1.__assign({ method: network_1.Method.Put }, params))];
-            });
+    put(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return this.request(Object.assign({ method: network_1.Method.Put }, params));
         });
-    };
+    }
     /**
      * Performs a DELETE request on the given path.
      */
-    HttpClient.prototype.delete = function (params) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.request(tslib_1.__assign({ method: network_1.Method.Delete }, params))];
-            });
+    delete(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return this.request(Object.assign({ method: network_1.Method.Delete }, params));
         });
-    };
-    HttpClient.prototype.request = function (params) {
+    }
+    request(params) {
         var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const maxTries = params.tries ? params.tries : 1;
+            if (maxTries <= 0) {
+                throw new ShopifyErrors.HttpRequestError(`Number of tries must be >= 0, got ${maxTries}`);
+            }
+            let userAgent = `${types_1.LIBRARY_NAME} v${version_1.SHOPIFY_API_LIBRARY_VERSION} | ${(0, platform_1.abstractRuntimeString)()}`;
+            if (this.httpClass().config.userAgentPrefix) {
+                userAgent = `${this.httpClass().config.userAgentPrefix} | ${userAgent}`;
+            }
+            if (params.extraHeaders) {
+                if (params.extraHeaders['user-agent']) {
+                    userAgent = `${params.extraHeaders['user-agent']} | ${userAgent}`;
+                    delete params.extraHeaders['user-agent'];
+                }
+                else if (params.extraHeaders['User-Agent']) {
+                    userAgent = `${params.extraHeaders['User-Agent']} | ${userAgent}`;
+                }
+            }
+            let headers = Object.assign(Object.assign({}, params.extraHeaders), { 'User-Agent': userAgent });
+            let body;
+            if (params.method === network_1.Method.Post || params.method === network_1.Method.Put) {
+                const type = (_a = params.type) !== null && _a !== void 0 ? _a : types_3.DataType.JSON;
+                const data = params.data;
+                if (data) {
+                    switch (type) {
+                        case types_3.DataType.JSON:
+                            body = typeof data === 'string' ? data : JSON.stringify(data);
+                            break;
+                        case types_3.DataType.URLEncoded:
+                            body =
+                                typeof data === 'string'
+                                    ? data
+                                    : new URLSearchParams(data).toString();
+                            break;
+                        case types_3.DataType.GraphQL:
+                            body = data;
+                            break;
+                    }
+                    headers = Object.assign(Object.assign({}, headers), { 'Content-Type': type, 'Content-Length': new TextEncoder().encode(body).length });
+                }
+            }
+            const url = `${this.httpClass().scheme}://${this.domain}${this.getRequestPath(params.path)}${processed_query_1.default.stringify(params.query)}`;
+            const request = {
+                method: params.method,
+                url,
+                headers: (0, http_1.canonicalizeHeaders)(headers),
+                body,
+            };
+            if (this.httpClass().config.logger.httpRequests) {
+                const message = [
+                    'Making HTTP request',
+                    `${request.method} ${request.url}`,
+                    `Headers: ${JSON.stringify(headers)}`,
+                ];
+                if (body) {
+                    message.push(`Body: ${JSON.stringify(body).replace(/\n/g, '\\n  ')}`);
+                }
+                (0, logger_1.logger)(this.httpClass().config).debug(message.join('  -  '));
+            }
             function sleep(waitTime) {
-                return tslib_1.__awaiter(this, void 0, void 0, function () {
-                    return tslib_1.__generator(this, function (_a) {
-                        return [2 /*return*/, new Promise(function (resolve) { return setTimeout(resolve, waitTime); })];
-                    });
+                return tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    return new Promise((resolve) => setTimeout(resolve, waitTime));
                 });
             }
-            var maxTries, userAgent, headers, body, type, data, url, request, message, tries, error_1, waitTime;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        maxTries = params.tries ? params.tries : 1;
-                        if (maxTries <= 0) {
-                            throw new ShopifyErrors.HttpRequestError("Number of tries must be >= 0, got ".concat(maxTries));
-                        }
-                        userAgent = "".concat(types_1.LIBRARY_NAME, " v").concat(version_1.SHOPIFY_API_LIBRARY_VERSION, " | ").concat((0, platform_1.abstractRuntimeString)());
-                        if (this.httpClass().config.userAgentPrefix) {
-                            userAgent = "".concat(this.httpClass().config.userAgentPrefix, " | ").concat(userAgent);
-                        }
-                        if (params.extraHeaders) {
-                            if (params.extraHeaders['user-agent']) {
-                                userAgent = "".concat(params.extraHeaders['user-agent'], " | ").concat(userAgent);
-                                delete params.extraHeaders['user-agent'];
-                            }
-                            else if (params.extraHeaders['User-Agent']) {
-                                userAgent = "".concat(params.extraHeaders['User-Agent'], " | ").concat(userAgent);
-                            }
-                        }
-                        headers = tslib_1.__assign(tslib_1.__assign({}, params.extraHeaders), { 'User-Agent': userAgent });
-                        if (params.method === network_1.Method.Post || params.method === network_1.Method.Put) {
-                            type = (_a = params.type) !== null && _a !== void 0 ? _a : types_3.DataType.JSON;
-                            data = params.data;
-                            if (data) {
-                                switch (type) {
-                                    case types_3.DataType.JSON:
-                                        body = typeof data === 'string' ? data : JSON.stringify(data);
-                                        break;
-                                    case types_3.DataType.URLEncoded:
-                                        body =
-                                            typeof data === 'string'
-                                                ? data
-                                                : new URLSearchParams(data).toString();
-                                        break;
-                                    case types_3.DataType.GraphQL:
-                                        body = data;
-                                        break;
-                                }
-                                headers = tslib_1.__assign(tslib_1.__assign({}, headers), { 'Content-Type': type, 'Content-Length': new TextEncoder().encode(body).length });
-                            }
-                        }
-                        url = "".concat(this.httpClass().scheme, "://").concat(this.domain).concat(this.getRequestPath(params.path)).concat(processed_query_1.default.stringify(params.query));
-                        request = {
-                            method: params.method,
-                            url: url,
-                            headers: (0, http_1.canonicalizeHeaders)(headers),
-                            body: body,
-                        };
-                        if (this.httpClass().config.logger.httpRequests) {
-                            message = [
-                                'Making HTTP request',
-                                "".concat(request.method, " ").concat(request.url),
-                                "Headers: ".concat(JSON.stringify(headers)),
-                            ];
-                            if (body) {
-                                message.push("Body: ".concat(JSON.stringify(body).replace(/\n/g, '\\n  ')));
+            let tries = 0;
+            while (tries < maxTries) {
+                try {
+                    return yield this.doRequest(request);
+                }
+                catch (error) {
+                    tries++;
+                    if (error instanceof ShopifyErrors.HttpRetriableError) {
+                        // We're not out of tries yet, use them
+                        if (tries < maxTries) {
+                            let waitTime = this.httpClass().RETRY_WAIT_TIME;
+                            if (error instanceof ShopifyErrors.HttpThrottlingError &&
+                                error.response.retryAfter) {
+                                waitTime = error.response.retryAfter * 1000;
                             }
-                            (0, logger_1.logger)(this.httpClass().config).debug(message.join('  -  '));
-                        }
-                        tries = 0;
-                        _b.label = 1;
-                    case 1:
-                        if (!(tries < maxTries)) return [3 /*break*/, 9];
-                        _b.label = 2;
-                    case 2:
-                        _b.trys.push([2, 4, , 8]);
-                        return [4 /*yield*/, this.doRequest(request)];
-                    case 3: return [2 /*return*/, _b.sent()];
-                    case 4:
-                        error_1 = _b.sent();
-                        tries++;
-                        if (!(error_1 instanceof ShopifyErrors.HttpRetriableError)) return [3 /*break*/, 7];
-                        if (!(tries < maxTries)) return [3 /*break*/, 6];
-                        waitTime = this.httpClass().RETRY_WAIT_TIME;
-                        if (error_1 instanceof ShopifyErrors.HttpThrottlingError &&
-                            error_1.response.retryAfter) {
-                            waitTime = error_1.response.retryAfter * 1000;
+                            yield sleep(waitTime);
+                            continue;
                         }
-                        return [4 /*yield*/, sleep(waitTime)];
-                    case 5:
-                        _b.sent();
-                        return [3 /*break*/, 1];
-                    case 6:
                         // We're set to multiple tries but ran out
                         if (maxTries > 1) {
-                            throw new ShopifyErrors.HttpMaxRetriesError("Exceeded maximum retry count of ".concat(maxTries, ". Last message: ").concat(error_1.message));
+                            throw new ShopifyErrors.HttpMaxRetriesError(`Exceeded maximum retry count of ${maxTries}. Last message: ${error.message}`);
                         }
-                        _b.label = 7;
-                    case 7: 
+                    }
                     // We're not retrying or the error is not retriable, rethrow
-                    throw error_1;
-                    case 8: return [3 /*break*/, 1];
-                    case 9: 
-                    // We're never supposed to come this far, this is here only for the benefit of Typescript
-                    /* istanbul ignore next */
-                    throw new ShopifyErrors.ShopifyError("Unexpected flow, reached maximum HTTP tries but did not throw an error");
+                    throw error;
                 }
-            });
+            }
+            // We're never supposed to come this far, this is here only for the benefit of Typescript
+            /* istanbul ignore next */
+            throw new ShopifyErrors.ShopifyError(`Unexpected flow, reached maximum HTTP tries but did not throw an error`);
         });
-    };
-    HttpClient.prototype.getRequestPath = function (path) {
-        return "/".concat(path.replace(/^\//, ''));
-    };
-    HttpClient.prototype.httpClass = function () {
+    }
+    getRequestPath(path) {
+        return `/${path.replace(/^\//, '')}`;
+    }
+    httpClass() {
         return this.constructor;
-    };
-    HttpClient.prototype.throwFailedRequest = function (body, response) {
-        var errorMessages = [];
+    }
+    throwFailedRequest(body, response) {
+        const errorMessages = [];
         if (body.errors) {
             errorMessages.push(JSON.stringify(body.errors, null, 2));
         }
-        var xRequestId = (0, http_1.getHeader)(response.headers, 'x-request-id');
+        const xRequestId = (0, http_1.getHeader)(response.headers, 'x-request-id');
         if (xRequestId) {
-            errorMessages.push("If you report this error, please include this id: ".concat(xRequestId));
+            errorMessages.push(`If you report this error, please include this id: ${xRequestId}`);
         }
-        var errorMessage = errorMessages.length
-            ? ":\n".concat(errorMessages.join('\n'))
+        const errorMessage = errorMessages.length
+            ? `:\n${errorMessages.join('\n')}`
             : '';
-        var headers = response.headers ? response.headers : {};
-        var code = response.statusCode;
-        var statusText = response.statusText;
+        const headers = response.headers ? response.headers : {};
+        const code = response.statusCode;
+        const statusText = response.statusText;
         switch (true) {
             case response.statusCode === network_1.StatusCode.TooManyRequests: {
-                var retryAfter = (0, http_1.getHeader)(response.headers, 'Retry-After');
+                const retryAfter = (0, http_1.getHeader)(response.headers, 'Retry-After');
                 throw new ShopifyErrors.HttpThrottlingError({
-                    message: "Shopify is throttling requests".concat(errorMessage),
-                    code: code,
-                    statusText: statusText,
-                    body: body,
-                    headers: headers,
+                    message: `Shopify is throttling requests${errorMessage}`,
+                    code,
+                    statusText,
+                    body,
+                    headers,
                     retryAfter: retryAfter ? parseFloat(retryAfter) : undefined,
                 });
             }
             case response.statusCode >= network_1.StatusCode.InternalServerError:
                 throw new ShopifyErrors.HttpInternalError({
-                    message: "Shopify internal error".concat(errorMessage),
-                    code: code,
-                    statusText: statusText,
-                    body: body,
-                    headers: headers,
+                    message: `Shopify internal error${errorMessage}`,
+                    code,
+                    statusText,
+                    body,
+                    headers,
                 });
             default:
                 throw new ShopifyErrors.HttpResponseError({
-                    message: "Received an error response (".concat(response.statusCode, " ").concat(response.statusText, ") from Shopify").concat(errorMessage),
-                    code: code,
-                    statusText: statusText,
-                    body: body,
-                    headers: headers,
+                    message: `Received an error response (${response.statusCode} ${response.statusText}) from Shopify${errorMessage}`,
+                    code,
+                    statusText,
+                    body,
+                    headers,
                 });
         }
-    };
-    HttpClient.prototype.doRequest = function (request) {
+    }
+    doRequest(request) {
         var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var log, response, body, deprecationReason, deprecation, depHash, stack, message;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        log = (0, logger_1.logger)(this.httpClass().config);
-                        return [4 /*yield*/, (0, http_1.abstractFetch)(request)];
-                    case 1:
-                        response = _b.sent();
-                        if (this.httpClass().config.logger.httpRequests) {
-                            log.debug("Completed HTTP request, received ".concat(response.statusCode, " ").concat(response.statusText));
-                        }
-                        body = {};
-                        if (response.body) {
-                            try {
-                                body = JSON.parse(response.body);
-                            }
-                            catch (error) {
-                                body = response.body;
-                            }
-                        }
-                        if (!(0, http_1.isOK)(response)) {
-                            this.throwFailedRequest(body, response);
-                        }
-                        deprecationReason = (0, http_1.getHeader)(response.headers, 'X-Shopify-API-Deprecated-Reason');
-                        if (!deprecationReason) return [3 /*break*/, 4];
-                        deprecation = {
-                            message: deprecationReason,
-                            path: request.url,
-                        };
-                        if (request.body) {
-                            // This can only be a string, since we're always converting the body before calling this method
-                            deprecation.body = "".concat(request.body.substring(0, 100), "...");
-                        }
-                        return [4 /*yield*/, (0, crypto_1.createSHA256HMAC)(this.httpClass().config.apiSecretKey, JSON.stringify(deprecation), types_2.HashFormat.Hex)];
-                    case 2:
-                        depHash = _b.sent();
-                        if (!(!Object.keys(this.loggedDeprecations).includes(depHash) ||
-                            Date.now() - this.loggedDeprecations[depHash] >=
-                                HttpClient.DEPRECATION_ALERT_DELAY)) return [3 /*break*/, 4];
-                        this.loggedDeprecations[depHash] = Date.now();
-                        stack = new Error().stack;
-                        message = "API Deprecation Notice ".concat(new Date().toLocaleString(), " : ").concat(JSON.stringify(deprecation), "  -  Stack Trace: ").concat(stack);
-                        return [4 /*yield*/, log.warning(message)];
-                    case 3:
-                        _b.sent();
-                        _b.label = 4;
-                    case 4: return [2 /*return*/, {
-                            body: body,
-                            headers: (_a = response.headers) !== null && _a !== void 0 ? _a : {},
-                        }];
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const log = (0, logger_1.logger)(this.httpClass().config);
+            const response = yield (0, http_1.abstractFetch)(request);
+            if (this.httpClass().config.logger.httpRequests) {
+                log.debug(`Completed HTTP request, received ${response.statusCode} ${response.statusText}`);
+            }
+            let body = {};
+            if (response.body) {
+                try {
+                    body = JSON.parse(response.body);
+                }
+                catch (error) {
+                    body = response.body;
+                }
+            }
+            if (!(0, http_1.isOK)(response)) {
+                this.throwFailedRequest(body, response);
+            }
+            const deprecationReason = (0, http_1.getHeader)(response.headers, 'X-Shopify-API-Deprecated-Reason');
+            if (deprecationReason) {
+                const deprecation = {
+                    message: deprecationReason,
+                    path: request.url,
+                };
+                if (request.body) {
+                    // This can only be a string, since we're always converting the body before calling this method
+                    deprecation.body = `${request.body.substring(0, 100)}...`;
+                }
+                const depHash = yield (0, crypto_1.createSHA256HMAC)(this.httpClass().config.apiSecretKey, JSON.stringify(deprecation), types_2.HashFormat.Hex);
+                if (!Object.keys(this.loggedDeprecations).includes(depHash) ||
+                    Date.now() - this.loggedDeprecations[depHash] >=
+                        HttpClient.DEPRECATION_ALERT_DELAY) {
+                    this.loggedDeprecations[depHash] = Date.now();
+                    const stack = new Error().stack;
+                    const message = `API Deprecation Notice ${new Date().toLocaleString()} : ${JSON.stringify(deprecation)}  -  Stack Trace: ${stack}`;
+                    yield log.warning(message);
                 }
-            });
+            }
+            return {
+                body: body,
+                headers: (_a = response.headers) !== null && _a !== void 0 ? _a : {},
+            };
         });
-    };
-    // 1 second
-    HttpClient.RETRY_WAIT_TIME = 1000;
-    // 5 minutes
-    HttpClient.DEPRECATION_ALERT_DELAY = 300000;
-    return HttpClient;
-}());
+    }
+}
 exports.HttpClient = HttpClient;
-function httpClientClass(config, scheme) {
-    if (scheme === void 0) { scheme = 'https'; }
-    var NewHttpClient = /** @class */ (function (_super) {
-        tslib_1.__extends(NewHttpClient, _super);
-        function NewHttpClient() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        NewHttpClient.config = config;
-        NewHttpClient.scheme = scheme;
-        return NewHttpClient;
-    }(HttpClient));
+// 1 second
+HttpClient.RETRY_WAIT_TIME = 1000;
+// 5 minutes
+HttpClient.DEPRECATION_ALERT_DELAY = 300000;
+function httpClientClass(config, scheme = 'https') {
+    class NewHttpClient extends HttpClient {
+    }
+    NewHttpClient.config = config;
+    NewHttpClient.scheme = scheme;
     Reflect.defineProperty(NewHttpClient, 'name', {
         value: 'HttpClient',
     });