@shopify/shopify-api 6.0.0-rc6 → 6.0.0-rc7

package/CHANGELOG.md

@@ -7,9 +7,9 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
 
-## [6.0.0-rc2] - 2022-10-04
+## [6.0.0-rc7] - 2022-10-25
 
-- ⚠️ [Breaking] Final release candidate for `6.0.0` release, which is a complete breaking change across all surfaces of the library
+- ⚠️ [Breaking] Latest release candidate for `6.0.0` release, which is a complete breaking change across all surfaces of the library
 
 ## [5.1.0] - 2022-09-19
 

package/adapters/cf-worker/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,OAAO,EAER,MAAM,oBAAoB,CAAC;AAE5B,UAAU,iBAAkB,SAAQ,WAAW;IAC7C,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,aAAK,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAExC,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,iBAAiB,CAAC,CAW5B;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,kBAAkB,EACxB,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,QAAQ,CAAC,CAMnB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,iBAAiB,GAC9B,OAAO,CAAC,aAAa,CAAC,CAExB;AAED,wBAAsB,WAAW,CAAC,EAChC,GAAG,EACH,MAAM,EACN,OAAY,EACZ,IAAI,GACL,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CASjD;AAED,wBAAgB,0BAA0B,IAAI,KAAK,CAIlD;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,OAAO,EAER,MAAM,oBAAoB,CAAC;AAE5B,UAAU,iBAAkB,SAAQ,WAAW;IAC7C,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,aAAK,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAExC,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,iBAAiB,CAAC,CAa5B;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,kBAAkB,EACxB,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,QAAQ,CAAC,CAMnB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,iBAAiB,GAC9B,OAAO,CAAC,aAAa,CAAC,CAExB;AAED,wBAAsB,WAAW,CAAC,EAChC,GAAG,EACH,MAAM,EACN,OAAY,EACZ,IAAI,GACL,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CASjD;AAED,wBAAgB,0BAA0B,IAAI,KAAK,CAIlD;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C"}

package/adapters/cf-worker/adapter.js

@@ -7,7 +7,7 @@ var http_1 = require("../../runtime/http");
 function workerConvertRequest(adapterArgs) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var request, headers, _b, _c, _d, key, value;
+        var request, headers, _b, _c, _d, key, value, url;
         var e_1, _e;
         return tslib_1.__generator(this, function (_f) {
             request = adapterArgs.rawRequest;
@@ -25,10 +25,11 @@ function workerConvertRequest(adapterArgs) {
                 }
                 finally { if (e_1) throw e_1.error; }
             }
+            url = new URL(request.url);
             return [2 /*return*/, {
                     headers: headers,
                     method: (_a = request.method) !== null && _a !== void 0 ? _a : 'GET',
-                    url: request.url,
+                    url: "".concat(url.pathname).concat(url.search).concat(url.hash),
                 }];
         });
     });

