@vendure/core 2.0.0-next.8 → 2.0.0

package/dist/service/helpers/active-order/active-order.service.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActiveOrderService = void 0;
 const common_1 = require("@nestjs/common");
 const errors_1 = require("../../../common/error/errors");
+const config_service_1 = require("../../../config/config.service");
 const transactional_connection_1 = require("../../../connection/transactional-connection");
 const order_entity_1 = require("../../../entity/order/order.entity");
 const order_service_1 = require("../../services/order.service");
@@ -23,14 +24,15 @@ const session_service_1 = require("../../services/session.service");
  * @docsCategory orders
  */
 let ActiveOrderService = class ActiveOrderService {
-    constructor(sessionService, orderService, connection) {
+    constructor(sessionService, orderService, connection, configService) {
         this.sessionService = sessionService;
         this.orderService = orderService;
         this.connection = connection;
+        this.configService = configService;
     }
     async getOrderFromContext(ctx, createIfNotExists = false) {
         if (!ctx.session) {
-            throw new errors_1.InternalServerError(`error.no-active-session`);
+            throw new errors_1.InternalServerError('error.no-active-session');
         }
         let order = ctx.session.activeOrderId
             ? await this.connection
@@ -60,12 +62,47 @@ let ActiveOrderService = class ActiveOrderService {
         }
         return order || undefined;
     }
+    async getActiveOrder(ctx, input, createIfNotExists = false) {
+        var _a;
+        let order;
+        if (!order) {
+            const { activeOrderStrategy } = this.configService.orderOptions;
+            const strategyArray = Array.isArray(activeOrderStrategy)
+                ? activeOrderStrategy
+                : [activeOrderStrategy];
+            for (const strategy of strategyArray) {
+                const strategyInput = (_a = input === null || input === void 0 ? void 0 : input[strategy.name]) !== null && _a !== void 0 ? _a : {};
+                order = await strategy.determineActiveOrder(ctx, strategyInput);
+                if (order) {
+                    break;
+                }
+                if (createIfNotExists && typeof strategy.createActiveOrder === 'function') {
+                    order = await strategy.createActiveOrder(ctx, strategyInput);
+                }
+                if (order) {
+                    break;
+                }
+            }
+            if (!order && createIfNotExists) {
+                // No order has been found, and none could be created, which indicates that
+                // none of the configured strategies have a `createActiveOrder` method defined.
+                // In this case, we should throw an error because it is assumed that such a configuration
+                // indicates that an external order creation mechanism should be defined.
+                throw new errors_1.UserInputError('error.order-could-not-be-determined-or-created');
+            }
+            if (order && ctx.session) {
+                await this.sessionService.setActiveOrder(ctx, ctx.session, order);
+            }
+        }
+        return order || undefined;
+    }
 };
 ActiveOrderService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [session_service_1.SessionService,
         order_service_1.OrderService,
-        transactional_connection_1.TransactionalConnection])
+        transactional_connection_1.TransactionalConnection,
+        config_service_1.ConfigService])
 ], ActiveOrderService);
 exports.ActiveOrderService = ActiveOrderService;
 //# sourceMappingURL=active-order.service.js.map

package/dist/service/helpers/active-order/active-order.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"active-order.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/active-order/active-order.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,yDAAmE;AACnE,2FAAuF;AACvF,qEAA2D;AAC3D,gEAA4D;AAC5D,oEAAgE;AAEhE;;;;;GAKG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAC3B,YACY,cAA8B,EAC9B,YAA0B,EAC1B,UAAmC;QAFnC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAyB;IAC5C,CAAC;IAYJ,KAAK,CAAC,mBAAmB,CAAC,GAAmB,EAAE,iBAAiB,GAAG,KAAK;QACpE,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACd,MAAM,IAAI,4BAAmB,CAAC,yBAAyB,CAAC,CAAC;SAC5D;QACD,IAAI,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa;YACjC,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU;iBAChB,aAAa,CAAC,GAAG,EAAE,oBAAK,CAAC;iBACzB,kBAAkB,CAAC,OAAO,CAAC;iBAC3B,QAAQ,CAAC,gBAAgB,EAAE,SAAS,CAAC;iBACrC,KAAK,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;iBACpE,QAAQ,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;iBACjE,MAAM,EAAE;YACf,CAAC,CAAC,SAAS,CAAC;QAChB,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,EAAE;YACjC,sDAAsD;YACtD,qEAAqE;YACrE,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YAC7D,KAAK,GAAG,SAAS,CAAC;SACrB;QACD,IAAI,CAAC,KAAK,EAAE;YACR,IAAI,GAAG,CAAC,YAAY,EAAE;gBAClB,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;aAChF;YAED,IAAI,CAAC,KAAK,IAAI,iBAAiB,EAAE;gBAC7B,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;aACjE;YAED,IAAI,KAAK,EAAE;gBACP,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aACrE;SACJ;QACD,OAAO,KAAK,IAAI,SAAS,CAAC;IAC9B,CAAC;CACJ,CAAA;AAnDY,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAGmB,gCAAc;QAChB,4BAAY;QACd,kDAAuB;GAJtC,kBAAkB,CAmD9B;AAnDY,gDAAkB"}
+{"version":3,"file":"active-order.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/active-order/active-order.service.ts"],"names":[],"mappings":"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"}

