@shopify/shopify-api 9.7.0 → 9.7.2

package/README.md

@@ -2,7 +2,7 @@
 
 <!-- ![Build Status]() -->
 
-[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](../../LICENSE.md)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](../../../LICENSE.md)
 [![npm version](https://badge.fury.io/js/%40shopify%2Fshopify-api.svg)](https://badge.fury.io/js/%40shopify%2Fshopify-api)
 
 This library provides support for the backends of TypeScript/JavaScript [Shopify](https://www.shopify.com) apps to access the [Shopify Admin API](https://shopify.dev/docs/api/admin), by making it easier to perform the following actions:

package/adapters/mock/adapter.js

@@ -1,38 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mockRuntimeString = exports.mockFetch = exports.mockConvertHeaders = exports.mockConvertResponse = exports.mockConvertRequest = void 0;
-const tslib_1 = require("tslib");
 const node_fetch_1 = require("node-fetch");
 const http_1 = require("../../runtime/http");
 const mock_test_requests_1 = require("./mock_test_requests");
-function mockConvertRequest(adapterArgs) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return Promise.resolve(adapterArgs.rawRequest);
-    });
+async function mockConvertRequest(adapterArgs) {
+    return Promise.resolve(adapterArgs.rawRequest);
 }
 exports.mockConvertRequest = mockConvertRequest;
-function mockConvertResponse(response, _adapterArgs) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return Promise.resolve(response);
-    });
+async function mockConvertResponse(response, _adapterArgs) {
+    return Promise.resolve(response);
 }
 exports.mockConvertResponse = mockConvertResponse;
-function mockConvertHeaders(headers, _adapterArgs) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return Promise.resolve(headers);
-    });
+async function mockConvertHeaders(headers, _adapterArgs) {
+    return Promise.resolve(headers);
 }
 exports.mockConvertHeaders = mockConvertHeaders;
-const mockFetch = (url, init) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+const mockFetch = async (url, init) => {
     const mockInit = init;
     const request = new node_fetch_1.Request(url, mockInit);
-    const headers = Object.fromEntries(new node_fetch_1.Headers(mockInit === null || mockInit === void 0 ? void 0 : mockInit.headers).entries());
+    const headers = Object.fromEntries(new node_fetch_1.Headers(mockInit?.headers).entries());
     mock_test_requests_1.mockTestRequests.requestList.push({
         url: request.url,
         method: request.method,
         headers: (0, http_1.canonicalizeHeaders)(headers),
-        body: yield request.text(),
+        body: await request.text(),
     });
     const next = mock_test_requests_1.mockTestRequests.responseList.shift();
     if (!next) {
@@ -42,7 +34,7 @@ const mockFetch = (url, init) => tslib_1.__awaiter(void 0, void 0, void 0, funct
         throw next;
     }
     const responseHeaders = new node_fetch_1.Headers();
-    Object.entries((_a = next.headers) !== null && _a !== void 0 ? _a : {}).forEach(([key, value]) => {
+    Object.entries(next.headers ?? {}).forEach(([key, value]) => {
         responseHeaders.set(key, typeof value === 'string' ? value : value.join(', '));
     });
     return new node_fetch_1.Response(next.body, {
@@ -50,7 +42,7 @@ const mockFetch = (url, init) => tslib_1.__awaiter(void 0, void 0, void 0, funct
         statusText: next.statusText,
         headers: responseHeaders,
     });
-});
+};
 exports.mockFetch = mockFetch;
 function mockRuntimeString() {
     return 'Mock adapter';

package/adapters/mock/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;;AAAA,2CAKoB;AAEpB,6CAQ4B;AAE5B,6DAAsD;AAMtD,SAAsB,kBAAkB,CACtC,WAA4B;;QAE5B,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;CAAA;AAJD,gDAIC;AAED,SAAsB,mBAAmB,CACvC,QAA4B,EAC5B,YAA6B;;QAE7B,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,kBAAkB,CACtC,OAAgB,EAChB,YAA6B;;QAE7B,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;CAAA;AALD,gDAKC;AAEM,MAAM,SAAS,GAAsB,CAAO,GAAG,EAAE,IAAI,EAAE,EAAE;;IAC9D,MAAM,QAAQ,GAAG,IAAmB,CAAC;IAErC,MAAM,OAAO,GAAG,IAAI,oBAAO,CAAC,GAAa,EAAE,QAAQ,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAChC,IAAI,oBAAY,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC,OAAO,EAAE,CAC9C,CAAC;IAEF,qCAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;QAChC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,IAAA,0BAAmB,EAAC,OAAO,CAAC;QACrC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,EAAE;KAC3B,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,qCAAgB,CAAC,YAAY,CAAC,KAAK,EAAG,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CACb,oBAAoB,OAAO,CAAC,MAAM,OAAO,GAAG,2CAA2C,CACxF,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,YAAY,KAAK,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC;IACb,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,oBAAY,EAAE,CAAC;IAC3C,MAAM,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC1D,eAAe,CAAC,GAAG,CACjB,GAAG,EACH,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,qBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;QAC7B,MAAM,EAAE,IAAI,CAAC,UAAU;QACvB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,OAAO,EAAE,eAAsB;KAChC,CAAQ,CAAC;AACZ,CAAC,CAAA,CAAC;AAtCW,QAAA,SAAS,aAsCpB;AAEF,SAAgB,iBAAiB;IAC/B,OAAO,cAAc,CAAC;AACxB,CAAC;AAFD,8CAEC"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;AAAA,2CAKoB;AAEpB,6CAQ4B;AAE5B,6DAAsD;AAM/C,KAAK,UAAU,kBAAkB,CACtC,WAA4B;IAE5B,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AACjD,CAAC;AAJD,gDAIC;AAEM,KAAK,UAAU,mBAAmB,CACvC,QAA4B,EAC5B,YAA6B;IAE7B,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AACnC,CAAC;AALD,kDAKC;AAEM,KAAK,UAAU,kBAAkB,CACtC,OAAgB,EAChB,YAA6B;IAE7B,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AALD,gDAKC;AAEM,MAAM,SAAS,GAAsB,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IAC9D,MAAM,QAAQ,GAAG,IAAmB,CAAC;IAErC,MAAM,OAAO,GAAG,IAAI,oBAAO,CAAC,GAAa,EAAE,QAAQ,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAChC,IAAI,oBAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,CAC9C,CAAC;IAEF,qCAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;QAChC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,IAAA,0BAAmB,EAAC,OAAO,CAAC;QACrC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,EAAE;KAC3B,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,qCAAgB,CAAC,YAAY,CAAC,KAAK,EAAG,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CACb,oBAAoB,OAAO,CAAC,MAAM,OAAO,GAAG,2CAA2C,CACxF,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,YAAY,KAAK,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC;IACb,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,oBAAY,EAAE,CAAC;IAC3C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC1D,eAAe,CAAC,GAAG,CACjB,GAAG,EACH,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,qBAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;QAC7B,MAAM,EAAE,IAAI,CAAC,UAAU;QACvB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,OAAO,EAAE,eAAsB;KAChC,CAAQ,CAAC;AACZ,CAAC,CAAC;AAtCW,QAAA,SAAS,aAsCpB;AAEF,SAAgB,iBAAiB;IAC/B,OAAO,cAAc,CAAC;AACxB,CAAC;AAFD,8CAEC"}

package/adapters/node/adapter.js

@@ -1,51 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nodeRuntimeString = exports.nodeConvertAndSetHeaders = exports.nodeConvertAndSendResponse = exports.nodeConvertIncomingResponse = exports.nodeConvertRequest = void 0;
-const tslib_1 = require("tslib");
 const http_1 = require("../../runtime/http");
-function nodeConvertRequest(adapterArgs) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const req = adapterArgs.rawRequest;
-        return {
-            headers: (0, http_1.canonicalizeHeaders)(Object.assign({}, req.headers)),
-            method: (_a = req.method) !== null && _a !== void 0 ? _a : 'GET',
-            // Express.js overrides the url property, so we want to use originalUrl for it
-            url: req.originalUrl || req.url,
-        };
-    });
+async function nodeConvertRequest(adapterArgs) {
+    const req = adapterArgs.rawRequest;
+    return {
+        headers: (0, http_1.canonicalizeHeaders)({ ...req.headers }),
+        method: req.method ?? 'GET',
+        // Express.js overrides the url property, so we want to use originalUrl for it
+        url: req.originalUrl || req.url,
+    };
 }
 exports.nodeConvertRequest = nodeConvertRequest;