package/adapters/cf-worker/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;;AAAA,yCAA6C;AAC7C,2CAQ4B;AAQ5B,SAAsB,oBAAoB,CACxC,WAA8B;;;;;;YAExB,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC;YACjC,OAAO,GAAG,EAAE,CAAC;;gBACnB,KAA2B,KAAA,iBAAA,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA,4CAAE;oBAA3C,KAAA,2BAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;oBACpB,IAAA,gBAAS,EAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;iBAChC;;;;;;;;;YACD,sBAAO;oBACL,OAAO,SAAA;oBACP,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,KAAK;oBAC/B,GAAG,EAAE,OAAO,CAAC,GAAI;iBAClB,EAAC;;;CACH;AAbD,oDAaC;AAED,SAAsB,qBAAqB,CACzC,IAAwB,EACxB,WAA8B;;;;;;;;yBAEnB,QAAQ;kCAAC,IAAI,CAAC,IAAI;;wBAC3B,MAAM,EAAE,IAAI,CAAC,UAAU;wBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;;oBAClB,qBAAM,oBAAoB,CAAC,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE,EAAE,WAAW,CAAC,EAAA;wBAHtE,sBAAO,cAAI,QAAQ,cAGjB,UAAO,GAAE,SAA2D;qCACpE,EAAC;;;;CACJ;AATD,sDASC;AAED,SAAsB,oBAAoB,CACxC,OAAgB,EAChB,YAA+B;;;YAE/B,sBAAO,OAAO,CAAC,OAAO,CAAC,IAAA,kBAAW,EAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,CAAC,EAAC;;;CACpD;AALD,oDAKC;AAED,SAAsB,WAAW,CAAC,EAKd;QAJlB,GAAG,SAAA,EACH,MAAM,YAAA,EACN,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,IAAI,UAAA;;;;;wBAES,qBAAM,KAAK,CAAC,GAAG,EAAE,EAAC,MAAM,QAAA,EAAE,OAAO,EAAE,IAAA,kBAAW,EAAC,OAAO,CAAC,EAAE,IAAI,MAAA,EAAC,CAAC,EAAA;;oBAAtE,IAAI,GAAG,SAA+D;oBAC3D,qBAAM,IAAI,CAAC,IAAI,EAAE,EAAA;;oBAA5B,QAAQ,GAAG,SAAiB;oBAClC,sBAAO;4BACL,UAAU,EAAE,IAAI,CAAC,MAAM;4BACvB,UAAU,EAAE,IAAI,CAAC,UAAU;4BAC3B,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,IAAA,0BAAmB,EAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;yBACzE,EAAC;;;;CACH;AAdD,kCAcC;AAED,SAAgB,0BAA0B;IACxC,MAAM,IAAI,oBAAY,CACpB,0EAA0E,CAC3E,CAAC;AACJ,CAAC;AAJD,gEAIC;AAED,SAAgB,mBAAmB;IACjC,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAFD,kDAEC"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;;AAAA,yCAA6C;AAC7C,2CAQ4B;AAQ5B,SAAsB,oBAAoB,CACxC,WAA8B;;;;;;YAExB,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC;YACjC,OAAO,GAAG,EAAE,CAAC;;gBACnB,KAA2B,KAAA,iBAAA,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA,4CAAE;oBAA3C,KAAA,2BAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;oBACpB,IAAA,gBAAS,EAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;iBAChC;;;;;;;;;YAEK,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAI,CAAC,CAAC;YAClC,sBAAO;oBACL,OAAO,SAAA;oBACP,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,KAAK;oBAC/B,GAAG,EAAE,UAAG,GAAG,CAAC,QAAQ,SAAG,GAAG,CAAC,MAAM,SAAG,GAAG,CAAC,IAAI,CAAE;iBAC/C,EAAC;;;CACH;AAfD,oDAeC;AAED,SAAsB,qBAAqB,CACzC,IAAwB,EACxB,WAA8B;;;;;;;;yBAEnB,QAAQ;kCAAC,IAAI,CAAC,IAAI;;wBAC3B,MAAM,EAAE,IAAI,CAAC,UAAU;wBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;;oBAClB,qBAAM,oBAAoB,CAAC,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE,EAAE,WAAW,CAAC,EAAA;wBAHtE,sBAAO,cAAI,QAAQ,cAGjB,UAAO,GAAE,SAA2D;qCACpE,EAAC;;;;CACJ;AATD,sDASC;AAED,SAAsB,oBAAoB,CACxC,OAAgB,EAChB,YAA+B;;;YAE/B,sBAAO,OAAO,CAAC,OAAO,CAAC,IAAA,kBAAW,EAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,CAAC,EAAC;;;CACpD;AALD,oDAKC;AAED,SAAsB,WAAW,CAAC,EAKd;QAJlB,GAAG,SAAA,EACH,MAAM,YAAA,EACN,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,IAAI,UAAA;;;;;wBAES,qBAAM,KAAK,CAAC,GAAG,EAAE,EAAC,MAAM,QAAA,EAAE,OAAO,EAAE,IAAA,kBAAW,EAAC,OAAO,CAAC,EAAE,IAAI,MAAA,EAAC,CAAC,EAAA;;oBAAtE,IAAI,GAAG,SAA+D;oBAC3D,qBAAM,IAAI,CAAC,IAAI,EAAE,EAAA;;oBAA5B,QAAQ,GAAG,SAAiB;oBAClC,sBAAO;4BACL,UAAU,EAAE,IAAI,CAAC,MAAM;4BACvB,UAAU,EAAE,IAAI,CAAC,UAAU;4BAC3B,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,IAAA,0BAAmB,EAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;yBACzE,EAAC;;;;CACH;AAdD,kCAcC;AAED,SAAgB,0BAA0B;IACxC,MAAM,IAAI,oBAAY,CACpB,0EAA0E,CAC3E,CAAC;AACJ,CAAC;AAJD,gEAIC;AAED,SAAgB,mBAAmB;IACjC,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAFD,kDAEC"}

