@shopify/shopify-api 6.0.2 → 6.2.0

package/lib/clients/rest/rest_client.d.ts

@@ -1,3 +1,4 @@
+import { ApiVersion } from '../../types';
 import { ConfigInterface } from '../../base-types';
 import { RequestParams } from '../http_client/types';
 import { HttpClient } from '../http_client/http_client';
@@ -9,8 +10,9 @@ export interface RestClientClassParams {
 export declare class RestClient extends HttpClient {
     static LINK_HEADER_REGEXP: RegExp;
     static DEFAULT_LIMIT: string;
-    static CONFIG: ConfigInterface;
+    static config: ConfigInterface;
     readonly session: Session;
+    readonly apiVersion?: ApiVersion;
     constructor(params: RestClientParams);
     protected request<T = unknown>(params: RequestParams): Promise<RestRequestReturn<T>>;
     protected getRequestPath(path: string): string;

package/lib/clients/rest/rest_client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rest_client.d.ts","sourceRoot":"","sources":["rest_client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,aAAa,EAAmB,MAAM,sBAAsB,CAAC;AAErE,OAAO,EAAC,UAAU,EAAC,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAE9C,OAAO,EAAC,iBAAiB,EAAY,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAEtE,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,eAAe,CAAC;CACzB;AAED,qBAAa,UAAW,SAAQ,UAAU;IACxC,MAAM,CAAC,kBAAkB,SAA8B;IACvD,MAAM,CAAC,aAAa,SAAQ;IAE5B,OAAc,MAAM,EAAE,eAAe,CAAC;IAEtC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;gBAEP,MAAM,EAAE,gBAAgB;cAY3B,OAAO,CAAC,CAAC,GAAG,OAAO,EACjC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAyDhC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAW9C,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kBAAkB;CAU3B;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,qBAAqB,GAC5B,OAAO,UAAU,CAanB"}
+{"version":3,"file":"rest_client.d.ts","sourceRoot":"","sources":["rest_client.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAgB,MAAM,aAAa,CAAC;AACtD,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAC,UAAU,EAAC,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAG9C,OAAO,EACL,iBAAiB,EAEjB,gBAAgB,EAEjB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,eAAe,CAAC;CACzB;AAED,qBAAa,UAAW,SAAQ,UAAU;IACxC,MAAM,CAAC,kBAAkB,SAA8B;IACvD,MAAM,CAAC,aAAa,SAAQ;IAE5B,OAAc,MAAM,EAAE,eAAe,CAAC;IAEtC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;gBAEd,MAAM,EAAE,gBAAgB;cAwB3B,OAAO,CAAC,CAAC,GAAG,OAAO,EACjC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAyDhC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAW9C,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kBAAkB;CAU3B;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,qBAAqB,GAC5B,OAAO,UAAU,CAanB"}

package/lib/clients/rest/rest_client.js

@@ -1,124 +1,109 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.restClientClass = exports.RestClient = void 0;
-var tslib_1 = require("tslib");
-var http_1 = require("../../../runtime/http");
-var types_1 = require("../../types");
-var ShopifyErrors = tslib_1.__importStar(require("../../error"));
-var http_client_1 = require("../http_client/http_client");
-var RestClient = /** @class */ (function (_super) {
-    tslib_1.__extends(RestClient, _super);
-    function RestClient(params) {
-        var _this = _super.call(this, { domain: params.session.shop }) || this;
-        if (!_this.restClass().CONFIG.isPrivateApp && !params.session.accessToken) {
+const tslib_1 = require("tslib");
+const http_1 = require("../../../runtime/http");
+const types_1 = require("../../types");
+const ShopifyErrors = tslib_1.__importStar(require("../../error"));
+const http_client_1 = require("../http_client/http_client");
+const logger_1 = require("../../logger");
+class RestClient extends http_client_1.HttpClient {
+    constructor(params) {
+        super({ domain: params.session.shop });
+        const config = this.restClass().config;
+        if (!config.isCustomStoreApp && !params.session.accessToken) {
             throw new ShopifyErrors.MissingRequiredArgument('Missing access token when creating REST client');
         }
-        _this.session = params.session;
-        return _this;
+        if (params.apiVersion) {
+            const message = params.apiVersion === config.apiVersion
+                ? `REST client has a redundant API version override to the default ${params.apiVersion}`
+                : `REST client overriding default API version ${config.apiVersion} with ${params.apiVersion}`;
+            (0, logger_1.logger)(config).debug(message);
+        }
+        this.session = params.session;
+        this.apiVersion = params.apiVersion;
     }
-    RestClient.prototype.request = function (params) {
+    request(params) {
+        const _super = Object.create(null, {
+            request: { get: () => super.request }
+        });
         var _a, _b;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var ret, link, pageInfo, links, links_1, links_1_1, link_1, parsedLink, linkRel, linkUrl, linkFields, linkPageToken;
-            var _c, e_1, _d;
-            return tslib_1.__generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        params.extraHeaders = tslib_1.__assign((_c = {}, _c[types_1.ShopifyHeader.AccessToken] = this.restClass().CONFIG.isPrivateApp
-                            ? this.restClass().CONFIG.apiSecretKey
-                            : this.session.accessToken, _c), params.extraHeaders);
-                        return [4 /*yield*/, _super.prototype.request.call(this, params)];
-                    case 1:
-                        ret = _e.sent();
-                        link = (0, http_1.getHeader)(ret.headers, 'link');
-                        if (link !== undefined) {
-                            pageInfo = {
-                                limit: ((_a = params.query) === null || _a === void 0 ? void 0 : _a.limit)
-                                    ? (_b = params.query) === null || _b === void 0 ? void 0 : _b.limit.toString()
-                                    : RestClient.DEFAULT_LIMIT,
-                            };
-                            if (link) {
-                                links = link.split(', ');
-                                try {
-                                    for (links_1 = tslib_1.__values(links), links_1_1 = links_1.next(); !links_1_1.done; links_1_1 = links_1.next()) {
-                                        link_1 = links_1_1.value;
-                                        parsedLink = link_1.match(RestClient.LINK_HEADER_REGEXP);
-                                        if (!parsedLink) {
-                                            continue;
-                                        }
-                                        linkRel = parsedLink[2];
-                                        linkUrl = new URL(parsedLink[1]);
-                                        linkFields = linkUrl.searchParams.get('fields');
-                                        linkPageToken = linkUrl.searchParams.get('page_info');
-                                        if (!pageInfo.fields && linkFields) {
-                                            pageInfo.fields = linkFields.split(',');
-                                        }
-                                        if (linkPageToken) {
-                                            switch (linkRel) {
-                                                case 'previous':
-                                                    pageInfo.previousPageUrl = parsedLink[1];
-                                                    pageInfo.prevPage = this.buildRequestParams(parsedLink[1]);
-                                                    break;
-                                                case 'next':
-                                                    pageInfo.nextPageUrl = parsedLink[1];
-                                                    pageInfo.nextPage = this.buildRequestParams(parsedLink[1]);
-                                                    break;
-                                            }
-                                        }
-                                    }
-                                }
-                                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                                finally {
-                                    try {
-                                        if (links_1_1 && !links_1_1.done && (_d = links_1.return)) _d.call(links_1);
-                                    }
-                                    finally { if (e_1) throw e_1.error; }
-                                }
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            params.extraHeaders = Object.assign({ [types_1.ShopifyHeader.AccessToken]: this.restClass().config.isCustomStoreApp
+                    ? this.restClass().config.apiSecretKey
+                    : this.session.accessToken }, params.extraHeaders);
+            const ret = yield _super.request.call(this, params);
+            const link = (0, http_1.getHeader)(ret.headers, 'link');
+            if (link !== undefined) {
+                const pageInfo = {
+                    limit: ((_a = params.query) === null || _a === void 0 ? void 0 : _a.limit)
+                        ? (_b = params.query) === null || _b === void 0 ? void 0 : _b.limit.toString()
+                        : RestClient.DEFAULT_LIMIT,
+                };
+                if (link) {
+                    const links = link.split(', ');
+                    for (const link of links) {
+                        const parsedLink = link.match(RestClient.LINK_HEADER_REGEXP);
+                        if (!parsedLink) {
+                            continue;
+                        }
+                        const linkRel = parsedLink[2];
+                        const linkUrl = new URL(parsedLink[1]);
+                        const linkFields = linkUrl.searchParams.get('fields');
+                        const linkPageToken = linkUrl.searchParams.get('page_info');
+                        if (!pageInfo.fields && linkFields) {
+                            pageInfo.fields = linkFields.split(',');
+                        }
+                        if (linkPageToken) {
+                            switch (linkRel) {
+                                case 'previous':
+                                    pageInfo.previousPageUrl = parsedLink[1];
+                                    pageInfo.prevPage = this.buildRequestParams(parsedLink[1]);
+                                    break;
+                                case 'next':
+                                    pageInfo.nextPageUrl = parsedLink[1];
+                                    pageInfo.nextPage = this.buildRequestParams(parsedLink[1]);
+                                    break;
                             }
-                            ret.pageInfo = pageInfo;
                         }
-                        return [2 /*return*/, ret];
+                    }
                 }
-            });
+                ret.pageInfo = pageInfo;
+            }
+            return ret;
         });
-    };
-    RestClient.prototype.getRequestPath = function (path) {
-        var cleanPath = _super.prototype.getRequestPath.call(this, path);
+    }
+    getRequestPath(path) {
+        const cleanPath = super.getRequestPath(path);
         if (cleanPath.startsWith('/admin')) {
-            return "".concat(cleanPath.replace(/\.json$/, ''), ".json");
+            return `${cleanPath.replace(/\.json$/, '')}.json`;
         }
         else {
-            return "/admin/api/".concat(this.restClass().CONFIG.apiVersion).concat(cleanPath.replace(/\.json$/, ''), ".json");
+            return `/admin/api/${this.apiVersion || this.restClass().config.apiVersion}${cleanPath.replace(/\.json$/, '')}.json`;
         }
-    };
-    RestClient.prototype.restClass = function () {
+    }
+    restClass() {
         return this.constructor;
-    };
-    RestClient.prototype.buildRequestParams = function (newPageUrl) {
-        var pattern = "^/admin/api/[^/]+/(.*).json$";
-        var url = new URL(newPageUrl);
-        var path = url.pathname.replace(new RegExp(pattern), '$1');
+    }
+    buildRequestParams(newPageUrl) {
+        const pattern = `^/admin/api/[^/]+/(.*).json$`;
+        const url = new URL(newPageUrl);
+        const path = url.pathname.replace(new RegExp(pattern), '$1');
         return {
-            path: path,
+            path,
             query: Object.fromEntries(url.searchParams.entries()),
         };
-    };
-    RestClient.LINK_HEADER_REGEXP = /<([^<]+)>; rel="([^"]+)"/;
-    RestClient.DEFAULT_LIMIT = '50';
-    return RestClient;
-}(http_client_1.HttpClient));
+    }
+}
 exports.RestClient = RestClient;
+RestClient.LINK_HEADER_REGEXP = /<([^<]+)>; rel="([^"]+)"/;
+RestClient.DEFAULT_LIMIT = '50';
 function restClientClass(params) {
-    var config = params.config;
-    var NewRestClient = /** @class */ (function (_super) {
-        tslib_1.__extends(NewRestClient, _super);
-        function NewRestClient() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        NewRestClient.CONFIG = config;
-        NewRestClient.SCHEME = 'https';
-        return NewRestClient;
-    }(RestClient));
+    const { config } = params;
+    class NewRestClient extends RestClient {
+    }
+    NewRestClient.config = config;
+    NewRestClient.scheme = 'https';
     Reflect.defineProperty(NewRestClient, 'name', {
         value: 'RestClient',
     });

package/lib/clients/rest/rest_client.js.map

@@ -1 +1 @@
-{"version":3,"file":"rest_client.js","sourceRoot":"","sources":["rest_client.ts"],"names":[],"mappings":";;;;AAAA,8CAAgD;AAChD,qCAA0C;AAG1C,iEAA6C;AAC7C,0DAAsD;AAStD;IAAgC,sCAAU;IAQxC,oBAAmB,MAAwB;QAA3C,YACE,kBAAM,EAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAC,CAAC,SASrC;QAPC,IAAI,CAAC,KAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE;YACxE,MAAM,IAAI,aAAa,CAAC,uBAAuB,CAC7C,gDAAgD,CACjD,CAAC;SACH;QAED,KAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;;IAChC,CAAC;IAEe,4BAAO,GAAvB,UACE,MAAqB;;;;;;;;wBAErB,MAAM,CAAC,YAAY,iCAChB,qBAAa,CAAC,WAAW,IAAG,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,YAAY;4BAC/D,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,YAAY;4BACtC,CAAC,CAAE,IAAI,CAAC,OAAO,CAAC,WAAsB,OACrC,MAAM,CAAC,YAAY,CACvB,CAAC;wBAEgC,qBAAM,iBAAM,OAAO,YAAI,MAAM,CAAC,EAAA;;wBAA1D,GAAG,GAAyB,SAA8B;wBAE1D,IAAI,GAAG,IAAA,gBAAS,EAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;wBAC5C,IAAI,IAAI,KAAK,SAAS,EAAE;4BAChB,QAAQ,GAAa;gCACzB,KAAK,EAAE,CAAA,MAAA,MAAM,CAAC,KAAK,0CAAE,KAAK;oCACxB,CAAC,CAAC,MAAA,MAAM,CAAC,KAAK,0CAAE,KAAK,CAAC,QAAQ,EAAE;oCAChC,CAAC,CAAC,UAAU,CAAC,aAAa;6BAC7B,CAAC;4BAEF,IAAI,IAAI,EAAE;gCACF,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;;oCAE/B,KAAmB,UAAA,iBAAA,KAAK,CAAA,2EAAE;wCAArB;wCACG,UAAU,GAAG,MAAI,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;wCAC7D,IAAI,CAAC,UAAU,EAAE;4CACf,SAAS;yCACV;wCAEK,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;wCACxB,OAAO,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;wCACjC,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wCAChD,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;wCAE5D,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,UAAU,EAAE;4CAClC,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;yCACzC;wCAED,IAAI,aAAa,EAAE;4CACjB,QAAQ,OAAO,EAAE;gDACf,KAAK,UAAU;oDACb,QAAQ,CAAC,eAAe,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oDACzC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;oDAC3D,MAAM;gDACR,KAAK,MAAM;oDACT,QAAQ,CAAC,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oDACrC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;oDAC3D,MAAM;6CACT;yCACF;qCACF;;;;;;;;;6BACF;4BAED,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;yBACzB;wBAED,sBAAO,GAAG,EAAC;;;;KACZ;IAES,mCAAc,GAAxB,UAAyB,IAAY;QACnC,IAAM,SAAS,GAAG,iBAAM,cAAc,YAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAClC,OAAO,UAAG,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,UAAO,CAAC;SACnD;aAAM;YACL,OAAO,qBACL,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,UAAU,SACjC,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,UAAO,CAAC;SAC5C;IACH,CAAC;IAEO,8BAAS,GAAjB;QACE,OAAO,IAAI,CAAC,WAAgC,CAAC;IAC/C,CAAC;IAEO,uCAAkB,GAA1B,UAA2B,UAAkB;QAC3C,IAAM,OAAO,GAAG,8BAA8B,CAAC;QAE/C,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;QAChC,IAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QAC7D,OAAO;YACL,IAAI,MAAA;YACJ,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;SACtD,CAAC;IACJ,CAAC;IAtGM,6BAAkB,GAAG,0BAA0B,CAAC;IAChD,wBAAa,GAAG,IAAI,CAAC;IAsG9B,iBAAC;CAAA,AAxGD,CAAgC,wBAAU,GAwGzC;AAxGY,gCAAU;AA0GvB,SAAgB,eAAe,CAC7B,MAA6B;IAEtB,IAAA,MAAM,GAAI,MAAM,OAAV,CAAW;IAExB;QAA4B,yCAAU;QAAtC;;QAGA,CAAC;QAFe,oBAAM,GAAG,MAAM,CAAC;QAChB,oBAAM,GAAG,OAAO,CAAC;QACjC,oBAAC;KAAA,AAHD,CAA4B,UAAU,GAGrC;IAED,OAAO,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE;QAC5C,KAAK,EAAE,YAAY;KACpB,CAAC,CAAC;IAEH,OAAO,aAAkC,CAAC;AAC5C,CAAC;AAfD,0CAeC"}
+{"version":3,"file":"rest_client.js","sourceRoot":"","sources":["rest_client.ts"],"names":[],"mappings":";;;;AAAA,gDAAgD;AAChD,uCAAsD;AAGtD,mEAA6C;AAC7C,4DAAsD;AAEtD,yCAAoC;AAapC,MAAa,UAAW,SAAQ,wBAAU;IASxC,YAAmB,MAAwB;QACzC,KAAK,CAAC,EAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAC,CAAC,CAAC;QAErC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC;QAEvC,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE;YAC3D,MAAM,IAAI,aAAa,CAAC,uBAAuB,CAC7C,gDAAgD,CACjD,CAAC;SACH;QAED,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,MAAM,OAAO,GACX,MAAM,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU;gBACrC,CAAC,CAAC,mEAAmE,MAAM,CAAC,UAAU,EAAE;gBACxF,CAAC,CAAC,8CAA8C,MAAM,CAAC,UAAU,SAAS,MAAM,CAAC,UAAU,EAAE,CAAC;YAElG,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC/B;QAED,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACtC,CAAC;IAEe,OAAO,CACrB,MAAqB;;;;;;YAErB,MAAM,CAAC,YAAY,mBACjB,CAAC,qBAAa,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,gBAAgB;oBACnE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,YAAY;oBACtC,CAAC,CAAE,IAAI,CAAC,OAAO,CAAC,WAAsB,IACrC,MAAM,CAAC,YAAY,CACvB,CAAC;YAEF,MAAM,GAAG,GAAyB,MAAM,OAAM,OAAO,YAAI,MAAM,CAAC,CAAC;YAEjE,MAAM,IAAI,GAAG,IAAA,gBAAS,EAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5C,IAAI,IAAI,KAAK,SAAS,EAAE;gBACtB,MAAM,QAAQ,GAAa;oBACzB,KAAK,EAAE,CAAA,MAAA,MAAM,CAAC,KAAK,0CAAE,KAAK;wBACxB,CAAC,CAAC,MAAA,MAAM,CAAC,KAAK,0CAAE,KAAK,CAAC,QAAQ,EAAE;wBAChC,CAAC,CAAC,UAAU,CAAC,aAAa;iBAC7B,CAAC;gBAEF,IAAI,IAAI,EAAE;oBACR,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;wBACxB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;wBAC7D,IAAI,CAAC,UAAU,EAAE;4BACf,SAAS;yBACV;wBAED,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;wBAC9B,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;wBACvC,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBACtD,MAAM,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;wBAE5D,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,UAAU,EAAE;4BAClC,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;yBACzC;wBAED,IAAI,aAAa,EAAE;4BACjB,QAAQ,OAAO,EAAE;gCACf,KAAK,UAAU;oCACb,QAAQ,CAAC,eAAe,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oCACzC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;oCAC3D,MAAM;gCACR,KAAK,MAAM;oCACT,QAAQ,CAAC,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oCACrC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;oCAC3D,MAAM;6BACT;yBACF;qBACF;iBACF;gBAED,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;aACzB;YAED,OAAO,GAAG,CAAC;;KACZ;IAES,cAAc,CAAC,IAAY;QACnC,MAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAClC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC;SACnD;aAAM;YACL,OAAO,cACL,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,UAC7C,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC;SAC5C;IACH,CAAC;IAEO,SAAS;QACf,OAAO,IAAI,CAAC,WAAgC,CAAC;IAC/C,CAAC;IAEO,kBAAkB,CAAC,UAAkB;QAC3C,MAAM,OAAO,GAAG,8BAA8B,CAAC;QAE/C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;QAChC,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QAC7D,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;SACtD,CAAC;IACJ,CAAC;;AApHH,gCAqHC;AApHQ,6BAAkB,GAAG,0BAA0B,CAAC;AAChD,wBAAa,GAAG,IAAI,CAAC;AAqH9B,SAAgB,eAAe,CAC7B,MAA6B;IAE7B,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,CAAC;IAExB,MAAM,aAAc,SAAQ,UAAU;;IACtB,oBAAM,GAAG,MAAM,CAAC;IAChB,oBAAM,GAAG,OAAO,CAAC;IAGjC,OAAO,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE;QAC5C,KAAK,EAAE,YAAY;KACpB,CAAC,CAAC;IAEH,OAAO,aAAkC,CAAC;AAC5C,CAAC;AAfD,0CAeC"}

package/lib/clients/rest/types.d.ts

@@ -1,17 +1,25 @@
+import { ApiVersion } from '../../types';
 import { Session } from '../../session/session';
-import { RequestReturn, GetRequestParams } from '../http_client/types';
+import { RequestReturn, QueryParams } from '../http_client/types';
+export interface PageInfoParams {
+    path: string;
+    query: {
+        [key: string]: QueryParams;
+    };
+}
 export interface PageInfo {
     limit: string;
     fields?: string[];
     previousPageUrl?: string;
     nextPageUrl?: string;
-    prevPage?: GetRequestParams;
-    nextPage?: GetRequestParams;
+    prevPage?: PageInfoParams;
+    nextPage?: PageInfoParams;
 }
 export declare type RestRequestReturn<T = unknown> = RequestReturn<T> & {
     pageInfo?: PageInfo;
 };
 export interface RestClientParams {
     session: Session;
+    apiVersion?: ApiVersion;
 }
 //# sourceMappingURL=types.d.ts.map

package/lib/clients/rest/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAErE,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B;AAED,oBAAY,iBAAiB,CAAC,CAAC,GAAG,OAAO,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG;IAC9D,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;CAClB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AACvC,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAC,CAAC;CACrC;AAED,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B;AAED,oBAAY,iBAAiB,CAAC,CAAC,GAAG,OAAO,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG;IAC9D,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB"}

package/lib/clients/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./http_client/types"), exports);
 tslib_1.__exportStar(require("./rest/types"), exports);
 tslib_1.__exportStar(require("./graphql/types"), exports);

package/lib/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["config.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAE,YAAY,EAAC,MAAM,cAAc,CAAC;AAI3D,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,eAAe,CAqEzE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["config.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAE,YAAY,EAAC,MAAM,cAAc,CAAC;AAK3D,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,eAAe,CA0FzE"}

package/lib/config.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateConfig = void 0;
-var tslib_1 = require("tslib");
-var error_1 = require("./error");
-var types_1 = require("./types");
-var scopes_1 = require("./auth/scopes");
+const tslib_1 = require("tslib");
+const error_1 = require("./error");
+const types_1 = require("./types");
+const scopes_1 = require("./auth/scopes");
+const logger_1 = require("./logger");
 function validateConfig(params) {
-    var config = {
+    const config = {
         apiKey: '',
         apiSecretKey: '',
         scopes: new scopes_1.AuthScopes([]),
@@ -14,7 +15,7 @@ function validateConfig(params) {
         hostScheme: 'https',
         apiVersion: types_1.LATEST_API_VERSION,
         isEmbeddedApp: true,
-        isPrivateApp: false,
+        isCustomStoreApp: false,
         logger: {
             log: defaultLogFunction,
             level: types_1.LogSeverity.Info,
@@ -23,35 +24,49 @@ function validateConfig(params) {
         },
     };
     // Make sure that the essential params actually have content in them
-    var mandatory = [
+    const mandatory = [
         'apiKey',
         'apiSecretKey',
-        'scopes',
         'hostName',
     ];
-    var missing = [];
-    mandatory.forEach(function (key) {
+    if ((!('isCustomStoreApp' in params) || !params.isCustomStoreApp) &&
+        // DEPRECATION: isPrivateApp to be removed in 7.0.0
+        (!('isPrivateApp' in params) || !params.isPrivateApp)) {
+        mandatory.push('scopes');
+    }
+    const missing = [];
+    mandatory.forEach((key) => {
         if (!notEmpty(params[key])) {
             missing.push(key);
         }
     });
     if (missing.length) {
-        throw new error_1.ShopifyError("Cannot initialize Shopify API Library. Missing values for: ".concat(missing.join(', ')));
+        throw new error_1.ShopifyError(`Cannot initialize Shopify API Library. Missing values for: ${missing.join(', ')}`);
     }
-    var hostScheme = params.hostScheme, isPrivateApp = params.isPrivateApp, userAgentPrefix = params.userAgentPrefix, logger = params.logger, privateAppStorefrontAccessToken = params.privateAppStorefrontAccessToken, customShopDomains = params.customShopDomains, billing = params.billing, mandatoryParams = tslib_1.__rest(params, ["hostScheme", "isPrivateApp", "userAgentPrefix", "logger", "privateAppStorefrontAccessToken", "customShopDomains", "billing"]);
+    const { hostScheme, isCustomStoreApp, userAgentPrefix, logger, privateAppStorefrontAccessToken, customShopDomains, billing } = params, mandatoryParams = tslib_1.__rest(params, ["hostScheme", "isCustomStoreApp", "userAgentPrefix", "logger", "privateAppStorefrontAccessToken", "customShopDomains", "billing"]);
     Object.assign(config, mandatoryParams, {
         hostName: params.hostName.replace(/\/$/, ''),
         scopes: params.scopes instanceof scopes_1.AuthScopes
             ? params.scopes
             : new scopes_1.AuthScopes(params.scopes),
         hostScheme: hostScheme !== null && hostScheme !== void 0 ? hostScheme : config.hostScheme,
-        isPrivateApp: isPrivateApp === undefined ? config.isPrivateApp : isPrivateApp,
+        isCustomStoreApp: isCustomStoreApp === undefined
+            ? config.isCustomStoreApp
+            : isCustomStoreApp,
         userAgentPrefix: userAgentPrefix !== null && userAgentPrefix !== void 0 ? userAgentPrefix : config.userAgentPrefix,
-        logger: tslib_1.__assign(tslib_1.__assign({}, config.logger), (logger || {})),
+        logger: Object.assign(Object.assign({}, config.logger), (logger || {})),
         privateAppStorefrontAccessToken: privateAppStorefrontAccessToken !== null && privateAppStorefrontAccessToken !== void 0 ? privateAppStorefrontAccessToken : config.privateAppStorefrontAccessToken,
         customShopDomains: customShopDomains !== null && customShopDomains !== void 0 ? customShopDomains : config.customShopDomains,
         billing: billing !== null && billing !== void 0 ? billing : config.billing,
     });
+    if ('isPrivateApp' in params) {
+        (0, logger_1.logger)(config).deprecated('7.0.0', 'The `isPrivateApp` config option has been deprecated. Please use `isCustomStoreApp` instead.');
+        // only set isCustomStoreApp to value of isPrivateApp, if isCustomStoreApp hasn't been set explicitly
+        if (!('isCustomStoreApp' in params)) {
+            config.isCustomStoreApp = params.isPrivateApp;
+        }
+        delete config.isPrivateApp;
+    }
     return config;
 }
 exports.validateConfig = validateConfig;
@@ -64,24 +79,21 @@ function notEmpty(value) {
         : true;
 }
 function defaultLogFunction(severity, message) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
-        return tslib_1.__generator(this, function (_a) {
-            switch (severity) {
-                case types_1.LogSeverity.Debug:
-                    console.debug(message);
-                    break;
-                case types_1.LogSeverity.Info:
-                    console.log(message);
-                    break;
-                case types_1.LogSeverity.Warning:
-                    console.warn(message);
-                    break;
-                case types_1.LogSeverity.Error:
-                    console.error(message);
-                    break;
-            }
-            return [2 /*return*/];
-        });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        switch (severity) {
+            case types_1.LogSeverity.Debug:
+                console.debug(message);
+                break;
+            case types_1.LogSeverity.Info:
+                console.log(message);
+                break;
+            case types_1.LogSeverity.Warning:
+                console.warn(message);
+                break;
+            case types_1.LogSeverity.Error:
+                console.error(message);
+                break;
+        }
     });
 }
 //# sourceMappingURL=config.js.map

package/lib/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["config.ts"],"names":[],"mappings":"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"}