-function nodeConvertIncomingResponse(adapterArgs) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return {
-            statusCode: adapterArgs.rawResponse.statusCode,
-            statusText: adapterArgs.rawResponse.statusMessage,
-            headers: (0, http_1.canonicalizeHeaders)(adapterArgs.rawResponse.getHeaders()),
-        };
-    });
+async function nodeConvertIncomingResponse(adapterArgs) {
+    return {
+        statusCode: adapterArgs.rawResponse.statusCode,
+        statusText: adapterArgs.rawResponse.statusMessage,
+        headers: (0, http_1.canonicalizeHeaders)(adapterArgs.rawResponse.getHeaders()),
+    };
 }
 exports.nodeConvertIncomingResponse = nodeConvertIncomingResponse;
-function nodeConvertAndSendResponse(response, adapterArgs) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const res = adapterArgs.rawResponse;
-        if (response.headers) {
-            yield nodeConvertAndSetHeaders(response.headers, adapterArgs);
-        }
-        if (response.body) {
-            res.write(response.body);
-        }
-        res.statusCode = response.statusCode;
-        res.statusMessage = response.statusText;
-        res.end();
-    });
+async function nodeConvertAndSendResponse(response, adapterArgs) {
+    const res = adapterArgs.rawResponse;
+    if (response.headers) {
+        await nodeConvertAndSetHeaders(response.headers, adapterArgs);
+    }
+    if (response.body) {
+        res.write(response.body);
+    }
+    res.statusCode = response.statusCode;
+    res.statusMessage = response.statusText;
+    res.end();
 }
 exports.nodeConvertAndSendResponse = nodeConvertAndSendResponse;