package/adapters/mock/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EACL,WAAW,EACX,cAAc,EAEd,OAAO,EACP,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAI5B,UAAU,eAAgB,SAAQ,WAAW;IAC3C,UAAU,EAAE,iBAAiB,CAAC;CAC/B;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,eAAe,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAE5B;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,kBAAkB,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CAE7B;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,cAAc,CAAC,CAEzB;AAED,wBAAsB,SAAS,CAAC,EAC9B,GAAG,EACH,MAAM,EACN,OAAY,EACZ,IAAI,GACL,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAajD;AAED,wBAAgB,wBAAwB,yBAEvC;AAED,wBAAgB,iBAAiB,WAEhC"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EACL,WAAW,EACX,cAAc,EAEd,OAAO,EACP,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAI5B,UAAU,eAAgB,SAAQ,WAAW;IAC3C,UAAU,EAAE,iBAAiB,CAAC;CAC/B;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,eAAe,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAE5B;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,kBAAkB,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CAE7B;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,cAAc,CAAC,CAEzB;AAED,wBAAsB,SAAS,CAAC,EAC9B,GAAG,EACH,MAAM,EACN,OAAY,EACZ,IAAI,GACL,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkBjD;AAED,wBAAgB,wBAAwB,yBAEvC;AAED,wBAAgB,iBAAiB,WAEhC"}

package/adapters/mock/adapter.js

@@ -41,6 +41,9 @@ function mockFetch(_a) {
                 body: body,
             });
             next = mock_test_requests_1.mockTestRequests.responseList.shift();
+            if (!next) {
+                throw new Error("Missing mock for ".concat(method, " to ").concat(url, ", have you queued all required responses?"));
+            }
             if (next instanceof Error) {
                 throw next;
             }

package/adapters/mock/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;;AAAA,uDAAkE;AAClE,2CAO4B;AAE5B,2DAAsD;AAMtD,SAAsB,kBAAkB,CACtC,WAA4B;;;YAE5B,sBAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,EAAC;;;CAChD;AAJD,gDAIC;AAED,SAAsB,mBAAmB,CACvC,QAA4B,EAC5B,YAA6B;;;YAE7B,sBAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAC;;;CAClC;AALD,kDAKC;AAED,SAAsB,kBAAkB,CACtC,OAAgB,EAChB,YAA6B;;;YAE7B,sBAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAC;;;CACjC;AALD,gDAKC;AAED,SAAsB,SAAS,CAAC,EAKZ;QAJlB,GAAG,SAAA,EACH,MAAM,YAAA,EACN,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,IAAI,UAAA;;;;YAEJ,qCAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBAChC,GAAG,KAAA;gBACH,MAAM,QAAA;gBACN,OAAO,EAAE,IAAA,0BAAmB,EAAC,OAAO,CAAC;gBACrC,IAAI,MAAA;aACL,CAAC,CAAC;YAEG,IAAI,GAAG,qCAAgB,CAAC,YAAY,CAAC,KAAK,EAAG,CAAC;YACpD,IAAI,IAAI,YAAY,KAAK,EAAE;gBACzB,MAAM,IAAI,CAAC;aACZ;YACD,sBAAO,IAAI,EAAC;;;CACb;AAlBD,8BAkBC;AAED,SAAgB,wBAAwB;IACtC,OAAO,IAAI,6BAAoB,EAAE,CAAC;AACpC,CAAC;AAFD,4DAEC;AAED,SAAgB,iBAAiB;IAC/B,OAAO,cAAc,CAAC;AACxB,CAAC;AAFD,8CAEC"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;;AAAA,uDAAkE;AAClE,2CAO4B;AAE5B,2DAAsD;AAMtD,SAAsB,kBAAkB,CACtC,WAA4B;;;YAE5B,sBAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,EAAC;;;CAChD;AAJD,gDAIC;AAED,SAAsB,mBAAmB,CACvC,QAA4B,EAC5B,YAA6B;;;YAE7B,sBAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAC;;;CAClC;AALD,kDAKC;AAED,SAAsB,kBAAkB,CACtC,OAAgB,EAChB,YAA6B;;;YAE7B,sBAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAC;;;CACjC;AALD,gDAKC;AAED,SAAsB,SAAS,CAAC,EAKZ;QAJlB,GAAG,SAAA,EACH,MAAM,YAAA,EACN,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,IAAI,UAAA;;;;YAEJ,qCAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBAChC,GAAG,KAAA;gBACH,MAAM,QAAA;gBACN,OAAO,EAAE,IAAA,0BAAmB,EAAC,OAAO,CAAC;gBACrC,IAAI,MAAA;aACL,CAAC,CAAC;YAEG,IAAI,GAAG,qCAAgB,CAAC,YAAY,CAAC,KAAK,EAAG,CAAC;YACpD,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CACb,2BAAoB,MAAM,iBAAO,GAAG,8CAA2C,CAChF,CAAC;aACH;YACD,IAAI,IAAI,YAAY,KAAK,EAAE;gBACzB,MAAM,IAAI,CAAC;aACZ;YACD,sBAAO,IAAI,EAAC;;;CACb;AAvBD,8BAuBC;AAED,SAAgB,wBAAwB;IACtC,OAAO,IAAI,6BAAoB,EAAE,CAAC;AACpC,CAAC;AAFD,4DAEC;AAED,SAAgB,iBAAiB;IAC/B,OAAO,cAAc,CAAC;AACxB,CAAC;AAFD,8CAEC"}

