@vendure/core 1.6.4 → 1.7.1

package/dist/entity/product-variant/product-variant-asset.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-variant-asset.entity.js","sourceRoot":"","sources":["../../../src/entity/product-variant/product-variant-asset.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAAoD;AAEpD,4EAAiE;AAEjE,qEAA0D;AAG1D,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,uCAAc;IACnD,YAAY,KAAwC;QAChD,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAMJ,CAAA;AAJG;IADC,gBAAM,EAAE;;6DACY;AAGrB;IADC,mBAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,uCAAc,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BAC1E,uCAAc;2DAAC;AARtB,mBAAmB;IAD/B,gBAAM,EAAE;;GACI,mBAAmB,CAS/B;AATY,kDAAmB"}
+{"version":3,"file":"product-variant-asset.entity.js","sourceRoot":"","sources":["../../../src/entity/product-variant/product-variant-asset.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mEAAmE;AACnE,qCAAoD;AAEpD,4EAAiE;AAEjE,qEAA0D;AAG1D,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,uCAAc;IACnD,YAAY,KAAwC;QAChD,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAMJ,CAAA;AAJG;IADC,gBAAM,EAAE;kDACS,iBAAE,oBAAF,iBAAE;6DAAC;AAGrB;IADC,mBAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,uCAAc,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BAC1E,uCAAc;2DAAC;AARtB,mBAAmB;IAD/B,gBAAM,EAAE;yDAEe,0BAAW,oBAAX,0BAAW;GADtB,mBAAmB,CAS/B;AATY,kDAAmB"}

package/dist/entity/role/role.entity.js

@@ -8,8 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Role = void 0;
+const shared_types_1 = require("@vendure/common/lib/shared-types");
 const typeorm_1 = require("typeorm");
 const base_entity_1 = require("../base/base.entity");
 const channel_entity_1 = require("../channel/channel.entity");
@@ -44,7 +46,7 @@ __decorate([
 ], Role.prototype, "channels", void 0);
 Role = __decorate([
     typeorm_1.Entity(),
-    __metadata("design:paramtypes", [Object])
+    __metadata("design:paramtypes", [typeof (_a = typeof shared_types_1.DeepPartial !== "undefined" && shared_types_1.DeepPartial) === "function" ? _a : Object])
 ], Role);
 exports.Role = Role;
 //# sourceMappingURL=role.entity.js.map

package/dist/entity/role/role.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../src/entity/role/role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,qCAAgE;AAGhE,qDAAoD;AACpD,8DAAoD;AAEpD;;;;;;GAMG;AAEH,IAAa,IAAI,GAAjB,MAAa,IAAK,SAAQ,2BAAa;IACnC,YAAY,KAAyB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAWJ,CAAA;AATa;IAAT,gBAAM,EAAE;;kCAAc;AAEb;IAAT,gBAAM,EAAE;;yCAAqB;AAEN;IAAvB,gBAAM,CAAC,cAAc,CAAC;;yCAA2B;AAIlD;IAFC,oBAAU,CAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,CAAC;IAC3B,mBAAS,EAAE;;sCACQ;AAbX,IAAI;IADhB,gBAAM,EAAE;;GACI,IAAI,CAchB;AAdY,oBAAI"}
+{"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../src/entity/role/role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,mEAA+D;AAC/D,qCAAgE;AAGhE,qDAAoD;AACpD,8DAAoD;AAEpD;;;;;;GAMG;AAEH,IAAa,IAAI,GAAjB,MAAa,IAAK,SAAQ,2BAAa;IACnC,YAAY,KAAyB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAWJ,CAAA;AATa;IAAT,gBAAM,EAAE;;kCAAc;AAEb;IAAT,gBAAM,EAAE;;yCAAqB;AAEN;IAAvB,gBAAM,CAAC,cAAc,CAAC;;yCAA2B;AAIlD;IAFC,oBAAU,CAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,CAAC;IAC3B,mBAAS,EAAE;;sCACQ;AAbX,IAAI;IADhB,gBAAM,EAAE;yDAEe,0BAAW,oBAAX,0BAAW;GADtB,IAAI,CAchB;AAdY,oBAAI"}

package/dist/entity/tag/tag.entity.js

@@ -8,8 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tag = void 0;
+const shared_types_1 = require("@vendure/common/lib/shared-types");
 const typeorm_1 = require("typeorm");
 const base_entity_1 = require("../base/base.entity");
 /**
@@ -30,7 +32,7 @@ __decorate([
 ], Tag.prototype, "value", void 0);
 Tag = __decorate([
     typeorm_1.Entity(),
-    __metadata("design:paramtypes", [Object])
+    __metadata("design:paramtypes", [typeof (_a = typeof shared_types_1.DeepPartial !== "undefined" && shared_types_1.DeepPartial) === "function" ? _a : Object])
 ], Tag);
 exports.Tag = Tag;
 //# sourceMappingURL=tag.entity.js.map

package/dist/entity/tag/tag.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag.entity.js","sourceRoot":"","sources":["../../../src/entity/tag/tag.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAAyC;AAEzC,qDAAoD;AAEpD;;;;;;GAMG;AAEH,IAAa,GAAG,GAAhB,MAAa,GAAI,SAAQ,2BAAa;IAClC,YAAY,KAAwB;QAChC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAIJ,CAAA;AADG;IADC,gBAAM,EAAE;;kCACK;AANL,GAAG;IADf,gBAAM,EAAE;;GACI,GAAG,CAOf;AAPY,kBAAG"}
+{"version":3,"file":"tag.entity.js","sourceRoot":"","sources":["../../../src/entity/tag/tag.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mEAA+D;AAC/D,qCAAyC;AAEzC,qDAAoD;AAEpD;;;;;;GAMG;AAEH,IAAa,GAAG,GAAhB,MAAa,GAAI,SAAQ,2BAAa;IAClC,YAAY,KAAwB;QAChC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAIJ,CAAA;AADG;IADC,gBAAM,EAAE;;kCACK;AANL,GAAG;IADf,gBAAM,EAAE;yDAEe,0BAAW,oBAAX,0BAAW;GADtB,GAAG,CAOf;AAPY,kBAAG"}

package/dist/entity/user/user.entity.js

@@ -8,8 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = void 0;
+const shared_types_1 = require("@vendure/common/lib/shared-types");
 const typeorm_1 = require("typeorm");
 const errors_1 = require("../../common/error/errors");
 const authentication_method_entity_1 = require("../authentication-method/authentication-method.entity");
@@ -70,7 +72,7 @@ __decorate([
 ], User.prototype, "customFields", void 0);
 User = __decorate([
     typeorm_1.Entity(),
-    __metadata("design:paramtypes", [Object])
+    __metadata("design:paramtypes", [typeof (_a = typeof shared_types_1.DeepPartial !== "undefined" && shared_types_1.DeepPartial) === "function" ? _a : Object])
 ], User);
 exports.User = User;
 //# sourceMappingURL=user.entity.js.map

package/dist/entity/user/user.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/entity/user/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAA2E;AAE3E,sDAAgE;AAGhE,wGAA6F;AAC7F,sHAA0G;AAC1G,qDAAoD;AACpD,kEAA2D;AAC3D,qDAA2C;AAE3C;;;;;;GAMG;AAEH,IAAa,IAAI,GAAjB,MAAa,IAAK,SAAQ,2BAAa;IACnC,YAAY,KAAyB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IA2BD,6BAA6B;QACzB,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7B,MAAM,IAAI,4BAAmB,CAAC,8CAA8C,CAAC,CAAC;SACjF;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CACzC,CAAC,CAAC,EAAmC,EAAE,CAAC,CAAC,YAAY,gEAA0B,CAClF,CAAC;QACF,IAAI,CAAC,KAAK,EAAE;YACR,MAAM,IAAI,4BAAmB,CAAC,+CAA+C,CAAC,CAAC;SAClF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AApCG;IADC,gBAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAChB;AAGvB;IADC,gBAAM,EAAE;;wCACU;AAMnB;IAJC,mBAAS,CACN,IAAI,CAAC,EAAE,CAAC,mDAAoB,EAC5B,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CACxB;;mDAC6C;AAG9C;IADC,gBAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;sCACT;AAIlB;IAFC,oBAAU,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAI,CAAC;IACxB,mBAAS,EAAE;;mCACE;AAGd;IADC,gBAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAChB;AAGvB;IADC,gBAAM,CAAC,IAAI,CAAC,EAAE,CAAC,uCAAgB,CAAC;8BACnB,uCAAgB;0CAAC;AA5BtB,IAAI;IADhB,gBAAM,EAAE;;GACI,IAAI,CA0ChB;AA1CY,oBAAI"}
+{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/entity/user/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mEAA+D;AAC/D,qCAA2E;AAE3E,sDAAgE;AAGhE,wGAA6F;AAC7F,sHAA0G;AAC1G,qDAAoD;AACpD,kEAA2D;AAC3D,qDAA2C;AAE3C;;;;;;GAMG;AAEH,IAAa,IAAI,GAAjB,MAAa,IAAK,SAAQ,2BAAa;IACnC,YAAY,KAAyB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IA2BD,6BAA6B;QACzB,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7B,MAAM,IAAI,4BAAmB,CAAC,8CAA8C,CAAC,CAAC;SACjF;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CACzC,CAAC,CAAC,EAAmC,EAAE,CAAC,CAAC,YAAY,gEAA0B,CAClF,CAAC;QACF,IAAI,CAAC,KAAK,EAAE;YACR,MAAM,IAAI,4BAAmB,CAAC,+CAA+C,CAAC,CAAC;SAClF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AApCG;IADC,gBAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAChB;AAGvB;IADC,gBAAM,EAAE;;wCACU;AAMnB;IAJC,mBAAS,CACN,IAAI,CAAC,EAAE,CAAC,mDAAoB,EAC5B,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CACxB;;mDAC6C;AAG9C;IADC,gBAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;sCACT;AAIlB;IAFC,oBAAU,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAI,CAAC;IACxB,mBAAS,EAAE;;mCACE;AAGd;IADC,gBAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAChB;AAGvB;IADC,gBAAM,CAAC,IAAI,CAAC,EAAE,CAAC,uCAAgB,CAAC;8BACnB,uCAAgB;0CAAC;AA5BtB,IAAI;IADhB,gBAAM,EAAE;yDAEe,0BAAW,oBAAX,0BAAW;GADtB,IAAI,CA0ChB;AA1CY,oBAAI"}

package/dist/entity/zone/zone.entity.js

@@ -8,8 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Zone = void 0;
+const shared_types_1 = require("@vendure/common/lib/shared-types");
 const typeorm_1 = require("typeorm");
 const base_entity_1 = require("../base/base.entity");
 const country_entity_1 = require("../country/country.entity");
@@ -41,7 +43,7 @@ __decorate([
 ], Zone.prototype, "customFields", void 0);
 Zone = __decorate([
     typeorm_1.Entity(),
-    __metadata("design:paramtypes", [Object])
+    __metadata("design:paramtypes", [typeof (_a = typeof shared_types_1.DeepPartial !== "undefined" && shared_types_1.DeepPartial) === "function" ? _a : Object])
 ], Zone);
 exports.Zone = Zone;
 //# sourceMappingURL=zone.entity.js.map

package/dist/entity/zone/zone.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"zone.entity.js","sourceRoot":"","sources":["../../../src/entity/zone/zone.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAAgE;AAGhE,qDAAoD;AACpD,8DAAoD;AACpD,kEAA2D;AAE3D;;;;;;GAMG;AAEH,IAAa,IAAI,GAAjB,MAAa,IAAK,SAAQ,2BAAa;IACnC,YAAY,KAAyB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAUJ,CAAA;AARa;IAAT,gBAAM,EAAE;;kCAAc;AAIvB;IAFC,oBAAU,CAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,CAAC;IAC3B,mBAAS,EAAE;;qCACO;AAGnB;IADC,gBAAM,CAAC,IAAI,CAAC,EAAE,CAAC,uCAAgB,CAAC;8BACnB,uCAAgB;0CAAC;AAZtB,IAAI;IADhB,gBAAM,EAAE;;GACI,IAAI,CAahB;AAbY,oBAAI"}
+{"version":3,"file":"zone.entity.js","sourceRoot":"","sources":["../../../src/entity/zone/zone.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mEAA+D;AAC/D,qCAAgE;AAGhE,qDAAoD;AACpD,8DAAoD;AACpD,kEAA2D;AAE3D;;;;;;GAMG;AAEH,IAAa,IAAI,GAAjB,MAAa,IAAK,SAAQ,2BAAa;IACnC,YAAY,KAAyB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAUJ,CAAA;AARa;IAAT,gBAAM,EAAE;;kCAAc;AAIvB;IAFC,oBAAU,CAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,CAAC;IAC3B,mBAAS,EAAE;;qCACO;AAGnB;IADC,gBAAM,CAAC,IAAI,CAAC,EAAE,CAAC,uCAAgB,CAAC;8BACnB,uCAAgB;0CAAC;AAZtB,IAAI;IADhB,gBAAM,EAAE;yDAEe,0BAAW,oBAAX,0BAAW;GADtB,IAAI,CAahB;AAbY,oBAAI"}

package/dist/event-bus/event-bus.js

@@ -13,6 +13,7 @@ exports.EventBus = void 0;
 const common_1 = require("@nestjs/common");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const shared_utils_1 = require("../../../common/lib/shared-utils");
 const request_context_1 = require("../api/common/request-context");
 const constants_1 = require("../common/constants");
 const transaction_subscriber_1 = require("../connection/transaction-subscriber");
@@ -82,7 +83,7 @@ let EventBus = class EventBus {
      * data related to the event.
      */
     ofType(type) {
-        return this.eventStream.asObservable().pipe(operators_1.takeUntil(this.destroy$), operators_1.filter(e => e.constructor === type), operators_1.mergeMap(event => this.awaitActiveTransactions(event)));
+        return this.eventStream.asObservable().pipe(operators_1.takeUntil(this.destroy$), operators_1.filter(e => e.constructor === type), operators_1.mergeMap(event => this.awaitActiveTransactions(event)), operators_1.filter(shared_utils_1.notNullOrUndefined));
     }
     /** @internal */
     onModuleDestroy() {
@@ -117,7 +118,8 @@ let EventBus = class EventBus {
         if (!(transactionManager === null || transactionManager === void 0 ? void 0 : transactionManager.queryRunner)) {
             return event;
         }
-        return this.transactionSubscriber.awaitRelease(transactionManager.queryRunner).then(() => {
+        try {
+            await this.transactionSubscriber.awaitCommit(transactionManager.queryRunner);
             // Copy context and remove transaction manager
             // This will prevent queries to released query runner
             const newContext = ctx.copy();
@@ -125,7 +127,16 @@ let EventBus = class EventBus {
             // Reassign new context
             event[key] = newContext;
             return event;
-        });
+        }
+        catch (e) {
+            if (e instanceof transaction_subscriber_1.TransactionSubscriberError) {
+                // Expected commit, but rollback or something else happened.
+                // This is still reliable behavior, return undefined
+                // as event should not be exposed from this transaction
+                return;
+            }
+            throw e;
+        }
     }
 };
 EventBus = __decorate([

package/dist/event-bus/event-bus.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../src/event-bus/event-bus.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA6D;AAE7D,+BAA2C;AAC3C,8CAA6D;AAG7D,mEAA+D;AAC/D,mDAA8D;AAC9D,iFAA6E;AAI7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA0CK;AAEL,IAAa,QAAQ,GAArB,MAAa,QAAQ;IAIjB,YAAoB,qBAA4C;QAA5C,0BAAqB,GAArB,qBAAqB,CAAuB;QAHxD,gBAAW,GAAG,IAAI,cAAO,EAAgB,CAAC;QAC1C,aAAQ,GAAG,IAAI,cAAO,EAAE,CAAC;IAEkC,CAAC;IAEpE;;;OAGG;IACH,OAAO,CAAyB,KAAQ;QACpC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAyB,IAAa;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,IAAI,CACvC,qBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EACxB,kBAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAS,CAAC,WAAW,KAAK,IAAI,CAAC,EAC5C,oBAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CACxC,CAAC;IACvB,CAAC;IAED,gBAAgB;IAChB,eAAe;QACX,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACK,KAAK,CAAC,uBAAuB,CAAyB,KAAQ;QAClE,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,YAAY,gCAAc,CAAC,CAAC;QAE1F,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAA6B,KAAK,CAAC;QAEnD,MAAM,kBAAkB,GAA+B,GAAW,CAAC,mCAAuB,CAAC,CAAC;QAC5F,IAAI,CAAC,CAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,WAAW,CAAA,EAAE;YAClC,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACrF,8CAA8C;YAC9C,qDAAqD;YACrD,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,OAAQ,UAAkB,CAAC,mCAAuB,CAAC,CAAC;YAEpD,uBAAuB;YACtB,KAAa,CAAC,GAAG,CAAC,GAAG,UAAU,CAAA;YAEhC,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAjFY,QAAQ;IADpB,mBAAU,EAAE;qCAKkC,8CAAqB;GAJvD,QAAQ,CAiFpB;AAjFY,4BAAQ"}
+{"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../src/event-bus/event-bus.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA6D;AAE7D,+BAA2C;AAC3C,8CAA6D;AAE7D,mEAAsE;AAEtE,mEAA+D;AAC/D,mDAA8D;AAC9D,iFAAyG;AAIzG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA0CK;AAEL,IAAa,QAAQ,GAArB,MAAa,QAAQ;IAIjB,YAAoB,qBAA4C;QAA5C,0BAAqB,GAArB,qBAAqB,CAAuB;QAHxD,gBAAW,GAAG,IAAI,cAAO,EAAgB,CAAC;QAC1C,aAAQ,GAAG,IAAI,cAAO,EAAE,CAAC;IAEkC,CAAC;IAEpE;;;OAGG;IACH,OAAO,CAAyB,KAAQ;QACpC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAyB,IAAa;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,IAAI,CACvC,qBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EACxB,kBAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAS,CAAC,WAAW,KAAK,IAAI,CAAC,EAC5C,oBAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,EACtD,kBAAM,CAAC,iCAAkB,CAAC,CACZ,CAAC;IACvB,CAAC;IAED,gBAAgB;IAChB,eAAe;QACX,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACK,KAAK,CAAC,uBAAuB,CAAyB,KAAQ;QAClE,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,YAAY,gCAAc,CAAC,CAAC;QAE1F,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAA6B,KAAK,CAAC;QAEnD,MAAM,kBAAkB,GAA+B,GAAW,CAAC,mCAAuB,CAAC,CAAC;QAC5F,IAAI,CAAC,CAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,WAAW,CAAA,EAAE;YAClC,OAAO,KAAK,CAAC;SAChB;QAED,IAAI;YACA,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAE7E,8CAA8C;YAC9C,qDAAqD;YACrD,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,OAAQ,UAAkB,CAAC,mCAAuB,CAAC,CAAC;YAEpD,uBAAuB;YACtB,KAAa,CAAC,GAAG,CAAC,GAAG,UAAU,CAAA;YAEhC,OAAO,KAAK,CAAC;SAChB;QAAC,OAAO,CAAM,EAAE;YACb,IAAI,CAAC,YAAY,mDAA0B,EAAE;gBACzC,4DAA4D;gBAC5D,oDAAoD;gBACpD,uDAAuD;gBACvD,OAAO;aACV;YAED,MAAM,CAAC,CAAC;SACX;IACL,CAAC;CACJ,CAAA;AA7FY,QAAQ;IADpB,mBAAU,EAAE;qCAKkC,8CAAqB;GAJvD,QAAQ,CA6FpB;AA7FY,4BAAQ"}

package/dist/event-bus/events/initializer-event.d.ts

@@ -0,0 +1,12 @@
+import { VendureEvent } from '../vendure-event';
+/**
+ * @description
+ * This event is fired when vendure finished initializing its services inside the {@code InitializerService}
+ *
+ * @docsCategory events
+ * @docsPage Event Types
+ * @since 1.7.0
+ */
+export declare class InitializerEvent extends VendureEvent {
+    constructor();
+}

package/dist/event-bus/events/initializer-event.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InitializerEvent = void 0;
+const vendure_event_1 = require("../vendure-event");
+/**
+ * @description
+ * This event is fired when vendure finished initializing its services inside the {@code InitializerService}
+ *
+ * @docsCategory events
+ * @docsPage Event Types
+ * @since 1.7.0
+ */
+class InitializerEvent extends vendure_event_1.VendureEvent {
+    constructor() {
+        super();
+    }
+}
+exports.InitializerEvent = InitializerEvent;
+//# sourceMappingURL=initializer-event.js.map

package/dist/event-bus/events/initializer-event.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"initializer-event.js","sourceRoot":"","sources":["../../../src/event-bus/events/initializer-event.ts"],"names":[],"mappings":";;;AAAA,oDAAgD;AAEhD;;;;;;;GAOG;AACH,MAAa,gBAAiB,SAAQ,4BAAY;IAC9C;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;CACJ;AAJD,4CAIC"}

package/dist/event-bus/events/product-option-event.d.ts

@@ -13,6 +13,6 @@ declare type ProductOptionInputTypes = CreateGroupOptionInput | CreateProductOpt
  * @since 1.4
  */
 export declare class ProductOptionEvent extends VendureEntityEvent<ProductOption, ProductOptionInputTypes> {
-    constructor(ctx: RequestContext, entity: ProductOption, type: 'created' | 'updated', input?: ProductOptionInputTypes);
+    constructor(ctx: RequestContext, entity: ProductOption, type: 'created' | 'updated' | 'deleted', input?: ProductOptionInputTypes);
 }
 export {};

package/dist/event-bus/events/product-option-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-option-event.js","sourceRoot":"","sources":["../../../src/event-bus/events/product-option-event.ts"],"names":[],"mappings":";;;AASA,kEAA6D;AAQ7D;;;;;;;GAOG;AACH,MAAa,kBAAmB,SAAQ,yCAA0D;IAC9F,YACI,GAAmB,EACnB,MAAqB,EACrB,IAA2B,EAC3B,KAA+B;QAE/B,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;CACJ;AATD,gDASC"}
+{"version":3,"file":"product-option-event.js","sourceRoot":"","sources":["../../../src/event-bus/events/product-option-event.ts"],"names":[],"mappings":";;;AASA,kEAA6D;AAQ7D;;;;;;;GAOG;AACH,MAAa,kBAAmB,SAAQ,yCAA0D;IAC9F,YACI,GAAmB,EACnB,MAAqB,EACrB,IAAuC,EACvC,KAA+B;QAE/B,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;CACJ;AATD,gDASC"}

package/dist/event-bus/events/product-option-group-event.d.ts

@@ -13,6 +13,6 @@ declare type ProductOptionGroupInputTypes = CreateProductOptionGroupInput | Upda
  * @since 1.4
  */
 export declare class ProductOptionGroupEvent extends VendureEntityEvent<ProductOptionGroup, ProductOptionGroupInputTypes> {
-    constructor(ctx: RequestContext, entity: ProductOptionGroup, type: 'created' | 'updated', input?: ProductOptionGroupInputTypes);
+    constructor(ctx: RequestContext, entity: ProductOptionGroup, type: 'created' | 'updated' | 'deleted', input?: ProductOptionGroupInputTypes);
 }
 export {};

package/dist/event-bus/events/product-option-group-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-option-group-event.js","sourceRoot":"","sources":["../../../src/event-bus/events/product-option-group-event.ts"],"names":[],"mappings":";;;AAQA,kEAA6D;AAI7D;;;;;;;GAOG;AACH,MAAa,uBAAwB,SAAQ,yCAG5C;IACG,YACI,GAAmB,EACnB,MAA0B,EAC1B,IAA2B,EAC3B,KAAoC;QAEpC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;CACJ;AAZD,0DAYC"}
+{"version":3,"file":"product-option-group-event.js","sourceRoot":"","sources":["../../../src/event-bus/events/product-option-group-event.ts"],"names":[],"mappings":";;;AAQA,kEAA6D;AAI7D;;;;;;;GAOG;AACH,MAAa,uBAAwB,SAAQ,yCAG5C;IACG,YACI,GAAmB,EACnB,MAA0B,EAC1B,IAAuC,EACvC,KAAoC;QAEpC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;CACJ;AAZD,0DAYC"}

package/dist/event-bus/index.d.ts

@@ -25,6 +25,7 @@ export * from './events/global-settings-event';
 export * from './events/history-entry-event';
 export * from './events/identifier-change-event';
 export * from './events/identifier-change-request-event';
+export * from './events/initializer-event';
 export * from './events/login-event';
 export * from './events/logout-event';
 export * from './events/order-event';

package/dist/event-bus/index.js

@@ -37,6 +37,7 @@ __exportStar(require("./events/global-settings-event"), exports);
 __exportStar(require("./events/history-entry-event"), exports);
 __exportStar(require("./events/identifier-change-event"), exports);
 __exportStar(require("./events/identifier-change-request-event"), exports);
+__exportStar(require("./events/initializer-event"), exports);
 __exportStar(require("./events/login-event"), exports);
 __exportStar(require("./events/logout-event"), exports);
 __exportStar(require("./events/order-event"), exports);

package/dist/event-bus/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/event-bus/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4B;AAC5B,qDAAmC;AACnC,kDAAgC;AAEhC,sEAAoD;AACpD,kEAAgD;AAChD,+DAA6C;AAC7C,+DAA6C;AAC7C,uDAAqC;AACrC,iEAA+C;AAC/C,gEAA8C;AAC9C,yDAAuC;AACvC,4DAA0C;AAC1C,yEAAuD;AACvD,yDAAuC;AACvC,6DAA2C;AAC3C,kEAAgD;AAChD,0DAAwC;AACxC,uEAAqD;AACrD,gEAA8C;AAC9C,uDAAqC;AACrC,6DAA2C;AAC3C,6DAA2C;AAC3C,8EAA4D;AAC5D,iEAA+C;AAC/C,+DAA6C;AAC7C,mEAAiD;AACjD,2EAAyD;AACzD,uDAAqC;AACrC,wDAAsC;AACtC,uDAAqC;AACrC,4DAA0C;AAC1C,8DAA4C;AAC5C,wEAAsD;AACtD,gEAA8C;AAC9C,yEAAuD;AACvD,gEAA8C;AAC9C,0EAAwD;AACxD,iEAA+C;AAC/C,yDAAuC;AACvC,gEAA8C;AAC9C,6EAA2D;AAC3D,sEAAoD;AACpD,yEAAuD;AACvD,iEAA+C;AAC/C,2DAAyC;AACzC,yEAAuD;AACvD,6DAA2C;AAC3C,sDAAoC;AACpC,wDAAsC;AACtC,iEAA+C;AAC/C,gEAA8C;AAC9C,8DAA4C;AAC5C,0DAAwC;AACxC,uEAAqD;AACrD,sDAAoC;AACpC,8DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/event-bus/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4B;AAC5B,qDAAmC;AACnC,kDAAgC;AAEhC,sEAAoD;AACpD,kEAAgD;AAChD,+DAA6C;AAC7C,+DAA6C;AAC7C,uDAAqC;AACrC,iEAA+C;AAC/C,gEAA8C;AAC9C,yDAAuC;AACvC,4DAA0C;AAC1C,yEAAuD;AACvD,yDAAuC;AACvC,6DAA2C;AAC3C,kEAAgD;AAChD,0DAAwC;AACxC,uEAAqD;AACrD,gEAA8C;AAC9C,uDAAqC;AACrC,6DAA2C;AAC3C,6DAA2C;AAC3C,8EAA4D;AAC5D,iEAA+C;AAC/C,+DAA6C;AAC7C,mEAAiD;AACjD,2EAAyD;AACzD,6DAA2C;AAC3C,uDAAqC;AACrC,wDAAsC;AACtC,uDAAqC;AACrC,4DAA0C;AAC1C,8DAA4C;AAC5C,wEAAsD;AACtD,gEAA8C;AAC9C,yEAAuD;AACvD,gEAA8C;AAC9C,0EAAwD;AACxD,iEAA+C;AAC/C,yDAAuC;AACvC,gEAA8C;AAC9C,6EAA2D;AAC3D,sEAAoD;AACpD,yEAAuD;AACvD,iEAA+C;AAC/C,2DAAyC;AACzC,yEAAuD;AACvD,6DAA2C;AAC3C,sDAAoC;AACpC,wDAAsC;AACtC,iEAA+C;AAC/C,gEAA8C;AAC9C,8DAA4C;AAC5C,0DAAwC;AACxC,uEAAqD;AACrD,sDAAoC;AACpC,8DAA4C"}

package/dist/i18n/messages/en.json

@@ -40,6 +40,7 @@
     "products-cannot-be-removed-from-default-channel": "Products cannot be removed from the default Channel",
     "product-id-or-slug-must-be-provided": "Either the Product id or slug must be provided",
     "product-id-slug-mismatch": "The provided id and slug refer to different Products",
+    "product-option-group-already-assigned": "The ProductOptionGroup \"{ groupCode }\" is already assigned to the Product \"{ productName }\"",
     "product-variant-option-ids-not-compatible": "ProductVariant optionIds must include one optionId from each of the groups: {groupNames}",
     "product-variant-options-combination-already-exists": "A ProductVariant with the selected options already exists: {variantName}",
     "promotion-channels-can-only-be-changed-from-default-channel": "Promotions channels may only be changed from the Default Channel",
@@ -51,6 +52,7 @@
     "ALREADY_LOGGED_IN_ERROR": "Cannot set a Customer for the Order when already logged in",
     "ALREADY_REFUNDED_ERROR": "Cannot refund an OrderItem which has already been refunded",
     "CANCEL_ACTIVE_ORDER_ERROR": "Cannot cancel OrderLines from an Order in the \"{ orderState }\" state",
+    "CANCEL_PAYMENT_ERROR": "Cancelling the payment failed",
     "CHANNEL_DEFAULT_LANGUAGE_ERROR": "Cannot make language \"{ language }\" unavailable as it is used as the defaultLanguage by the channel \"{ channelCode }\"",
     "COUPON_CODE_EXPIRED_ERROR": "Coupon code \"{ couponCode }\" has expired",
     "COUPON_CODE_INVALID_ERROR": "Coupon code \"{ couponCode }\" is not valid",
@@ -116,6 +118,7 @@
     "facet-value-force-deleted": "The selected FacetValue was removed from {products, plural, =0 {} one {1 Product} other {# Products}}{both, select, both { , } single {}}{variants, plural, =0 {} one {1 ProductVariant} other {# ProductVariants}} and deleted",
     "facet-value-used": "The selected FacetValue is assigned to {products, plural, =0 {} one {1 Product} other {# Products}}{both, select, both { , } single {}}{variants, plural, =0 {} one {1 ProductVariant} other {# ProductVariants}}",
     "payment-method-used-in-channels": "The selected PaymentMethod is assigned to the following Channels: { channelCodes }. Set \"force: true\" to delete from all Channels.",
+    "product-option-used": "Cannot delete the option \"{code}\" as it is being used by {count, plural, =0 {} one {1 ProductVariant} other {# ProductVariants}}",
     "zone-used-in-channels": "The selected Zone cannot be deleted as it used as a default in the following Channels: { channelCodes }",
     "zone-used-in-tax-rates": "The selected Zone cannot be deleted as it is used in the following TaxRates: { taxRateNames }"
   }

package/dist/job-queue/in-memory-job-queue-strategy.d.ts

@@ -26,7 +26,7 @@ import { JobData } from './types';
  * @docsCategory JobQueue
  */
 export declare class InMemoryJobQueueStrategy extends PollingJobQueueStrategy implements InspectableJobQueueStrategy {
-    protected jobs: Map<ID, Job<any>>;
+    protected jobs: Map<any, Job<any>>;
     protected unsettledJobs: {
         [queueName: string]: Array<{
             job: Job;

package/dist/migrate.js

@@ -12,6 +12,7 @@ const typeorm_1 = require("typeorm");
 const MysqlDriver_1 = require("typeorm/driver/mysql/MysqlDriver");
 const StringUtils_1 = require("typeorm/util/StringUtils");
 const bootstrap_1 = require("./bootstrap");
+const config_helpers_1 = require("./config/config-helpers");
 /**
  * @description
  * Runs any pending database migrations. See [TypeORM migration docs](https://typeorm.io/#/migrations)
@@ -34,10 +35,21 @@ async function runMigrations(userConfig) {
         process.exitCode = 1;
     }
     finally {
+        await checkMigrationStatus(connection);
         await connection.close();
+        config_helpers_1.resetConfig();
     }
 }
 exports.runMigrations = runMigrations;
+async function checkMigrationStatus(connection) {
+    const builderLog = await connection.driver.createSchemaBuilder().log();
+    if (builderLog.upQueries.length) {
+        console.log(chalk_1.default.yellow(`Your database schema does not match your current configuration. Generate a new migration for the following changes:`));
+        for (const query of builderLog.upQueries) {
+            console.log(' - ' + chalk_1.default.yellow(query.query));
+        }
+    }
+}
 /**
  * @description
  * Reverts the last applied database migration. See [TypeORM migration docs](https://typeorm.io/#/migrations)
@@ -58,6 +70,7 @@ async function revertLastMigration(userConfig) {
     }
     finally {
         await connection.close();
+        config_helpers_1.resetConfig();
     }
 }
 exports.revertLastMigration = revertLastMigration;
@@ -129,6 +142,7 @@ async function generateMigration(userConfig, options) {
         console.log(chalk_1.default.yellow(`No changes in database schema were found - cannot generate a migration.`));
     }
     await connection.close();
+    config_helpers_1.resetConfig();
 }
 exports.generateMigration = generateMigration;
 function createConnectionOptions(userConfig) {

package/dist/migrate.js.map

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

package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js

@@ -24,8 +24,8 @@ class MysqlSearchStrategy {
         const facetValuesQb = this.connection
             .getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
             .createQueryBuilder('si')
-            .select(['MIN(productId)', 'MIN(productVariantId)'])
-            .addSelect('GROUP_CONCAT(facetValueIds)', 'facetValues');
+            .select(['MIN(si.productId)', 'MIN(si.productVariantId)'])
+            .addSelect('GROUP_CONCAT(si.facetValueIds)', 'facetValues');
         this.applyTermAndFilters(ctx, facetValuesQb, Object.assign(Object.assign({}, input), { groupByProduct: true }));
         if (!input.groupByProduct) {
             facetValuesQb.groupBy('productVariantId');
@@ -40,11 +40,11 @@ class MysqlSearchStrategy {
         const collectionsQb = this.connection
             .getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
             .createQueryBuilder('si')
-            .select(['MIN(productId)', 'MIN(productVariantId)'])
-            .addSelect('GROUP_CONCAT(collectionIds)', 'collections');
+            .select(['MIN(si.productId)', 'MIN(si.productVariantId)'])
+            .addSelect('GROUP_CONCAT(si.collectionIds)', 'collections');
         this.applyTermAndFilters(ctx, collectionsQb, input);
         if (!input.groupByProduct) {
-            collectionsQb.groupBy('productVariantId');
+            collectionsQb.groupBy('si.productVariantId');
         }
         if (enabledOnly) {
             collectionsQb.andWhere('si.enabled = :enabled', { enabled: true });
@@ -61,18 +61,18 @@ class MysqlSearchStrategy {
             .createQueryBuilder('si')
             .select(this.createMysqlSelect(!!input.groupByProduct));
         if (input.groupByProduct) {
-            qb.addSelect('MIN(price)', 'minPrice')
-                .addSelect('MAX(price)', 'maxPrice')
-                .addSelect('MIN(priceWithTax)', 'minPriceWithTax')
-                .addSelect('MAX(priceWithTax)', 'maxPriceWithTax');
+            qb.addSelect('MIN(si.price)', 'minPrice')
+                .addSelect('MAX(si.price)', 'maxPrice')
+                .addSelect('MIN(si.priceWithTax)', 'minPriceWithTax')
+                .addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
         }
         this.applyTermAndFilters(ctx, qb, input);
         if (sort) {
             if (sort.name) {
-                qb.addOrderBy(input.groupByProduct ? 'MIN(productName)' : 'productName', sort.name);
+                qb.addOrderBy(input.groupByProduct ? 'MIN(si.productName)' : 'si.productName', sort.name);
             }
             if (sort.price) {
-                qb.addOrderBy(input.groupByProduct ? 'MIN(price)' : 'price', sort.price);
+                qb.addOrderBy(input.groupByProduct ? 'MIN(si.price)' : 'si.price', sort.price);
             }
         }
         else {
@@ -84,8 +84,8 @@ class MysqlSearchStrategy {
             qb.andWhere('si.enabled = :enabled', { enabled: true });
         }
         return qb
-            .take(take)
-            .skip(skip)
+            .limit(take)
+            .offset(skip)
             .getRawMany()
             .then(res => res.map(r => search_strategy_utils_1.mapToSearchResult(r, ctx.channel.currencyCode)));
     }
@@ -112,18 +112,18 @@ class MysqlSearchStrategy {
                 .createQueryBuilder('si_inner')
                 .select('si_inner.productId', 'inner_productId')
                 .addSelect('si_inner.productVariantId', 'inner_productVariantId')
-                .addSelect(`IF (sku LIKE :like_term, 10, 0)`, 'sku_score')
+                .addSelect(`IF (si_inner.sku LIKE :like_term, 10, 0)`, 'sku_score')
                 .addSelect(`(SELECT sku_score) +
-                     MATCH (productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
-                     MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
-                     MATCH (description) AGAINST (:term IN BOOLEAN MODE) * 1`, 'score')
+                     MATCH (si_inner.productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
+                     MATCH (si_inner.productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
+                     MATCH (si_inner.description) AGAINST (:term IN BOOLEAN MODE) * 1`, 'score')
                 .where(new typeorm_1.Brackets(qb1 => {
-                qb1.where('sku LIKE :like_term')
-                    .orWhere('MATCH (productName) AGAINST (:term IN BOOLEAN MODE)')
-                    .orWhere('MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE)')
-                    .orWhere('MATCH (description) AGAINST (:term IN BOOLEAN MODE)');
+                qb1.where('si_inner.sku LIKE :like_term')
+                    .orWhere('MATCH (si_inner.productName) AGAINST (:term IN BOOLEAN MODE)')
+                    .orWhere('MATCH (si_inner.productVariantName) AGAINST (:term IN BOOLEAN MODE)')
+                    .orWhere('MATCH (si_inner.description) AGAINST (:term IN BOOLEAN MODE)');
             }))
-                .andWhere('channelId = :channelId')
+                .andWhere('si_inner.channelId = :channelId')
                 .setParameters({ term: `${term}*`, like_term: `%${term}%`, channelId: ctx.channelId });
             qb.innerJoin(`(${termScoreQuery.getQuery()})`, 'term_result', 'inner_productId = si.productId')
                 .addSelect(input.groupByProduct ? 'MAX(term_result.score)' : 'term_result.score', 'score')
@@ -135,17 +135,17 @@ class MysqlSearchStrategy {
         }
         if (input.inStock != null) {
             if (input.groupByProduct) {
-                qb.andWhere('productInStock = :inStock', { inStock: input.inStock });
+                qb.andWhere('si.productInStock = :inStock', { inStock: input.inStock });
             }
             else {
-                qb.andWhere('inStock = :inStock', { inStock: input.inStock });
+                qb.andWhere('si.inStock = :inStock', { inStock: input.inStock });
             }
         }
         if (facetValueIds === null || facetValueIds === void 0 ? void 0 : facetValueIds.length) {
             qb.andWhere(new typeorm_1.Brackets(qb1 => {
                 for (const id of facetValueIds) {
                     const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
-                    const clause = `FIND_IN_SET(:${placeholder}, facetValueIds)`;
+                    const clause = `FIND_IN_SET(:${placeholder}, si.facetValueIds)`;
                     const params = { [placeholder]: id };
                     if (facetValueOperator === generated_types_1.LogicalOperator.AND) {
                         qb1.andWhere(clause, params);
@@ -166,14 +166,14 @@ class MysqlSearchStrategy {
                         }
                         if (facetValueFilter.and) {
                             const placeholder = search_strategy_utils_1.createPlaceholderFromId(facetValueFilter.and);
-                            const clause = `FIND_IN_SET(:${placeholder}, facetValueIds)`;
+                            const clause = `FIND_IN_SET(:${placeholder}, si.facetValueIds)`;
                             const params = { [placeholder]: facetValueFilter.and };
                             qb2.where(clause, params);
                         }
                         if ((_b = facetValueFilter.or) === null || _b === void 0 ? void 0 : _b.length) {
                             for (const id of facetValueFilter.or) {
                                 const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
-                                const clause = `FIND_IN_SET(:${placeholder}, facetValueIds)`;
+                                const clause = `FIND_IN_SET(:${placeholder}, si.facetValueIds)`;
                                 const params = { [placeholder]: id };
                                 qb2.orWhere(clause, params);
                             }
@@ -183,16 +183,16 @@ class MysqlSearchStrategy {
             }));
         }
         if (collectionId) {
-            qb.andWhere(`FIND_IN_SET (:collectionId, collectionIds)`, { collectionId });
+            qb.andWhere(`FIND_IN_SET (:collectionId, si.collectionIds)`, { collectionId });
         }
         if (collectionSlug) {
-            qb.andWhere(`FIND_IN_SET (:collectionSlug, collectionSlugs)`, { collectionSlug });
+            qb.andWhere(`FIND_IN_SET (:collectionSlug, si.collectionSlugs)`, { collectionSlug });
         }
-        qb.andWhere('languageCode = :languageCode', { languageCode: ctx.languageCode });
-        qb.andWhere('channelId = :channelId', { channelId: ctx.channelId });
+        search_strategy_utils_1.applyLanguageConstraints(qb, ctx.languageCode, ctx.channel.defaultLanguageCode);
+        qb.andWhere('si.channelId = :channelId', { channelId: ctx.channelId });
         if (input.groupByProduct === true) {
-            qb.groupBy('productId');
-            qb.addSelect('BIT_OR(enabled)', 'productEnabled');
+            qb.groupBy('si.productId');
+            qb.addSelect('BIT_OR(si.enabled)', 'productEnabled');
         }
         return qb;
     }

package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js

@@ -61,10 +61,10 @@ class PostgresSearchStrategy {
             .createQueryBuilder('si')
             .select(this.createPostgresSelect(!!input.groupByProduct));
         if (input.groupByProduct) {
-            qb.addSelect('MIN(price)', 'minPrice')
-                .addSelect('MAX(price)', 'maxPrice')
-                .addSelect('MIN("priceWithTax")', 'minPriceWithTax')
-                .addSelect('MAX("priceWithTax")', 'maxPriceWithTax');
+            qb.addSelect('MIN(si.price)', 'minPrice')
+                .addSelect('MAX(si.price)', 'maxPrice')
+                .addSelect('MIN(si.priceWithTax)', 'minPriceWithTax')
+                .addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
         }
         this.applyTermAndFilters(ctx, qb, input);
         if (sort) {
@@ -87,8 +87,8 @@ class PostgresSearchStrategy {
             qb.andWhere('"si"."enabled" = :enabled', { enabled: true });
         }
         return qb
-            .take(take)
-            .skip(skip)
+            .limit(take)
+            .offset(skip)
             .getRawMany()
             .then(res => res.map(r => search_strategy_utils_1.mapToSearchResult(r, ctx.channel.currencyCode)));
     }
@@ -191,7 +191,7 @@ class PostgresSearchStrategy {
                 collectionSlug,
             });
         }
-        qb.andWhere('si.languageCode = :languageCode', { languageCode: ctx.languageCode });
+        search_strategy_utils_1.applyLanguageConstraints(qb, ctx.languageCode, ctx.channel.defaultLanguageCode);
         qb.andWhere('si.channelId = :channelId', { channelId: ctx.channelId });
         if (input.groupByProduct === true) {
             qb.groupBy('si.productId');