-function nodeConvertAndSetHeaders(headers, adapterArgs) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const res = adapterArgs.rawResponse;
-        Object.entries(headers).forEach(([header, value]) => res.setHeader(header, value));
-    });
+async function nodeConvertAndSetHeaders(headers, adapterArgs) {
+    const res = adapterArgs.rawResponse;
+    Object.entries(headers).forEach(([header, value]) => res.setHeader(header, value));
 }
 exports.nodeConvertAndSetHeaders = nodeConvertAndSetHeaders;
 function nodeRuntimeString() {

package/adapters/node/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;;AAEA,6CAM4B;AAO5B,SAAsB,kBAAkB,CACtC,WAA4B;;;QAE5B,MAAM,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC;QAEnC,OAAO;YACL,OAAO,EAAE,IAAA,0BAAmB,EAAC,kBAAI,GAAG,CAAC,OAAO,CAAQ,CAAC;YACrD,MAAM,EAAE,MAAA,GAAG,CAAC,MAAM,mCAAI,KAAK;YAC3B,8EAA8E;YAC9E,GAAG,EAAG,GAAW,CAAC,WAAW,IAAI,GAAG,CAAC,GAAI;SAC1C,CAAC;;CACH;AAXD,gDAWC;AAED,SAAsB,2BAA2B,CAC/C,WAA4B;;QAE5B,OAAO;YACL,UAAU,EAAE,WAAW,CAAC,WAAW,CAAC,UAAU;YAC9C,UAAU,EAAE,WAAW,CAAC,WAAW,CAAC,aAAa;YACjD,OAAO,EAAE,IAAA,0BAAmB,EAC1B,WAAW,CAAC,WAAW,CAAC,UAAU,EAAoB,CACvD;SACoB,CAAC;IAC1B,CAAC;CAAA;AAVD,kEAUC;AAED,SAAsB,0BAA0B,CAC9C,QAA4B,EAC5B,WAA4B;;QAE5B,MAAM,GAAG,GAAG,WAAW,CAAC,WAAW,CAAC;QAEpC,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,wBAAwB,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QAED,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QACrC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC;QAExC,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC;CAAA;AAlBD,gEAkBC;AAED,SAAsB,wBAAwB,CAC5C,OAAgB,EAChB,WAA4B;;QAE5B,MAAM,GAAG,GAAG,WAAW,CAAC,WAAW,CAAC;QAEpC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,CAClD,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAC7B,CAAC;IACJ,CAAC;CAAA;AATD,4DASC;AAED,SAAgB,iBAAiB;IAC/B,OAAO,QAAQ,OAAO,CAAC,OAAO,EAAE,CAAC;AACnC,CAAC;AAFD,8CAEC"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;AAEA,6CAM4B;AAOrB,KAAK,UAAU,kBAAkB,CACtC,WAA4B;IAE5B,MAAM,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC;IAEnC,OAAO;QACL,OAAO,EAAE,IAAA,0BAAmB,EAAC,EAAC,GAAG,GAAG,CAAC,OAAO,EAAQ,CAAC;QACrD,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,KAAK;QAC3B,8EAA8E;QAC9E,GAAG,EAAG,GAAW,CAAC,WAAW,IAAI,GAAG,CAAC,GAAI;KAC1C,CAAC;AACJ,CAAC;AAXD,gDAWC;AAEM,KAAK,UAAU,2BAA2B,CAC/C,WAA4B;IAE5B,OAAO;QACL,UAAU,EAAE,WAAW,CAAC,WAAW,CAAC,UAAU;QAC9C,UAAU,EAAE,WAAW,CAAC,WAAW,CAAC,aAAa;QACjD,OAAO,EAAE,IAAA,0BAAmB,EAC1B,WAAW,CAAC,WAAW,CAAC,UAAU,EAAoB,CACvD;KACoB,CAAC;AAC1B,CAAC;AAVD,kEAUC;AAEM,KAAK,UAAU,0BAA0B,CAC9C,QAA4B,EAC5B,WAA4B;IAE5B,MAAM,GAAG,GAAG,WAAW,CAAC,WAAW,CAAC;IAEpC,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,wBAAwB,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClB,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;IACrC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC;IAExC,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAlBD,gEAkBC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,OAAgB,EAChB,WAA4B;IAE5B,MAAM,GAAG,GAAG,WAAW,CAAC,WAAW,CAAC;IAEpC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,CAClD,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAC7B,CAAC;AACJ,CAAC;AATD,4DASC;AAED,SAAgB,iBAAiB;IAC/B,OAAO,QAAQ,OAAO,CAAC,OAAO,EAAE,CAAC;AACnC,CAAC;AAFD,8CAEC"}

package/adapters/web-api/adapter.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@cloudflare/workers-types" />
 import type { Headers as ShopifyHeaders, AdapterArgs, NormalizedResponse, NormalizedRequest } from '../../runtime';
 interface WebApiAdapterArgs extends AdapterArgs {
     rawRequest: Request;

package/adapters/web-api/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,OAAO,IAAI,cAAc,EACzB,WAAW,EACX,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,eAAe,CAAC;AAGvB,UAAU,iBAAkB,SAAQ,WAAW;IAC7C,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,iBAAiB,CAAC,CAY5B;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,iBAAiB,GAC9B,OAAO,CAAC,OAAO,CAAC,CAMlB;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,kBAAkB,EACxB,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,QAAQ,CAAC,CAMnB;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,IAAI,cAAc,EACzB,WAAW,EACX,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,eAAe,CAAC;AAGvB,UAAU,iBAAkB,SAAQ,WAAW;IAC7C,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,iBAAiB,CAAC,CAY5B;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,iBAAiB,GAC9B,OAAO,CAAC,OAAO,CAAC,CAMlB;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,kBAAkB,EACxB,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,QAAQ,CAAC,CAMnB;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C"}

package/adapters/web-api/adapter.js

@@ -1,40 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webApiRuntimeString = exports.webApiConvertResponse = exports.webApiConvertHeaders = exports.webApiConvertRequest = void 0;
-const tslib_1 = require("tslib");
 const runtime_1 = require("../../runtime");
-function webApiConvertRequest(adapterArgs) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const request = adapterArgs.rawRequest;
-        const headers = {};
-        for (const [key, value] of request.headers.entries()) {
-            (0, runtime_1.addHeader)(headers, key, value);
-        }
-        return {
-            headers,
-            method: (_a = request.method) !== null && _a !== void 0 ? _a : 'GET',
-            url: new URL(request.url).toString(),
-        };
-    });
+async function webApiConvertRequest(adapterArgs) {
+    const request = adapterArgs.rawRequest;
+    const headers = {};
+    for (const [key, value] of request.headers.entries()) {
+        (0, runtime_1.addHeader)(headers, key, value);
+    }
+    return {
+        headers,
+        method: request.method ?? 'GET',
+        url: new URL(request.url).toString(),
+    };
 }
 exports.webApiConvertRequest = webApiConvertRequest;