package/adapters/node/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,cAAc,EAAC,MAAM,MAAM,CAAC;AAK1D,OAAO,EAAC,oBAAoB,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EACL,WAAW,EAGX,OAAO,EACP,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,UAAU,eAAgB,SAAQ,WAAW;IAC3C,UAAU,EAAE,eAAe,CAAC;IAC5B,WAAW,EAAE,cAAc,CAAC;CAC7B;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,eAAe,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAO5B;AAED,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,kBAAkB,EAC5B,WAAW,EAAE,eAAe,GAC3B,OAAO,CAAC,IAAI,CAAC,CAef;AAED,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,eAAe,GAC3B,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,wBAAsB,SAAS,CAAC,EAC9B,GAAG,EACH,MAAM,EACN,OAAY,EACZ,IAAI,GACL,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CASjD;AAED,wBAAgB,wBAAwB,yBAOvC;AAED,wBAAgB,iBAAiB,WAEhC"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,cAAc,EAAC,MAAM,MAAM,CAAC;AAK1D,OAAO,EAAC,oBAAoB,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EACL,WAAW,EAGX,OAAO,EACP,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,UAAU,eAAgB,SAAQ,WAAW;IAC3C,UAAU,EAAE,eAAe,CAAC;IAC5B,WAAW,EAAE,cAAc,CAAC;CAC7B;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,eAAe,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAS5B;AAED,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,kBAAkB,EAC5B,WAAW,EAAE,eAAe,GAC3B,OAAO,CAAC,IAAI,CAAC,CAef;AAED,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,eAAe,GAC3B,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,wBAAsB,SAAS,CAAC,EAC9B,GAAG,EACH,MAAM,EACN,OAAY,EACZ,IAAI,GACL,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CASjD;AAED,wBAAgB,wBAAwB,yBAOvC;AAED,wBAAgB,iBAAiB,WAEhC"}

package/adapters/node/adapter.js

@@ -15,7 +15,8 @@ function nodeConvertRequest(adapterArgs) {
             return [2 /*return*/, {
                     headers: (0, http_1.canonicalizeHeaders)(tslib_1.__assign({}, req.headers)),
                     method: (_a = req.method) !== null && _a !== void 0 ? _a : 'GET',
-                    url: req.url,
+                    // Express.js overrides the url property, so we want to use originalUrl for it
+                    url: req.originalUrl || req.url,
                 }];
         });
     });