package/dist/service/helpers/config-arg/config-arg.service.d.ts

@@ -8,7 +8,7 @@ import { PromotionAction } from '../../../config/promotion/promotion-action';
 import { PromotionCondition } from '../../../config/promotion/promotion-condition';
 import { ShippingCalculator } from '../../../config/shipping-method/shipping-calculator';
 import { ShippingEligibilityChecker } from '../../../config/shipping-method/shipping-eligibility-checker';
-export declare type ConfigDefTypeMap = {
+export type ConfigDefTypeMap = {
     CollectionFilter: CollectionFilter;
     FulfillmentHandler: FulfillmentHandler;
     PaymentMethodEligibilityChecker: PaymentMethodEligibilityChecker;
@@ -18,7 +18,7 @@ export declare type ConfigDefTypeMap = {
     ShippingCalculator: ShippingCalculator;
     ShippingEligibilityChecker: ShippingEligibilityChecker;
 };
-export declare type ConfigDefType = keyof ConfigDefTypeMap;
+export type ConfigDefType = keyof ConfigDefTypeMap;
 /**
  * This helper class provides methods relating to ConfigurableOperationDef instances.
  */
@@ -32,6 +32,7 @@ export declare class ConfigArgService {
      * Parses and validates the input to a ConfigurableOperation.
      */
     parseInput(defType: ConfigDefType, input: ConfigurableOperationInput): ConfigurableOperation;
+    private orderArgsToMatchDef;
     private parseOperationArgs;
     private validateRequiredFields;
 }

package/dist/service/helpers/config-arg/config-arg.service.js

@@ -37,7 +37,7 @@ let ConfigArgService = class ConfigArgService {
         const defsOfType = this.getDefinitions(defType);
         const match = defsOfType.find(def => def.code === code);
         if (!match) {
-            throw new errors_1.UserInputError(`error.no-configurable-operation-def-with-code-found`, {
+            throw new errors_1.UserInputError('error.no-configurable-operation-def-with-code-found', {
                 code,
                 type: defType,
             });
@@ -50,11 +50,22 @@ let ConfigArgService = class ConfigArgService {
     parseInput(defType, input) {
         const match = this.getByCode(defType, input.code);
         this.validateRequiredFields(input, match);
+        const orderedArgs = this.orderArgsToMatchDef(match, input.arguments);
         return {
             code: input.code,
-            args: input.arguments,
+            args: orderedArgs,
         };
     }
+    orderArgsToMatchDef(def, args) {
+        const output = [];
+        for (const name of Object.keys(def.args)) {
+            const match = args.find(arg => arg.name === name);
+            if (match) {
+                output.push(match);
+            }
+        }
+        return output;
+    }
     parseOperationArgs(input, checkerOrCalculator) {
         const output = {
             code: input.code,

package/dist/service/helpers/config-arg/config-arg.service.js.map

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

package/dist/service/helpers/custom-field-relation/custom-field-relation.service.js

@@ -13,6 +13,7 @@ exports.CustomFieldRelationService = void 0;
 const common_1 = require("@nestjs/common");
 const pick_1 = require("@vendure/common/lib/pick");
 const shared_utils_1 = require("@vendure/common/lib/shared-utils");
+const typeorm_1 = require("typeorm");
 const config_service_1 = require("../../../config/config.service");
 const transactional_connection_1 = require("../../../connection/transactional-connection");
 let CustomFieldRelationService = class CustomFieldRelationService {
@@ -39,10 +40,14 @@ let CustomFieldRelationService = class CustomFieldRelationService {
                         relations = null;
                     }
                     else if (field.list && Array.isArray(idOrIds) && idOrIds.every(id => this.isId(id))) {
-                        relations = await this.connection.getRepository(ctx, field.entity).findByIds(idOrIds);
+                        relations = await this.connection
+                            .getRepository(ctx, field.entity)
+                            .findBy({ id: (0, typeorm_1.In)(idOrIds) });
                     }
                     else if (!field.list && this.isId(idOrIds)) {
-                        relations = await this.connection.getRepository(ctx, field.entity).findOne(idOrIds);
+                        relations = await this.connection
+                            .getRepository(ctx, field.entity)
+                            .findOne({ where: { id: idOrIds } });
                     }
                     if (relations !== undefined) {
                         entity.customFields = Object.assign(Object.assign({}, entity.customFields), { [field.name]: relations });

package/dist/service/helpers/custom-field-relation/custom-field-relation.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom-field-relation.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/custom-field-relation/custom-field-relation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAAgD;AAEhD,mEAAuE;AAGvE,mEAA+D;AAO/D,2FAAuF;AAIvF,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IACnC,YAAoB,UAAmC,EAAU,aAA4B;QAAzE,eAAU,GAAV,UAAU,CAAyB;QAAU,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEjG;;;;;OAKG;IACH,KAAK,CAAC,eAAe,CACjB,GAAmB,EACnB,UAAmB,EACnB,KAAgD,EAChD,MAAS;QAET,IAAI,KAAK,CAAC,YAAY,EAAE;YACpB,MAAM,oBAAoB,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CACxD,UAAU,CAAC,IAA0B,CACxC,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAEhC,KAAK,MAAM,KAAK,IAAI,oBAAoB,EAAE;gBACtC,MAAM,WAAW,GAAG,IAAA,kCAAmB,EAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBAChD,IAAI,OAAO,KAAK,SAAS,EAAE;oBACvB,IAAI,SAA6D,CAAC;oBAClE,IAAI,OAAO,KAAK,IAAI,EAAE;wBAClB,uDAAuD;wBACvD,SAAS,GAAG,IAAI,CAAC;qBACpB;yBAAM,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE;wBACnF,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;qBACzF;yBAAM,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;wBAC1C,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;qBACvF;oBACD,IAAI,SAAS,KAAK,SAAS,EAAE;wBACzB,MAAM,CAAC,YAAY,mCAAQ,MAAM,CAAC,YAAY,KAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,SAAS,GAAE,CAAC;wBAC1E,MAAM,IAAI,CAAC,UAAU;6BAChB,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC;6BAC9B,IAAI,CAAC,IAAA,WAAI,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,CAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;qBAC7E;iBACJ;aACJ;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,gBAAgB,CAAC,KAAwB;QAC7C,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC;IACrC,CAAC;IAEO,IAAI,CAAC,KAAc;QACvB,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;IAClE,CAAC;CACJ,CAAA;AApDY,0BAA0B;IADtC,IAAA,mBAAU,GAAE;qCAEuB,kDAAuB,EAAyB,8BAAa;GADpF,0BAA0B,CAoDtC;AApDY,gEAA0B"}
+{"version":3,"file":"custom-field-relation.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/custom-field-relation/custom-field-relation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAAgD;AAEhD,mEAAuE;AACvE,qCAA6B;AAG7B,mEAA+D;AAO/D,2FAAuF;AAIhF,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACnC,YAAoB,UAAmC,EAAU,aAA4B;QAAzE,eAAU,GAAV,UAAU,CAAyB;QAAU,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEjG;;;;;OAKG;IACH,KAAK,CAAC,eAAe,CACjB,GAAmB,EACnB,UAAmB,EACnB,KAAgD,EAChD,MAAS;QAET,IAAI,KAAK,CAAC,YAAY,EAAE;YACpB,MAAM,oBAAoB,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CACxD,UAAU,CAAC,IAA0B,CACxC,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAEhC,KAAK,MAAM,KAAK,IAAI,oBAAoB,EAAE;gBACtC,MAAM,WAAW,GAAG,IAAA,kCAAmB,EAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBAChD,IAAI,OAAO,KAAK,SAAS,EAAE;oBACvB,IAAI,SAA6D,CAAC;oBAClE,IAAI,OAAO,KAAK,IAAI,EAAE;wBAClB,uDAAuD;wBACvD,SAAS,GAAG,IAAI,CAAC;qBACpB;yBAAM,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE;wBACnF,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU;6BAC5B,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC;6BAChC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;qBACpC;yBAAM,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;wBAC1C,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU;6BAC5B,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC;6BAChC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;qBAC5C;oBACD,IAAI,SAAS,KAAK,SAAS,EAAE;wBACzB,MAAM,CAAC,YAAY,mCAAQ,MAAM,CAAC,YAAY,KAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,SAAS,GAAE,CAAC;wBAC1E,MAAM,IAAI,CAAC,UAAU;6BAChB,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC;6BAC9B,IAAI,CAAC,IAAA,WAAI,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,CAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;qBAC7E;iBACJ;aACJ;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,gBAAgB,CAAa,KAAwB;QACzD,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC;IACrC,CAAC;IAEO,IAAI,CAAC,KAAc;QACvB,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;IAClE,CAAC;CACJ,CAAA;AAxDY,0BAA0B;IADtC,IAAA,mBAAU,GAAE;qCAEuB,kDAAuB,EAAyB,8BAAa;GADpF,0BAA0B,CAwDtC;AAxDY,gEAA0B"}

package/dist/service/helpers/entity-hydrator/entity-hydrator.service.d.ts

@@ -2,6 +2,7 @@ import { RequestContext } from '../../../api/common/request-context';
 import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { VendureEntity } from '../../../entity/base/base.entity';
 import { ProductPriceApplicator } from '../product-price-applicator/product-price-applicator';
+import { TranslatorService } from '../translator/translator.service';
 import { HydrateOptions } from './entity-hydrator-types';
 /**
  * @description
@@ -43,7 +44,8 @@ import { HydrateOptions } from './entity-hydrator-types';
 export declare class EntityHydrator {
     private connection;
     private productPriceApplicator;
-    constructor(connection: TransactionalConnection, productPriceApplicator: ProductPriceApplicator);
+    private translator;
+    constructor(connection: TransactionalConnection, productPriceApplicator: ProductPriceApplicator, translator: TranslatorService);
     /**
      * @description
      * Hydrates (joins) the specified relations to the target entity instance. This method

package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js

@@ -17,7 +17,7 @@ const errors_1 = require("../../../common/error/errors");
 const transactional_connection_1 = require("../../../connection/transactional-connection");
 const product_variant_entity_1 = require("../../../entity/product-variant/product-variant.entity");
 const product_price_applicator_1 = require("../product-price-applicator/product-price-applicator");
-const translate_entity_1 = require("../utils/translate-entity");
+const translator_service_1 = require("../translator/translator.service");
 /**
  * @description
  * This is a helper class which is used to "hydrate" entity instances, which means to populate them
@@ -56,9 +56,10 @@ const translate_entity_1 = require("../utils/translate-entity");
  * @since 1.3.0
  */
 let EntityHydrator = class EntityHydrator {
-    constructor(connection, productPriceApplicator) {
+    constructor(connection, productPriceApplicator, translator) {
         this.connection = connection;
         this.productPriceApplicator = productPriceApplicator;
+        this.translator = translator;
     }
     /**
      * @description
@@ -87,9 +88,8 @@ let EntityHydrator = class EntityHydrator {
                 missingRelations = (0, unique_1.unique)([...missingRelations, ...productVariantPriceRelations]);
             }
             if (missingRelations.length) {
-                const hydrated = await this.connection
-                    .getRepository(ctx, target.constructor)
-                    .findOne(target.id, {
+                const hydrated = await this.connection.getRepository(ctx, target.constructor).findOne({
+                    where: { id: target.id },
                     relations: missingRelations,
                 });
                 const propertiesToAdd = (0, unique_1.unique)(missingRelations.map(relation => relation.split('.')[0]));
@@ -120,7 +120,7 @@ let EntityHydrator = class EntityHydrator {
                 const translateDeepRelations = relationsWithEntities
                     .filter(item => this.isTranslatable(item.entity))
                     .map(item => item.relation.split('.'));
-                this.assignSettableProperties(target, (0, translate_entity_1.translateDeep)(target, ctx.languageCode, translateDeepRelations));
+                this.assignSettableProperties(target, this.translator.translate(target, ctx, translateDeepRelations));
             }
         }
         return target;
@@ -255,7 +255,8 @@ let EntityHydrator = class EntityHydrator {
 EntityHydrator = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
-        product_price_applicator_1.ProductPriceApplicator])
+        product_price_applicator_1.ProductPriceApplicator,
+        translator_service_1.TranslatorService])
 ], EntityHydrator);
 exports.EntityHydrator = EntityHydrator;
 //# sourceMappingURL=entity-hydrator.service.js.map

package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js.map

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

package/dist/service/helpers/external-authentication/external-authentication.service.d.ts

@@ -26,8 +26,12 @@ export declare class ExternalAuthenticationService {
      * @description
      * Looks up a User based on their identifier from an external authentication
      * provider, ensuring this User is associated with a Customer account.
+     *
+     * By default, only customers in the currently-active Channel will be checked.
+     * By passing `false` as the `checkCurrentChannelOnly` argument, _all_ channels
+     * will be checked.
      */
-    findCustomerUser(ctx: RequestContext, strategy: string, externalIdentifier: string): Promise<User | undefined>;
+    findCustomerUser(ctx: RequestContext, strategy: string, externalIdentifier: string, checkCurrentChannelOnly?: boolean): Promise<User | undefined>;
     /**
      * @description
      * Looks up a User based on their identifier from an external authentication

package/dist/service/helpers/external-authentication/external-authentication.service.js

@@ -42,12 +42,16 @@ let ExternalAuthenticationService = class ExternalAuthenticationService {
      * @description
      * Looks up a User based on their identifier from an external authentication
      * provider, ensuring this User is associated with a Customer account.
+     *
+     * By default, only customers in the currently-active Channel will be checked.
+     * By passing `false` as the `checkCurrentChannelOnly` argument, _all_ channels
+     * will be checked.
      */
-    async findCustomerUser(ctx, strategy, externalIdentifier) {
+    async findCustomerUser(ctx, strategy, externalIdentifier, checkCurrentChannelOnly = true) {
         const user = await this.findUser(ctx, strategy, externalIdentifier);
         if (user) {
             // Ensure this User is associated with a Customer
-            const customer = await this.customerService.findOneByUserId(ctx, user.id);
+            const customer = await this.customerService.findOneByUserId(ctx, user.id, checkCurrentChannelOnly);
             if (customer) {
                 return user;
             }
@@ -82,7 +86,7 @@ let ExternalAuthenticationService = class ExternalAuthenticationService {
             user = existingUser;
         }
         else {
-            const customerRole = await this.roleService.getCustomerRole();
+            const customerRole = await this.roleService.getCustomerRole(ctx);
             user = new user_entity_1.User({
                 identifier: config.emailAddress,
                 roles: [customerRole],
@@ -158,15 +162,16 @@ let ExternalAuthenticationService = class ExternalAuthenticationService {
         return newUser;
     }
     async findUser(ctx, strategy, externalIdentifier) {
-        const usersWithMatchingIdentifier = await this.connection
+        const user = await this.connection
             .getRepository(ctx, user_entity_1.User)
             .createQueryBuilder('user')
-            .leftJoinAndSelect('user.authenticationMethods', 'authMethod')
+            .leftJoinAndSelect('user.authenticationMethods', 'aums')
+            .leftJoin('user.authenticationMethods', 'authMethod')
             .andWhere('authMethod.externalIdentifier = :externalIdentifier', { externalIdentifier })
+            .andWhere('authMethod.strategy = :strategy', { strategy })
             .andWhere('user.deletedAt IS NULL')
-            .getMany();
-        const matchingUser = usersWithMatchingIdentifier.find(user => user.authenticationMethods.find(m => m instanceof external_authentication_method_entity_1.ExternalAuthenticationMethod && m.strategy === strategy));
-        return matchingUser;
+            .getOne();
+        return user || undefined;
     }
     async findExistingCustomerUserByEmailAddress(ctx, emailAddress) {
         const customer = await this.connection

package/dist/service/helpers/external-authentication/external-authentication.service.js.map

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

package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.d.ts

@@ -1,27 +1,21 @@
 import { RequestContext } from '../../../api/common/request-context';
 import { StateMachineConfig } from '../../../common/finite-state-machine/types';
 import { ConfigService } from '../../../config/config.service';
+import { TransactionalConnection } from '../../../connection/index';
 import { Fulfillment } from '../../../entity/fulfillment/fulfillment.entity';
 import { Order } from '../../../entity/order/order.entity';
-import { HistoryService } from '../../services/history.service';
 import { FulfillmentState, FulfillmentTransitionData } from './fulfillment-state';
 export declare class FulfillmentStateMachine {
     private configService;
-    private historyService;
+    private connection;
     readonly config: StateMachineConfig<FulfillmentState, FulfillmentTransitionData>;
     private readonly initialState;
-    constructor(configService: ConfigService, historyService: HistoryService);
+    constructor(configService: ConfigService, connection: TransactionalConnection);
     getInitialState(): FulfillmentState;
     canTransition(currentState: FulfillmentState, newState: FulfillmentState): boolean;
-    getNextStates(fulfillment: Fulfillment): ReadonlyArray<FulfillmentState>;
-    transition(ctx: RequestContext, fulfillment: Fulfillment, orders: Order[], state: FulfillmentState): Promise<void>;
-    /**
-     * Specific business logic to be executed on Fulfillment state transitions.
-     */
-    private onTransitionStart;
-    /**
-     * Specific business logic to be executed after Fulfillment state transition completes.
-     */
-    private onTransitionEnd;
+    getNextStates(fulfillment: Fulfillment): readonly FulfillmentState[];
+    transition(ctx: RequestContext, fulfillment: Fulfillment, orders: Order[], state: FulfillmentState): Promise<{
+        finalize: () => Promise<any>;
+    }>;
     private initConfig;
 }

package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.js

@@ -11,19 +11,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FulfillmentStateMachine = void 0;
 const common_1 = require("@nestjs/common");
-const generated_types_1 = require("@vendure/common/lib/generated-types");
 const errors_1 = require("../../../common/error/errors");
 const finite_state_machine_1 = require("../../../common/finite-state-machine/finite-state-machine");
 const merge_transition_definitions_1 = require("../../../common/finite-state-machine/merge-transition-definitions");
 const validate_transition_definition_1 = require("../../../common/finite-state-machine/validate-transition-definition");
 const utils_1 = require("../../../common/utils");
 const config_service_1 = require("../../../config/config.service");
-const history_service_1 = require("../../services/history.service");
-const fulfillment_state_1 = require("./fulfillment-state");
+const index_1 = require("../../../connection/index");
 let FulfillmentStateMachine = class FulfillmentStateMachine {
-    constructor(configService, historyService) {
+    constructor(configService, connection) {
         this.configService = configService;
-        this.historyService = historyService;
+        this.connection = connection;
         this.initialState = 'Created';
         this.config = this.initConfig();
     }
@@ -39,47 +37,21 @@ let FulfillmentStateMachine = class FulfillmentStateMachine {
     }
     async transition(ctx, fulfillment, orders, state) {
         const fsm = new finite_state_machine_1.FSM(this.config, fulfillment.state);
-        await fsm.transitionTo(state, { ctx, orders, fulfillment });
+        const result = await fsm.transitionTo(state, { ctx, orders, fulfillment });
         fulfillment.state = fsm.currentState;
-    }
-    /**
-     * Specific business logic to be executed on Fulfillment state transitions.
-     */
-    async onTransitionStart(fromState, toState, data) {
-        const { fulfillmentHandlers } = this.configService.shippingOptions;
-        const fulfillmentHandler = fulfillmentHandlers.find(h => h.code === data.fulfillment.handlerCode);
-        if (fulfillmentHandler) {
-            const result = await (0, utils_1.awaitPromiseOrObservable)(fulfillmentHandler.onFulfillmentTransition(fromState, toState, data));
-            if (result === false || typeof result === 'string') {
-                return result;
-            }
-        }
-    }
-    /**
-     * Specific business logic to be executed after Fulfillment state transition completes.
-     */
-    async onTransitionEnd(fromState, toState, data) {
-        const historyEntryPromises = data.orders.map(order => this.historyService.createHistoryEntryForOrder({
-            orderId: order.id,
-            type: generated_types_1.HistoryEntryType.ORDER_FULFILLMENT_TRANSITION,
-            ctx: data.ctx,
-            data: {
-                fulfillmentId: data.fulfillment.id,
-                from: fromState,
-                to: toState,
-            },
-        }));
-        await Promise.all(historyEntryPromises);
+        return result;
     }
     initConfig() {
-        var _a;
+        var _a, _b;
+        // TODO: remove once the customFulfillmentProcess option is removed
         const customProcesses = (_a = this.configService.shippingOptions.customFulfillmentProcess) !== null && _a !== void 0 ? _a : [];
-        const allTransitions = customProcesses.reduce((transitions, process) => (0, merge_transition_definitions_1.mergeTransitionDefinitions)(transitions, process.transitions), fulfillment_state_1.fulfillmentStateTransitions);
+        const processes = [...customProcesses, ...((_b = this.configService.shippingOptions.process) !== null && _b !== void 0 ? _b : [])];
+        const allTransitions = processes.reduce((transitions, process) => (0, merge_transition_definitions_1.mergeTransitionDefinitions)(transitions, process.transitions), {});
         const validationResult = (0, validate_transition_definition_1.validateTransitionDefinition)(allTransitions, 'Pending');
         return {
             transitions: allTransitions,
             onTransitionStart: async (fromState, toState, data) => {
-                for (const process of customProcesses) {
+                for (const process of processes) {
                     if (typeof process.onTransitionStart === 'function') {
                         const result = await (0, utils_1.awaitPromiseOrObservable)(process.onTransitionStart(fromState, toState, data));
                         if (result === false || typeof result === 'string') {
@@ -87,18 +59,16 @@ let FulfillmentStateMachine = class FulfillmentStateMachine {
                         }
                     }
                 }
-                return this.onTransitionStart(fromState, toState, data);
             },
             onTransitionEnd: async (fromState, toState, data) => {
-                for (const process of customProcesses) {
+                for (const process of processes) {
                     if (typeof process.onTransitionEnd === 'function') {
                         await (0, utils_1.awaitPromiseOrObservable)(process.onTransitionEnd(fromState, toState, data));
                     }
                 }
-                await this.onTransitionEnd(fromState, toState, data);
             },
             onError: async (fromState, toState, message) => {
-                for (const process of customProcesses) {
+                for (const process of processes) {
                     if (typeof process.onTransitionError === 'function') {
                         await (0, utils_1.awaitPromiseOrObservable)(process.onTransitionError(fromState, toState, message));
                     }
@@ -113,7 +83,7 @@ let FulfillmentStateMachine = class FulfillmentStateMachine {
 };
 FulfillmentStateMachine = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [config_service_1.ConfigService, history_service_1.HistoryService])
+    __metadata("design:paramtypes", [config_service_1.ConfigService, index_1.TransactionalConnection])
 ], FulfillmentStateMachine);
 exports.FulfillmentStateMachine = FulfillmentStateMachine;
 //# sourceMappingURL=fulfillment-state-machine.js.map

package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.js.map

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

package/dist/service/helpers/fulfillment-state-machine/fulfillment-state.d.ts

@@ -1,15 +1,31 @@
 import { RequestContext } from '../../../api/common/request-context';
-import { Transitions } from '../../../common/finite-state-machine/types';
 import { Fulfillment } from '../../../entity/fulfillment/fulfillment.entity';
 import { Order } from '../../../entity/order/order.entity';
 /**
  * @description
- * These are the default states of the fulfillment process.
+ * An interface to extend standard {@link FulfillmentState}.
+ *
+ * @deprecated use FulfillmentStates
+ */
+export interface CustomFulfillmentStates {
+}
+/**
+ * @description
+ * An interface to extend standard {@link FulfillmentState}.
+ *
+ * @docsCategory fulfillment
+ */
+export interface FulfillmentStates {
+}
+/**
+ * @description
+ * These are the default states of the fulfillment process. By default, they will be extended
+ * by the {@link defaultFulfillmentProcess} to also include `Shipped` and `Delivered`.
+ *
  *
  * @docsCategory fulfillment
  */
-export declare type FulfillmentState = 'Created' | 'Pending' | 'Shipped' | 'Delivered' | 'Cancelled';
-export declare const fulfillmentStateTransitions: Transitions<FulfillmentState>;
+export type FulfillmentState = 'Created' | 'Pending' | 'Cancelled' | keyof CustomFulfillmentStates | keyof FulfillmentStates;
 /**
  * @description
  * The data which is passed to the state transition handlers of the FulfillmentStateMachine.