-function webApiConvertHeaders(headers, _adapterArgs) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const remixHeaders = new Headers();
-        (0, runtime_1.flatHeaders)(headers !== null && headers !== void 0 ? headers : {}).forEach(([key, value]) => remixHeaders.append(key, value));
-        return Promise.resolve(remixHeaders);
-    });
+async function webApiConvertHeaders(headers, _adapterArgs) {
+    const remixHeaders = new Headers();
+    (0, runtime_1.flatHeaders)(headers ?? {}).forEach(([key, value]) => remixHeaders.append(key, value));
+    return Promise.resolve(remixHeaders);
 }
 exports.webApiConvertHeaders = webApiConvertHeaders;
-function webApiConvertResponse(resp, adapterArgs) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return new Response(resp.body, {
-            status: resp.statusCode,
-            statusText: resp.statusText,
-            headers: yield webApiConvertHeaders((_a = resp.headers) !== null && _a !== void 0 ? _a : {}, adapterArgs),
-        });
+async function webApiConvertResponse(resp, adapterArgs) {
+    return new Response(resp.body, {
+        status: resp.statusCode,
+        statusText: resp.statusText,
+        headers: await webApiConvertHeaders(resp.headers ?? {}, adapterArgs),
     });
 }
 exports.webApiConvertResponse = webApiConvertResponse;

package/adapters/web-api/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;;AAMA,2CAAqD;AAMrD,SAAsB,oBAAoB,CACxC,WAA8B;;;QAE9B,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC;QACvC,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACrD,IAAA,mBAAS,EAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QACjC,CAAC;QAED,OAAO;YACL,OAAO;YACP,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,KAAK;YAC/B,GAAG,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;SACrC,CAAC;;CACH;AAdD,oDAcC;AAED,SAAsB,oBAAoB,CACxC,OAAuB,EACvB,YAA+B;;QAE/B,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAC;QACnC,IAAA,qBAAW,EAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAClD,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAChC,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;CAAA;AATD,oDASC;AAED,SAAsB,qBAAqB,CACzC,IAAwB,EACxB,WAA8B;;;QAE9B,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;YAC7B,MAAM,EAAE,IAAI,CAAC,UAAU;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,MAAM,oBAAoB,CAAC,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE,EAAE,WAAW,CAAC;SACrE,CAAC,CAAC;;CACJ;AATD,sDASC;AAED,SAAgB,mBAAmB;IACjC,OAAO,SAAS,CAAC;AACnB,CAAC;AAFD,kDAEC"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;AAMA,2CAAqD;AAM9C,KAAK,UAAU,oBAAoB,CACxC,WAA8B;IAE9B,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC;IACvC,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QACrD,IAAA,mBAAS,EAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,OAAO;QACL,OAAO;QACP,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;QAC/B,GAAG,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;KACrC,CAAC;AACJ,CAAC;AAdD,oDAcC;AAEM,KAAK,UAAU,oBAAoB,CACxC,OAAuB,EACvB,YAA+B;IAE/B,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAC;IACnC,IAAA,qBAAW,EAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAClD,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAChC,CAAC;IACF,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;AACvC,CAAC;AATD,oDASC;AAEM,KAAK,UAAU,qBAAqB,CACzC,IAAwB,EACxB,WAA8B;IAE9B,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;QAC7B,MAAM,EAAE,IAAI,CAAC,UAAU;QACvB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,OAAO,EAAE,MAAM,oBAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,WAAW,CAAC;KACrE,CAAC,CAAC;AACL,CAAC;AATD,sDASC;AAED,SAAgB,mBAAmB;IACjC,OAAO,SAAS,CAAC;AACnB,CAAC;AAFD,kDAEC"}