package/adapters/node/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;;AACA,sDAAwB;AAExB,kEAA+B;AAE/B,uDAAkE;AAClE,2CAO4B;AAO5B,SAAsB,kBAAkB,CACtC,WAA4B;;;;;YAEtB,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC;YACnC,sBAAO;oBACL,OAAO,EAAE,IAAA,0BAAmB,EAAC,qBAAI,GAAG,CAAC,OAAO,CAAQ,CAAC;oBACrD,MAAM,EAAE,MAAA,GAAG,CAAC,MAAM,mCAAI,KAAK;oBAC3B,GAAG,EAAE,GAAG,CAAC,GAAI;iBACd,EAAC;;;CACH;AATD,gDASC;AAED,SAAsB,0BAA0B,CAC9C,QAA4B,EAC5B,WAA4B;;;;;;oBAEtB,GAAG,GAAG,WAAW,CAAC,WAAW,CAAC;yBAEhC,QAAQ,CAAC,OAAO,EAAhB,wBAAgB;oBAClB,qBAAM,wBAAwB,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,EAAA;;oBAA7D,SAA6D,CAAC;;;oBAGhE,IAAI,QAAQ,CAAC,IAAI,EAAE;wBACjB,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;qBAC1B;oBAED,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;oBACrC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC;oBAExC,GAAG,CAAC,GAAG,EAAE,CAAC;;;;;CACX;AAlBD,gEAkBC;AAED,SAAsB,wBAAwB,CAC5C,OAAgB,EAChB,WAA4B;;;;YAEtB,GAAG,GAAG,WAAW,CAAC,WAAW,CAAC;YAEpC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,EAAe;oBAAf,KAAA,qBAAe,EAAd,MAAM,QAAA,EAAE,KAAK,QAAA;gBAC7C,OAAA,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC;YAA5B,CAA4B,CAC7B,CAAC;;;;CACH;AATD,4DASC;AAED,SAAsB,SAAS,CAAC,EAKZ;QAJlB,GAAG,SAAA,EACH,MAAM,YAAA,EACN,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,IAAI,UAAA;;;;;wBAES,qBAAM,IAAA,oBAAK,EAAC,GAAG,EAAE,EAAC,MAAM,QAAA,EAAE,OAAO,EAAE,IAAA,kBAAW,EAAC,OAAO,CAAC,EAAE,IAAI,MAAA,EAAC,CAAC,EAAA;;oBAAtE,IAAI,GAAG,SAA+D;oBAC3D,qBAAM,IAAI,CAAC,IAAI,EAAE,EAAA;;oBAA5B,QAAQ,GAAG,SAAiB;oBAClC,sBAAO;4BACL,UAAU,EAAE,IAAI,CAAC,MAAM;4BACvB,UAAU,EAAE,IAAI,CAAC,UAAU;4BAC3B,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,IAAA,0BAAmB,EAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;yBACzE,EAAC;;;;CACH;AAdD,8BAcC;AAED,SAAgB,wBAAwB;IACtC,IAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CACtB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAClE,iBAAiB,CAClB,CAAC;IAEF,OAAO,IAAI,6BAAoB,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC;AAPD,4DAOC;AAED,SAAgB,iBAAiB;IAC/B,OAAO,eAAQ,OAAO,CAAC,OAAO,CAAE,CAAC;AACnC,CAAC;AAFD,8CAEC"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["adapter.ts"],"names":[],"mappings":";;;;AACA,sDAAwB;AAExB,kEAA+B;AAE/B,uDAAkE;AAClE,2CAO4B;AAO5B,SAAsB,kBAAkB,CACtC,WAA4B;;;;;YAEtB,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC;YAEnC,sBAAO;oBACL,OAAO,EAAE,IAAA,0BAAmB,EAAC,qBAAI,GAAG,CAAC,OAAO,CAAQ,CAAC;oBACrD,MAAM,EAAE,MAAA,GAAG,CAAC,MAAM,mCAAI,KAAK;oBAC3B,8EAA8E;oBAC9E,GAAG,EAAG,GAAW,CAAC,WAAW,IAAI,GAAG,CAAC,GAAI;iBAC1C,EAAC;;;CACH;AAXD,gDAWC;AAED,SAAsB,0BAA0B,CAC9C,QAA4B,EAC5B,WAA4B;;;;;;oBAEtB,GAAG,GAAG,WAAW,CAAC,WAAW,CAAC;yBAEhC,QAAQ,CAAC,OAAO,EAAhB,wBAAgB;oBAClB,qBAAM,wBAAwB,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,EAAA;;oBAA7D,SAA6D,CAAC;;;oBAGhE,IAAI,QAAQ,CAAC,IAAI,EAAE;wBACjB,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;qBAC1B;oBAED,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;oBACrC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC;oBAExC,GAAG,CAAC,GAAG,EAAE,CAAC;;;;;CACX;AAlBD,gEAkBC;AAED,SAAsB,wBAAwB,CAC5C,OAAgB,EAChB,WAA4B;;;;YAEtB,GAAG,GAAG,WAAW,CAAC,WAAW,CAAC;YAEpC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,EAAe;oBAAf,KAAA,qBAAe,EAAd,MAAM,QAAA,EAAE,KAAK,QAAA;gBAC7C,OAAA,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC;YAA5B,CAA4B,CAC7B,CAAC;;;;CACH;AATD,4DASC;AAED,SAAsB,SAAS,CAAC,EAKZ;QAJlB,GAAG,SAAA,EACH,MAAM,YAAA,EACN,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,IAAI,UAAA;;;;;wBAES,qBAAM,IAAA,oBAAK,EAAC,GAAG,EAAE,EAAC,MAAM,QAAA,EAAE,OAAO,EAAE,IAAA,kBAAW,EAAC,OAAO,CAAC,EAAE,IAAI,MAAA,EAAC,CAAC,EAAA;;oBAAtE,IAAI,GAAG,SAA+D;oBAC3D,qBAAM,IAAI,CAAC,IAAI,EAAE,EAAA;;oBAA5B,QAAQ,GAAG,SAAiB;oBAClC,sBAAO;4BACL,UAAU,EAAE,IAAI,CAAC,MAAM;4BACvB,UAAU,EAAE,IAAI,CAAC,UAAU;4BAC3B,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,IAAA,0BAAmB,EAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;yBACzE,EAAC;;;;CACH;AAdD,8BAcC;AAED,SAAgB,wBAAwB;IACtC,IAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CACtB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAClE,iBAAiB,CAClB,CAAC;IAEF,OAAO,IAAI,6BAAoB,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC;AAPD,4DAOC;AAED,SAAgB,iBAAiB;IAC/B,OAAO,eAAQ,OAAO,CAAC,OAAO,CAAE,CAAC;AACnC,CAAC;AAFD,8CAEC"}