package/future/flags.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logDisabledFutureFlags = void 0;
 function logDisabledFutureFlags(config, logger) {
-    var _a;
     if (!config._logDisabledFutureFlags) {
         return;
     }
     const logFlag = (flag, message) => logger.info(`Future flag ${flag} is disabled.\n\n  ${message}\n`);
-    if (!((_a = config.future) === null || _a === void 0 ? void 0 : _a.v10_lineItemBilling)) {
+    if (!config.future?.v10_lineItemBilling) {
         logFlag('v10_lineItemBilling', 'Enable this flag to use the new billing API, that supports multiple line items per plan.');
     }
 }

package/future/flags.js.map

@@ -1 +1 @@
-{"version":3,"file":"flags.js","sourceRoot":"","sources":["flags.ts"],"names":[],"mappings":";;;AA2BA,SAAgB,sBAAsB,CACpC,MAAuB,EACvB,MAAqB;;IAErB,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,OAAe,EAAE,EAAE,CAChD,MAAM,CAAC,IAAI,CAAC,eAAe,IAAI,sBAAsB,OAAO,IAAI,CAAC,CAAC;IAEpE,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,mBAAmB,CAAA,EAAE,CAAC;QACxC,OAAO,CACL,qBAAqB,EACrB,0FAA0F,CAC3F,CAAC;IACJ,CAAC;AACH,CAAC;AAjBD,wDAiBC"}
+{"version":3,"file":"flags.js","sourceRoot":"","sources":["flags.ts"],"names":[],"mappings":";;;AA2BA,SAAgB,sBAAsB,CACpC,MAAuB,EACvB,MAAqB;IAErB,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,OAAe,EAAE,EAAE,CAChD,MAAM,CAAC,IAAI,CAAC,eAAe,IAAI,sBAAsB,OAAO,IAAI,CAAC,CAAC;IAEpE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC;QACxC,OAAO,CACL,qBAAqB,EACrB,0FAA0F,CAC3F,CAAC;IACJ,CAAC;AACH,CAAC;AAjBD,wDAiBC"}

package/lib/auth/get-embedded-app-url.js

@@ -7,9 +7,8 @@ const http_1 = require("../../runtime/http");
 const shop_validator_1 = require("../utils/shop-validator");
 const decode_host_1 = require("./decode-host");
 function getEmbeddedAppUrl(config) {
-    return (_a) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var adapterArgs = tslib_1.__rest(_a, []);
-        const request = yield (0, http_1.abstractConvertRequest)(adapterArgs);
+    return async ({ ...adapterArgs }) => {
+        const request = await (0, http_1.abstractConvertRequest)(adapterArgs);
         if (!request) {
             throw new ShopifyErrors.MissingRequiredArgument('getEmbeddedAppUrl requires a request object argument');
         }
@@ -22,7 +21,7 @@ function getEmbeddedAppUrl(config) {
             throw new ShopifyErrors.InvalidRequestError('Request does not contain a host query parameter');
         }
         return buildEmbeddedAppUrl(config)(host);
-    });
+    };
 }
 exports.getEmbeddedAppUrl = getEmbeddedAppUrl;
 function buildEmbeddedAppUrl(config) {

package/lib/auth/get-embedded-app-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-embedded-app-url.js","sourceRoot":"","sources":["get-embedded-app-url.ts"],"names":[],"mappings":";;;;AAAA,gEAA0C;AAE1C,6CAA0D;AAC1D,4DAAqD;AAErD,+CAAyC;AASzC,SAAgB,iBAAiB,CAAC,MAAuB;IACvD,OAAO,CAAO,EAAyC,EAAmB,EAAE;YAA1D,WAAW,sBAAf,EAAgB,CAAD;QAC3B,MAAM,OAAO,GAAG,MAAM,IAAA,6BAAsB,EAAC,WAAW,CAAC,CAAC;QAE1D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,aAAa,CAAC,uBAAuB,CAC7C,sDAAsD,CACvD,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,aAAa,CAAC,mBAAmB,CACzC,gCAAgC,CACjC,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE1C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,aAAa,CAAC,mBAAmB,CACzC,iDAAiD,CAClD,CAAC;QACJ,CAAC;QAED,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAA,CAAC;AACJ,CAAC;AA3BD,8CA2BC;AAED,SAAgB,mBAAmB,CACjC,MAAuB;IAEvB,OAAO,CAAC,IAAY,EAAU,EAAE;QAC9B,IAAA,6BAAY,GAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3B,MAAM,WAAW,GAAG,IAAA,wBAAU,EAAC,IAAI,CAAC,CAAC;QAErC,OAAO,WAAW,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC;IACxD,CAAC,CAAC;AACJ,CAAC;AATD,kDASC"}
+{"version":3,"file":"get-embedded-app-url.js","sourceRoot":"","sources":["get-embedded-app-url.ts"],"names":[],"mappings":";;;;AAAA,gEAA0C;AAE1C,6CAA0D;AAC1D,4DAAqD;AAErD,+CAAyC;AASzC,SAAgB,iBAAiB,CAAC,MAAuB;IACvD,OAAO,KAAK,EAAE,EAAC,GAAG,WAAW,EAA0B,EAAmB,EAAE;QAC1E,MAAM,OAAO,GAAG,MAAM,IAAA,6BAAsB,EAAC,WAAW,CAAC,CAAC;QAE1D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,aAAa,CAAC,uBAAuB,CAC7C,sDAAsD,CACvD,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,aAAa,CAAC,mBAAmB,CACzC,gCAAgC,CACjC,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE1C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,aAAa,CAAC,mBAAmB,CACzC,iDAAiD,CAClD,CAAC;QACJ,CAAC;QAED,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC;AA3BD,8CA2BC;AAED,SAAgB,mBAAmB,CACjC,MAAuB;IAEvB,OAAO,CAAC,IAAY,EAAU,EAAE;QAC9B,IAAA,6BAAY,GAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3B,MAAM,WAAW,GAAG,IAAA,wBAAU,EAAC,IAAI,CAAC,CAAC;QAErC,OAAO,WAAW,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC;IACxD,CAAC,CAAC;AACJ,CAAC;AATD,kDASC"}

package/lib/auth/oauth/create-session.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSession = void 0;
-const tslib_1 = require("tslib");
 const uuid_1 = require("uuid");
 const session_1 = require("../../session/session");
 const logger_1 = require("../../logger");
@@ -14,7 +13,7 @@ function createSession({ config, accessTokenResponse, shop, state, }) {
     if (isOnline) {
         let sessionId;
         const responseBody = accessTokenResponse;
-        const { access_token, scope } = responseBody, rest = tslib_1.__rest(responseBody, ["access_token", "scope"]);
+        const { access_token, scope, ...rest } = responseBody;
         const sessionExpiration = new Date(Date.now() + responseBody.expires_in * 1000);
         if (config.isEmbeddedApp) {
             sessionId = (0, session_utils_1.getJwtSessionId)(config)(shop, `${rest.associated_user.id}`);

package/lib/auth/oauth/create-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-session.js","sourceRoot":"","sources":["create-session.ts"],"names":[],"mappings":";;;;AAAA,+BAAkC;AAElC,mDAA8C;AAE9C,yCAAoC;AACpC,+DAA0E;AAQ1E,SAAgB,aAAa,CAAC,EAC5B,MAAM,EACN,mBAAmB,EACnB,IAAI,EACJ,KAAK,GAMN;IACC,MAAM,cAAc,GAAI,mBAA4C;SACjE,eAAe,CAAC;IACnB,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEzC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAC,CAAC;IAE9D,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,SAAiB,CAAC;QACtB,MAAM,YAAY,GAAG,mBAA2C,CAAC;QACjE,MAAM,EAAC,YAAY,EAAE,KAAK,KAAa,YAAY,EAApB,IAAI,kBAAI,YAAY,EAA7C,yBAA8B,CAAe,CAAC;QACpD,MAAM,iBAAiB,GAAG,IAAI,IAAI,CAChC,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,UAAU,GAAG,IAAI,CAC5C,CAAC;QAEF,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,SAAS,GAAG,IAAA,+BAAe,EAAC,MAAM,CAAC,CACjC,IAAI,EACJ,GAAI,IAAyB,CAAC,eAAe,CAAC,EAAE,EAAE,CACnD,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,SAAS,GAAG,IAAA,SAAM,GAAE,CAAC;QACvB,CAAC;QAED,OAAO,IAAI,iBAAO,CAAC;YACjB,EAAE,EAAE,SAAS;YACb,IAAI;YACJ,KAAK;YACL,QAAQ;YACR,WAAW,EAAE,YAAY;YACzB,KAAK;YACL,OAAO,EAAE,iBAAiB;YAC1B,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,iBAAO,CAAC;YACjB,EAAE,EAAE,IAAA,4BAAY,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC;YAC9B,IAAI;YACJ,KAAK;YACL,QAAQ;YACR,WAAW,EAAE,mBAAmB,CAAC,YAAY;YAC7C,KAAK,EAAE,mBAAmB,CAAC,KAAK;SACjC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAtDD,sCAsDC"}
+{"version":3,"file":"create-session.js","sourceRoot":"","sources":["create-session.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAElC,mDAA8C;AAE9C,yCAAoC;AACpC,+DAA0E;AAQ1E,SAAgB,aAAa,CAAC,EAC5B,MAAM,EACN,mBAAmB,EACnB,IAAI,EACJ,KAAK,GAMN;IACC,MAAM,cAAc,GAAI,mBAA4C;SACjE,eAAe,CAAC;IACnB,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEzC,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAC,CAAC;IAE9D,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,SAAiB,CAAC;QACtB,MAAM,YAAY,GAAG,mBAA2C,CAAC;QACjE,MAAM,EAAC,YAAY,EAAE,KAAK,EAAE,GAAG,IAAI,EAAC,GAAG,YAAY,CAAC;QACpD,MAAM,iBAAiB,GAAG,IAAI,IAAI,CAChC,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,UAAU,GAAG,IAAI,CAC5C,CAAC;QAEF,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,SAAS,GAAG,IAAA,+BAAe,EAAC,MAAM,CAAC,CACjC,IAAI,EACJ,GAAI,IAAyB,CAAC,eAAe,CAAC,EAAE,EAAE,CACnD,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,SAAS,GAAG,IAAA,SAAM,GAAE,CAAC;QACvB,CAAC;QAED,OAAO,IAAI,iBAAO,CAAC;YACjB,EAAE,EAAE,SAAS;YACb,IAAI;YACJ,KAAK;YACL,QAAQ;YACR,WAAW,EAAE,YAAY;YACzB,KAAK;YACL,OAAO,EAAE,iBAAiB;YAC1B,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,iBAAO,CAAC;YACjB,EAAE,EAAE,IAAA,4BAAY,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC;YAC9B,IAAI;YACJ,KAAK;YACL,QAAQ;YACR,WAAW,EAAE,mBAAmB,CAAC,YAAY;YAC7C,KAAK,EAAE,mBAAmB,CAAC,KAAK;SACjC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAtDD,sCAsDC"}

package/lib/auth/oauth/oauth.js

@@ -22,13 +22,12 @@ const logForBot = ({ request, log, func }) => {
     });
 };
 function begin(config) {
-    return (_a) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var { shop, callbackPath, isOnline } = _a, adapterArgs = tslib_1.__rest(_a, ["shop", "callbackPath", "isOnline"]);
+    return async ({ shop, callbackPath, isOnline, ...adapterArgs }) => {
         throwIfCustomStoreApp(config.isCustomStoreApp, 'Cannot perform OAuth for private apps');
         const log = (0, logger_1.logger)(config);
         log.info('Beginning OAuth', { shop, isOnline, callbackPath });
-        const request = yield (0, http_1.abstractConvertRequest)(adapterArgs);
-        const response = yield (0, http_1.abstractConvertIncomingResponse)(adapterArgs);
+        const request = await (0, http_1.abstractConvertRequest)(adapterArgs);
+        const response = await (0, http_1.abstractConvertIncomingResponse)(adapterArgs);
         let userAgent = request.headers['User-Agent'];
         if (Array.isArray(userAgent)) {
             userAgent = userAgent[0];
@@ -43,7 +42,7 @@ function begin(config) {
             secure: true,
         });
         const state = (0, nonce_1.nonce)();
-        yield cookies.setAndSign(types_2.STATE_COOKIE_NAME, state, {
+        await cookies.setAndSign(types_2.STATE_COOKIE_NAME, state, {
             expires: new Date(Date.now() + 60000),
             sameSite: 'lax',
             secure: true,
@@ -62,91 +61,90 @@ function begin(config) {
         const redirectUrl = `https://${cleanShop}/admin/oauth/authorize${processedQuery.stringify()}`;
         response.statusCode = 302;
         response.statusText = 'Found';
-        response.headers = Object.assign(Object.assign(Object.assign({}, response.headers), cookies.response.headers), { Location: redirectUrl });
+        response.headers = {
+            ...response.headers,
+            ...cookies.response.headers,
+            Location: redirectUrl,
+        };
         log.debug(`OAuth started, redirecting to ${redirectUrl}`, { shop, isOnline });
         return (0, http_1.abstractConvertResponse)(response, adapterArgs);
-    });
+    };
 }
 exports.begin = begin;
 function callback(config) {
-    return function callback(_a) {
-        var adapterArgs = tslib_1.__rest(_a, []);
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            throwIfCustomStoreApp(config.isCustomStoreApp, 'Cannot perform OAuth for private apps');
-            const log = (0, logger_1.logger)(config);
-            const request = yield (0, http_1.abstractConvertRequest)(adapterArgs);
-            const query = new URL(request.url, `${config.hostScheme}://${config.hostName}`).searchParams;
-            const shop = query.get('shop');
-            const response = {};
-            let userAgent = request.headers['User-Agent'];
-            if (Array.isArray(userAgent)) {
-                userAgent = userAgent[0];
-            }
-            if ((0, isbot_1.isbot)(userAgent)) {
-                logForBot({ request, log, func: 'callback' });
-                throw new ShopifyErrors.BotActivityDetected('Invalid OAuth callback initiated by bot');
-            }
-            log.info('Completing OAuth', { shop });
-            const cookies = new http_1.Cookies(request, response, {
-                keys: [config.apiSecretKey],
+    return async function callback({ ...adapterArgs }) {
+        throwIfCustomStoreApp(config.isCustomStoreApp, 'Cannot perform OAuth for private apps');
+        const log = (0, logger_1.logger)(config);
+        const request = await (0, http_1.abstractConvertRequest)(adapterArgs);
+        const query = new URL(request.url, `${config.hostScheme}://${config.hostName}`).searchParams;
+        const shop = query.get('shop');
+        const response = {};
+        let userAgent = request.headers['User-Agent'];
+        if (Array.isArray(userAgent)) {
+            userAgent = userAgent[0];
+        }
+        if ((0, isbot_1.isbot)(userAgent)) {
+            logForBot({ request, log, func: 'callback' });
+            throw new ShopifyErrors.BotActivityDetected('Invalid OAuth callback initiated by bot');
+        }
+        log.info('Completing OAuth', { shop });
+        const cookies = new http_1.Cookies(request, response, {
+            keys: [config.apiSecretKey],
+            secure: true,
+        });
+        const stateFromCookie = await cookies.getAndVerify(types_2.STATE_COOKIE_NAME);
+        cookies.deleteCookie(types_2.STATE_COOKIE_NAME);
+        if (!stateFromCookie) {
+            log.error('Could not find OAuth cookie', { shop });
+            throw new ShopifyErrors.CookieNotFound(`Cannot complete OAuth process. Could not find an OAuth cookie for shop url: ${shop}`);
+        }
+        const authQuery = Object.fromEntries(query.entries());
+        if (!(await validQuery({ config, query: authQuery, stateFromCookie }))) {
+            log.error('Invalid OAuth callback', { shop, stateFromCookie });
+            throw new ShopifyErrors.InvalidOAuthError('Invalid OAuth callback.');
+        }
+        log.debug('OAuth request is valid, requesting access token', { shop });
+        const body = {
+            client_id: config.apiKey,
+            client_secret: config.apiSecretKey,
+            code: query.get('code'),
+        };
+        const cleanShop = (0, shop_validator_1.sanitizeShop)(config)(query.get('shop'), true);
+        const postResponse = await (0, fetch_request_1.fetchRequestFactory)(config)(`https://${cleanShop}/admin/oauth/access_token`, {
+            method: 'POST',
+            body: JSON.stringify(body),
+            headers: {
+                'Content-Type': types_1.DataType.JSON,
+                Accept: types_1.DataType.JSON,
+            },
+        });
+        if (!postResponse.ok) {
+            (0, common_1.throwFailedRequest)(await postResponse.json(), false, postResponse);
+        }
+        const session = (0, create_session_1.createSession)({
+            accessTokenResponse: await postResponse.json(),
+            shop: cleanShop,
+            state: stateFromCookie,
+            config,
+        });
+        if (!config.isEmbeddedApp) {
+            await cookies.setAndSign(types_2.SESSION_COOKIE_NAME, session.id, {
+                expires: session.expires,
+                sameSite: 'lax',
                 secure: true,
+                path: '/',
             });
-            const stateFromCookie = yield cookies.getAndVerify(types_2.STATE_COOKIE_NAME);
-            cookies.deleteCookie(types_2.STATE_COOKIE_NAME);
-            if (!stateFromCookie) {
-                log.error('Could not find OAuth cookie', { shop });
-                throw new ShopifyErrors.CookieNotFound(`Cannot complete OAuth process. Could not find an OAuth cookie for shop url: ${shop}`);
-            }
-            const authQuery = Object.fromEntries(query.entries());
-            if (!(yield validQuery({ config, query: authQuery, stateFromCookie }))) {
-                log.error('Invalid OAuth callback', { shop, stateFromCookie });
-                throw new ShopifyErrors.InvalidOAuthError('Invalid OAuth callback.');
-            }
-            log.debug('OAuth request is valid, requesting access token', { shop });
-            const body = {
-                client_id: config.apiKey,
-                client_secret: config.apiSecretKey,
-                code: query.get('code'),
-            };
-            const cleanShop = (0, shop_validator_1.sanitizeShop)(config)(query.get('shop'), true);
-            const postResponse = yield (0, fetch_request_1.fetchRequestFactory)(config)(`https://${cleanShop}/admin/oauth/access_token`, {
-                method: 'POST',
-                body: JSON.stringify(body),
-                headers: {
-                    'Content-Type': types_1.DataType.JSON,
-                    Accept: types_1.DataType.JSON,
-                },
-            });
-            if (!postResponse.ok) {
-                (0, common_1.throwFailedRequest)(yield postResponse.json(), postResponse, false);
-            }
-            const session = (0, create_session_1.createSession)({
-                accessTokenResponse: yield postResponse.json(),
-                shop: cleanShop,
-                state: stateFromCookie,
-                config,
-            });
-            if (!config.isEmbeddedApp) {
-                yield cookies.setAndSign(types_2.SESSION_COOKIE_NAME, session.id, {
-                    expires: session.expires,
-                    sameSite: 'lax',
-                    secure: true,
-                    path: '/',
-                });
-            }
-            return {
-                headers: (yield (0, http_1.abstractConvertHeaders)(cookies.response.headers, adapterArgs)),
-                session,
-            };
-        });
+        }
+        return {
+            headers: (await (0, http_1.abstractConvertHeaders)(cookies.response.headers, adapterArgs)),
+            session,
+        };
     };
 }
 exports.callback = callback;
-function validQuery({ config, query, stateFromCookie, }) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return ((yield (0, hmac_validator_1.validateHmac)(config)(query)) &&
-            (0, safe_compare_1.safeCompare)(query.state, stateFromCookie));
-    });
+async function validQuery({ config, query, stateFromCookie, }) {
+    return ((await (0, hmac_validator_1.validateHmac)(config)(query)) &&
+        (0, safe_compare_1.safeCompare)(query.state, stateFromCookie));
 }
 function throwIfCustomStoreApp(isCustomStoreApp, message) {
     if (isCustomStoreApp) {

package/lib/auth/oauth/oauth.js.map

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

package/lib/auth/oauth/token-exchange.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tokenExchange = exports.RequestedTokenType = void 0;
-const tslib_1 = require("tslib");
 const common_1 = require("../../clients/common");
 const decode_session_token_1 = require("../../session/decode-session-token");
 const shop_validator_1 = require("../../utils/shop-validator");
@@ -16,8 +15,8 @@ var RequestedTokenType;
 const TokenExchangeGrantType = 'urn:ietf:params:oauth:grant-type:token-exchange';
 const IdTokenType = 'urn:ietf:params:oauth:token-type:id_token';
 function tokenExchange(config) {
-    return ({ shop, sessionToken, requestedTokenType, }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, decode_session_token_1.decodeSessionToken)(config)(sessionToken);
+    return async ({ shop, sessionToken, requestedTokenType, }) => {
+        await (0, decode_session_token_1.decodeSessionToken)(config)(sessionToken);
         const body = {
             client_id: config.apiKey,
             client_secret: config.apiSecretKey,
@@ -27,7 +26,7 @@ function tokenExchange(config) {
             requested_token_type: requestedTokenType,
         };
         const cleanShop = (0, shop_validator_1.sanitizeShop)(config)(shop, true);
-        const postResponse = yield (0, fetch_request_1.fetchRequestFactory)(config)(`https://${cleanShop}/admin/oauth/access_token`, {
+        const postResponse = await (0, fetch_request_1.fetchRequestFactory)(config)(`https://${cleanShop}/admin/oauth/access_token`, {
             method: 'POST',
             body: JSON.stringify(body),
             headers: {
@@ -36,18 +35,18 @@ function tokenExchange(config) {
             },
         });
         if (!postResponse.ok) {
-            (0, common_1.throwFailedRequest)(yield postResponse.json(), postResponse, false);
+            (0, common_1.throwFailedRequest)(await postResponse.json(), false, postResponse);
         }
         return {
             session: (0, create_session_1.createSession)({
-                accessTokenResponse: yield postResponse.json(),
+                accessTokenResponse: await postResponse.json(),
                 shop: cleanShop,
                 // We need to keep this as an empty string as our template DB schemas have this required
                 state: '',
                 config,
             }),
         };
-    });
+    };
 }
 exports.tokenExchange = tokenExchange;
 //# sourceMappingURL=token-exchange.js.map