package/docs/migrating-to-v6.md

@@ -156,7 +156,9 @@ app.post('/webhooks', async (req, res) => {
     });
   } catch (error) {
     if (error instanceof InvalidWebhookError) {
-      console.log(`Webhook processing error:\n\tmessage = ${error.message}\n\tresponse = ${error.response}`);
+      console.log(
+        `Webhook processing error:\n\tmessage = ${error.message}\n\tresponse = ${error.response}`,
+      );
     } else {
       console.log('Other error:\n\t', error);
     }
@@ -235,14 +237,14 @@ app.post('/webhooks', async (req, res) => {
 
    </div>
 
-1. The `isActive()` method of `Session` now takes a `scopes` parameter.  If the scopes of the session don't match the scopes of the application (e.g., app has been restarted with new scopes), the session is deemed to be inactive and OAuth should be initiated again.
+1. The `isActive()` method of `Session` now takes a `scopes` parameter. If the scopes of the session don't match the scopes of the application (e.g., app has been restarted with new scopes), the session is deemed to be inactive and OAuth should be initiated again.
    <div>Before
 
    ```ts
    const session = await Shopify.Utils.loadCurrentSession(req, res);
 
    if (!session.isActive()) {
-    // current session is not active - either expired or scopes have changed
+     // current session is not active - either expired or scopes have changed
    }
    ```
 
@@ -256,7 +258,7 @@ app.post('/webhooks', async (req, res) => {
    });
 
    if (!session.isActive(shopify.config.scopes)) {
-    // current session is not active - either expired or scopes have changed
+     // current session is not active - either expired or scopes have changed
    }
    ```
 
@@ -716,54 +718,58 @@ Here are all the specific changes that we made to the `Utils` object:
 
 ## Changes to webhook functions
 
-1. `Shopify.Webhooks.Registry.addHandler` is now `shopify.webhooks.addHttpHandler`, and the parameters are now in a single object parameter. It also no longer takes a `path` in the parameter object.
-   <div>Before
+In v6, apps can now set up multiple handlers per webhook topic, and we simplified the library's interface to reduce the number of methods needed.
 
-   ```ts
-   Shopify.Webhooks.Registry.addHandler("PRODUCTS_CREATE", {
-     path: "/webhooks",
-     webhookHandler: handleWebhookRequest,
-   });
-   ```
+The following methods are now available:
 
-   </div><div>:warning: After
+- `addHandlers`
+- `register`
+- `process`
+- `getHandlers`
+- `getTopicsAdded` replaces the previous `getTopics`
 
-   ```ts
-   shopify.webhooks.addHttpHandler({
-     topic: "PRODUCTS_CREATE",
-     handler: handleWebhookRequest,
-   });
-   ```
+And the following methods are no longer supported:
 
-   </div>
+- `addHandler`
+- `registerAll`
+- `getHandler`
+- `isWebhookPath`
+
+For more details on the updated webhook functions, see the [documentation](./usage/webhooks.md).
+
+Below are instructions on how webhooks work now:
+
+1. You can call `shopify.webhooks.addHandlers` with a list of handlers, indexed by topic. Note that you must now use delivery method-specific fields instead of `path`, like `callbackUrl` and `arn`, to match the GrahpQL API behavior.
 
-1. `Shopify.Webhooks.Registry.addHandlers` is now `shopify.webhooks.addHttpHandlers`, and now takes an array of `addHttpHandler` params.
    <div>Before
 
    ```ts
-   Shopify.Webhooks.Registry.addHandlers({
-     PRODUCTS_CREATE: {
-       path: '/webhooks',
-       webhookHandler: productCreateWebhookHandler,
-     },
-     PRODUCTS_DELETE: {
-       path: '/webhooks',
-       webhookHandler: productDeleteWebhookHandler},
+   Shopify.Webhooks.Registry.addHandler('PRODUCTS_CREATE', {
+     path: '/webhooks',
+     webhookHandler: handleWebhookRequest,
    });
    ```
 
    </div><div>:warning: After
 
    ```ts
-   shopify.webhooks.addHttpHandlers([
-     {topic: 'PRODUCTS_CREATE', handler: productCreateWebhookHandler},
-     {topic: 'PRODUCTS_DELETE', handler: productDeleteWebhookHandler},
-   ]);
+   shopify.webhooks.addHandlers({
+     PRODUCTS_CREATE: {
+       deliveryMethod: DeliveryMethod.Http,
+       callbackUrl: '/webhooks',
+       callback: handleWebhookRequest,
+     },
+     TOPIC_1: [handler, handler2],
+     TOPIC_2: handler3,
+   });
    ```
 
    </div>
 
-1. `Shopify.Webhooks.Registry.register` is now `shopify.webhooks.register`.
+> **Note**: if you're using TypeScript, the handlers are typed based on the `deliveryMethod` you select.
+
+1. `Shopify.Webhooks.Registry.register` is now `shopify.webhooks.register`, and it now only takes in the session fields. It will register any handlers you added, and delete registrations that don't match the new configuration. That means the final webhooks registered for a shop will always match your configuration.
+
    <div>Before
 
    ```ts
@@ -779,39 +785,16 @@ Here are all the specific changes that we made to the `Utils` object:
 
    ```ts
    const response = await shopify.webhooks.register({
-     path: '/webhooks',
-     topic: 'PRODUCTS_CREATE',
-     accessToken: session.accessToken,
-     shop: session.shop,
-   });
-   ```
-
-   </div>
-
-1. `Shopify.Webhooks.Registry.registerAll` is now `shopify.webhooks.registerAllHttp`, and now accepts a `path` in its parameter object with which to register all topic handlers added to the HTTP registry.
-   <div>Before
-
-   ```ts
-   const response = await Shopify.Webhooks.Registry.registerAll({
      accessToken: session.accessToken,
      shop: session.shop,
    });
-   ```
-
-   </div><div>:warning: After
 
-   ```ts
-   const response = await shopify.webhooks.registerAllHttp({
-     path: '/webhooks',
-     accessToken: session.accessToken,
-     shop: session.shop,
-   });
+   // Response will be a list indexed by topic:
+   console.log(response[topic][0].success, response[topic][0].result);
    ```
 
    </div>
 
-1. `Shopify.Webhooks.Registry.isWebhookPath` has been deprecated.
-
 1. `Shopify.Webhooks.Registry.process` is now `shopify.webhooks.process`, and it takes the body as an argument instead of parsing it from the request. This will make it easier for apps to use a body parser with this function.
    <div>Before
 
@@ -846,7 +829,7 @@ Here are all the specific changes that we made to the `Utils` object:
 
    </div>
 
-1. `Shopify.Webhooks.Registry.getHandler` is now `shopify.webhooks.getHttpHandler`, and simply returns the handler function for the given topic.
+1. `Shopify.Webhooks.Registry.getHandler` is now `shopify.webhooks.getHandlers`, and returns all handler configurations for that topic.
    <div>Before
 
    ```ts
@@ -863,13 +846,16 @@ Here are all the specific changes that we made to the `Utils` object:
    </div><div>:warning: After
 
    ```ts
-   shopify.webhooks.addHttpHandler({
-     topic: 'PRODUCTS',
-     handler: productsWebhookHandler,
+   shopify.webhooks.addHandlers({
+     PRODUCTS: {
+       deliveryMethod: DeliveryMethod.Http,
+       callbackUrl: '/webhooks',
+       callback: productsWebhookHandler,
+     },
    });
 
-   const productsHandler = shopify.webhooks.getHttpHandler('PRODUCTS');
-   // productsHandler = productsWebhookHandler
+   // Is an array of handler configurations
+   const handlers = shopify.webhooks.getHandlers('PRODUCTS');
    ```
 
    </div>
@@ -885,7 +871,8 @@ Here are all the specific changes that we made to the `Utils` object:
      },
      PRODUCTS_DELETE: {
        path: '/webhooks',
-       webhookHandler: productDeleteWebhookHandler},
+       webhookHandler: productDeleteWebhookHandler,
+     },
    });
 
    const topics = Shopify.Webhooks.Registry.getTopics();
@@ -895,10 +882,18 @@ Here are all the specific changes that we made to the `Utils` object:
    </div><div>:warning: After
 
    ```ts
-   shopify.webhooks.addHttpHandlers([
-     {topic: 'PRODUCTS_CREATE', handler: productCreateWebhookHandler},
-     {topic: 'PRODUCTS_DELETE', handler: productDeleteWebhookHandler},
-   ]);
+   shopify.webhooks.addHandlers({
+     PRODUCTS_CREATE: {
+       deliveryMethod: DeliveryMethod.Http,
+       callbackUrl: '/webhooks',
+       callback: productCreateWebhookHandler,
+     },
+     PRODUCTS_DELETE: {
+       deliveryMethod: DeliveryMethod.Http,
+       callbackUrl: '/webhooks',
+       callback: productDeleteWebhookHandler,
+     },
+   });
 
    const topics = shopify.webhooks.getTopicsAdded();
    // topics = ['PRODUCTS_CREATE', 'PRODUCTS_DELETE']
@@ -917,13 +912,13 @@ Starting with v6, they can now be accessed via the shopify API directly.
 <div>Before
 
 ```ts
-app.get("/api/products/count", async (req, res) => {
+app.get('/api/products/count', async (req, res) => {
   const session = await Shopify.Utils.loadCurrentSession(req, res, false);
-  const { Product } = await import(
+  const {Product} = await import(
     `@shopify/shopify-api/dist/rest-resources/${Shopify.Context.API_VERSION}/index.js`
   );
 
-  const countData = await Product.count({ session });
+  const countData = await Product.count({session});
   res.status(200).send(countData);
 });
 ```
@@ -931,8 +926,8 @@ app.get("/api/products/count", async (req, res) => {
 </div><div>:warning: After
 
 ```ts
-import {shopifyApi, ApiVersion} from "@shopify/shopify-api";
-import {restResources} from '@shopify/shopify-api/rest/admin/2022-10';  // must match apiVersion used for shopifyApi()
+import {shopifyApi, ApiVersion} from '@shopify/shopify-api';
+import {restResources} from '@shopify/shopify-api/rest/admin/2022-10'; // must match apiVersion used for shopifyApi()
 
 const shopify = shopifyApi({
   // ...
@@ -942,14 +937,14 @@ const shopify = shopifyApi({
 
 // ...
 
-app.get("/api/products/count", async (req, res) => {
+app.get('/api/products/count', async (req, res) => {
   const session = await shopify.session.getCurrent({
     isOnline: false,
     rawRequest: req,
     rawResponse: res,
   });
 
-  const countData = await shopify.rest.Product.count({ session });
+  const countData = await shopify.rest.Product.count({session});
   res.status(200).send(countData);
 });
 ```