@vendure/core 2.0.0-next.9 → 2.0.1

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.

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

@@ -1,21 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fulfillmentStateTransitions = void 0;
-exports.fulfillmentStateTransitions = {
-    Created: {
-        to: ['Pending'],
-    },
-    Pending: {
-        to: ['Shipped', 'Delivered', 'Cancelled'],
-    },
-    Shipped: {
-        to: ['Delivered', 'Cancelled'],
-    },
-    Delivered: {
-        to: ['Cancelled'],
-    },
-    Cancelled: {
-        to: [],
-    },
-};
 //# sourceMappingURL=fulfillment-state.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"fulfillment-state.js","sourceRoot":"","sources":["../../../../src/service/helpers/fulfillment-state-machine/fulfillment-state.ts"],"names":[],"mappings":";;;AAaa,QAAA,2BAA2B,GAAkC;IACtE,OAAO,EAAE;QACL,EAAE,EAAE,CAAC,SAAS,CAAC;KAClB;IACD,OAAO,EAAE;QACL,EAAE,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC;KAC5C;IACD,OAAO,EAAE;QACL,EAAE,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC;KACjC;IACD,SAAS,EAAE;QACP,EAAE,EAAE,CAAC,WAAW,CAAC;KACpB;IACD,SAAS,EAAE;QACP,EAAE,EAAE,EAAE;KACT;CACJ,CAAC"}
+{"version":3,"file":"fulfillment-state.js","sourceRoot":"","sources":["../../../../src/service/helpers/fulfillment-state-machine/fulfillment-state.ts"],"names":[],"mappings":""}

package/dist/service/helpers/list-query-builder/connection-utils.js

@@ -12,8 +12,14 @@ function getColumnMetadata(connection, entity) {
     const relations = metadata.relations;
     const translationRelation = relations.find(r => r.propertyName === 'translations');
     if (translationRelation) {
+        const commonFields = [
+            'id',
+            'createdAt',
+            'updatedAt',
+            'languageCode',
+        ];
         const translationMetadata = connection.getMetadata(translationRelation.type);
-        translationColumns = translationColumns.concat(translationMetadata.columns.filter(c => !c.relationMetadata));
+        translationColumns = translationColumns.concat(translationMetadata.columns.filter(c => !c.relationMetadata && !commonFields.includes(c.propertyName)));
     }
     const alias = metadata.name.toLowerCase();
     return { columns, translationColumns, alias };

package/dist/service/helpers/list-query-builder/connection-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-utils.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/connection-utils.ts"],"names":[],"mappings":";;;AAMA;;;GAGG;AACH,SAAgB,iBAAiB,CAAI,UAAsB,EAAE,MAAe;IACxE,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IACjC,IAAI,kBAAkB,GAAqB,EAAE,CAAC;IAC9C,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IAErC,MAAM,mBAAmB,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,cAAc,CAAC,CAAC;IACnF,IAAI,mBAAmB,EAAE;QACrB,MAAM,mBAAmB,GAAG,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7E,kBAAkB,GAAG,kBAAkB,CAAC,MAAM,CAC1C,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAC/D,CAAC;KACL;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC;AAClD,CAAC;AAfD,8CAeC;AAED,SAAgB,cAAc,CAAI,UAAsB,EAAE,MAAe;IACrE,OAAO,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AAC7D,CAAC;AAFD,wCAEC;AAED;;;GAGG;AACH,SAAgB,gCAAgC,CAAC,UAAsB,EAAE,UAAkB;IACvF,OAAO,UAAU,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;AACzG,CAAC;AAFD,4EAEC"}
+{"version":3,"file":"connection-utils.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/connection-utils.ts"],"names":[],"mappings":";;;AAOA;;;GAGG;AACH,SAAgB,iBAAiB,CAAI,UAAsB,EAAE,MAAe;IACxE,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IACjC,IAAI,kBAAkB,GAAqB,EAAE,CAAC;IAC9C,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IAErC,MAAM,mBAAmB,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,cAAc,CAAC,CAAC;IACnF,IAAI,mBAAmB,EAAE;QACrB,MAAM,YAAY,GAAkD;YAChE,IAAI;YACJ,WAAW;YACX,WAAW;YACX,cAAc;SACjB,CAAC;QACF,MAAM,mBAAmB,GAAG,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7E,kBAAkB,GAAG,kBAAkB,CAAC,MAAM,CAC1C,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAC9B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,gBAAgB,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAmB,CAAC,CAC5E,CACJ,CAAC;KACL;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC;AAClD,CAAC;AAvBD,8CAuBC;AAED,SAAgB,cAAc,CAAI,UAAsB,EAAE,MAAe;IACrE,OAAO,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AAC7D,CAAC;AAFD,wCAEC;AAED;;;GAGG;AACH,SAAgB,gCAAgC,CAAC,UAAsB,EAAE,UAAkB;IACvF,OAAO,UAAU,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;AACzG,CAAC;AAFD,4EAEC"}

package/dist/service/helpers/list-query-builder/list-query-builder.d.ts

@@ -1,6 +1,6 @@
 import { OnApplicationBootstrap } from '@nestjs/common';
 import { ID, Type } from '@vendure/common/lib/shared-types';
-import { FindConditions, FindOneOptions, SelectQueryBuilder } from 'typeorm';
+import { FindOneOptions, FindOptionsWhere, SelectQueryBuilder } from 'typeorm';
 import { RequestContext } from '../../../api/common/request-context';
 import { ListQueryOptions } from '../../../common/types/common-types';
 import { ConfigService } from '../../../config/config.service';
@@ -13,10 +13,10 @@ import { VendureEntity } from '../../../entity/base/base.entity';
  * @docsCategory data-access
  * @docsPage ListQueryBuilder
  */
-export declare type ExtendedListQueryOptions<T extends VendureEntity> = {
+export type ExtendedListQueryOptions<T extends VendureEntity> = {
     relations?: string[];
     channelId?: ID;
-    where?: FindConditions<T>;
+    where?: FindOptionsWhere<T>;
     orderBy?: FindOneOptions<T>['order'];
     /**
      * @description
@@ -42,7 +42,7 @@ export declare type ExtendedListQueryOptions<T extends VendureEntity> = {
      *
      * Example: we want to allow sort/filter by and Order's `customerLastName`. The actual lastName property is
      * not a column in the Order table, it exists on the Customer entity, and Order has a relation to Customer via
-     * `Order.customer`. Therefore we can define a customPropertyMap like this:
+     * `Order.customer`. Therefore, we can define a customPropertyMap like this:
      *
      * @example
      * ```GraphQL
@@ -66,11 +66,26 @@ export declare type ExtendedListQueryOptions<T extends VendureEntity> = {
      *   customPropertyMap: {
      *     // Tell TypeORM how to map that custom
      *     // sort/filter field to the property on a
-     *     // related entity
+     *     // related entity.
      *     customerLastName: 'customer.lastName',
      *   },
      * };
      * ```
+     * We can now use the `customerLastName` property to filter or sort
+     * on the list query:
+     *
+     * @example
+     * ```GraphQL
+     * query {
+     *   myOrderQuery(options: {
+     *     filter: {
+     *       customerLastName: { contains: "sm" }
+     *     }
+     *   }) {
+     *     # ...
+     *   }
+     * }
+     * ```
      */
     customPropertyMap?: {
         [name: string]: string;
@@ -189,6 +204,7 @@ export declare class ListQueryBuilder implements OnApplicationBootstrap {
      */
     private optimizeGetManyMethod;
     private parallelLoadRelations;
+    private assignDeep;
     /**
      * If a customPropertyMap is provided, we need to take the path provided and convert it to the actual
      * relation aliases being used by the SelectQueryBuilder.
@@ -202,9 +218,10 @@ export declare class ListQueryBuilder implements OnApplicationBootstrap {
      */
     private joinCalculatedColumnRelations;
     /**
-     * If this entity is Translatable, then we need to apply appropriate WHERE clauses to limit
-     * the joined translation relations. This method applies a simple "WHERE" on the languageCode
-     * in the case of the default language, otherwise we use a more complex.
+     * @description
+     * If this entity is Translatable, and we are sorting on one of the translatable fields,
+     * then we need to apply appropriate WHERE clauses to limit
+     * the joined translation relations.
      */
     private applyTranslationConditions;
     /**

package/dist/service/helpers/list-query-builder/list-query-builder.js

@@ -21,7 +21,6 @@ const vendure_logger_1 = require("../../../config/logger/vendure-logger");
 const transactional_connection_1 = require("../../../connection/transactional-connection");
 const connection_utils_1 = require("./connection-utils");
 const get_calculated_columns_1 = require("./get-calculated-columns");
-const parse_channel_param_1 = require("./parse-channel-param");
 const parse_filter_params_1 = require("./parse-filter-params");
 const parse_sort_params_1 = require("./parse-sort-params");
 /**
@@ -116,18 +115,22 @@ let ListQueryBuilder = class ListQueryBuilder {
         const { take, skip } = this.parseTakeSkipParams(apiType, options);
         const repo = extendedOptions.ctx
             ? this.connection.getRepository(extendedOptions.ctx, entity)
-            : this.connection.getRepository(entity);
-        const qb = repo.createQueryBuilder(extendedOptions.entityAlias || entity.name.toLowerCase());
+            : this.connection.rawConnection.getRepository(entity);
+        const alias = extendedOptions.entityAlias || entity.name.toLowerCase();
         const minimumRequiredRelations = this.getMinimumRequiredRelations(repo, options, extendedOptions);
-        FindOptionsUtils_1.FindOptionsUtils.applyFindManyOptionsOrConditionsToQueryBuilder(qb, {
+        const qb = repo.createQueryBuilder(alias).setFindOptions({
             relations: minimumRequiredRelations,
             take,
             skip,
             where: extendedOptions.where || {},
+            // We would like to be able to use this feature
+            // rather than our custom `optimizeGetManyAndCountMethod()` implementation,
+            // but at this time (TypeORM 0.3.12) it throws an error in the case of
+            // a Collection that joins its parent entity.
+            // relationLoadStrategy: 'query',
         });
-        // tslint:disable-next-line:no-non-null-assertion
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         FindOptionsUtils_1.FindOptionsUtils.joinEagerRelations(qb, qb.alias, qb.expressionMap.mainAlias.metadata);
-        this.applyTranslationConditions(qb, entity, extendedOptions.ctx, extendedOptions.entityAlias);
         // join the tables required by calculated columns
         this.joinCalculatedColumnRelations(qb, entity, options);
         const { customPropertyMap, entityAlias } = extendedOptions;
@@ -135,7 +138,9 @@ let ListQueryBuilder = class ListQueryBuilder {
             this.normalizeCustomPropertyMap(customPropertyMap, options, qb);
         }
         const customFieldsForType = this.configService.customFields[entity.name];
-        const sort = (0, parse_sort_params_1.parseSortParams)(rawConnection, entity, Object.assign({}, options.sort, extendedOptions.orderBy), customPropertyMap, entityAlias, customFieldsForType);
+        const sortParams = Object.assign({}, options.sort, extendedOptions.orderBy);
+        this.applyTranslationConditions(qb, entity, sortParams, extendedOptions.ctx, alias);
+        const sort = (0, parse_sort_params_1.parseSortParams)(rawConnection, entity, sortParams, customPropertyMap, entityAlias, customFieldsForType);
         const filter = (0, parse_filter_params_1.parseFilterParams)(rawConnection, entity, options.filter, customPropertyMap, entityAlias);
         if (filter.length) {
             const filterOperator = (_c = options.filterOperator) !== null && _c !== void 0 ? _c : generated_types_1.LogicalOperator.AND;
@@ -153,10 +158,9 @@ let ListQueryBuilder = class ListQueryBuilder {
             }
         }
         if (extendedOptions.channelId) {
-            const channelFilter = (0, parse_channel_param_1.parseChannelParam)(rawConnection, entity, extendedOptions.channelId, extendedOptions.entityAlias);
-            if (channelFilter) {
-                qb.andWhere(channelFilter.clause, channelFilter.parameters);
-            }
+            qb.leftJoin(`${alias}.channels`, 'lqb__channel').andWhere('lqb__channel.id = :channelId', {
+                channelId: extendedOptions.channelId,
+            });
         }
         qb.orderBy(sort);
         this.optimizeGetManyAndCountMethod(qb, repo, extendedOptions, minimumRequiredRelations);
@@ -198,12 +202,34 @@ let ListQueryBuilder = class ListQueryBuilder {
                     // to join the associated relations.
                     continue;
                 }
-                const tableNameLower = path.split('.')[0];
-                const entityMetadata = repository.manager.connection.entityMetadatas.find(em => em.tableNameWithoutPrefix === tableNameLower);
-                if (entityMetadata) {
-                    const relationMetadata = metadata.relations.find(r => r.type === entityMetadata.target);
+                // TODO: Delete for v2
+                // This is a work-around to allow the use of the legacy table-name-based
+                // customPropertyMap syntax
+                let relationPathYieldedMatch = false;
+                const relationPath = path.split('.').slice(0, -1);
+                let targetMetadata = metadata;
+                const recontructedPath = [];
+                for (const relationPathPart of relationPath) {
+                    const relationMetadata = targetMetadata.findRelationWithPropertyPath(relationPathPart);
                     if (relationMetadata) {
-                        requiredRelations.push(relationMetadata.propertyName);
+                        recontructedPath.push(relationMetadata.propertyName);
+                        requiredRelations.push(recontructedPath.join('.'));
+                        targetMetadata = relationMetadata.inverseEntityMetadata;
+                        relationPathYieldedMatch = true;
+                    }
+                }
+                if (!relationPathYieldedMatch) {
+                    // TODO: Delete this in v2.
+                    // Legacy behaviour that uses the table name to reference relations.
+                    // This causes a bunch of issues and is also a bad, unintuitive way to
+                    // reference relations. See https://github.com/vendure-ecommerce/vendure/issues/1774
+                    const tableNameLower = path.split('.')[0];
+                    const entityMetadata = repository.manager.connection.entityMetadatas.find(em => em.tableNameWithoutPrefix === tableNameLower);
+                    if (entityMetadata) {
+                        const relationMetadata = metadata.relations.find(r => r.type === entityMetadata.target);
+                        if (relationMetadata) {
+                            requiredRelations.push(relationMetadata.propertyName);
+                        }
                     }
                 }
             }
@@ -265,7 +291,19 @@ let ListQueryBuilder = class ListQueryBuilder {
         var _a, _b;
         const entityMap = new Map(entities.map(e => [e.id, e]));
         const entitiesIds = entities.map(({ id }) => id);
-        const splitRelations = relations.map(r => r.split('.'));
+        const splitRelations = relations
+            .map(r => r.split('.'))
+            .filter(path => {
+            // There is an issue in TypeORM currently which causes
+            // an error when trying to join nested relations inside
+            // customFields. See https://github.com/vendure-ecommerce/vendure/issues/1664
+            // The work-around is to omit them and rely on the GraphQL resolver
+            // layer to handle.
+            if (path[0] === 'customFields' && 2 < path.length) {
+                return false;
+            }
+            return true;
+        });
         const groupedRelationsMap = new Map();
         for (const relationParts of splitRelations) {
             const group = groupedRelationsMap.get(relationParts[0]);
@@ -285,21 +323,43 @@ let ListQueryBuilder = class ListQueryBuilder {
         }
         const entitiesIdsWithRelations = await Promise.all((_b = Array.from(groupedRelationsMap.values())) === null || _b === void 0 ? void 0 : _b.map(relationPaths => {
             return repo
-                .findByIds(entitiesIds, {
+                .find({
+                where: { id: (0, typeorm_1.In)(entitiesIds) },
                 select: ['id'],
                 relations: relationPaths,
-                loadEagerRelations: false,
+                loadEagerRelations: true,
             })
                 .then(results => results.map(r => ({ relation: relationPaths[0], entity: r })));
         })).then(all => all.flat());
         for (const entry of entitiesIdsWithRelations) {
             const finalEntity = entityMap.get(entry.entity.id);
             if (finalEntity) {
-                finalEntity[entry.relation] = entry.entity[entry.relation];
+                this.assignDeep(entry.relation, entry.entity, finalEntity);
             }
         }
         return Array.from(entityMap.values());
     }
+    assignDeep(relation, source, target) {
+        if (typeof relation === 'string') {
+            const parts = relation.split('.');
+            let resolvedTarget = target;
+            let resolvedSource = source;
+            for (const part of parts.slice(0, parts.length - 1)) {
+                if (!resolvedTarget[part]) {
+                    resolvedTarget[part] = {};
+                }
+                if (!resolvedSource[part]) {
+                    return;
+                }
+                resolvedTarget = resolvedTarget[part];
+                resolvedSource = resolvedSource[part];
+            }
+            resolvedTarget[parts[parts.length - 1]] = resolvedSource[parts[parts.length - 1]];
+        }
+        else {
+            target[relation] = source[relation];
+        }
+    }
     /**
      * If a customPropertyMap is provided, we need to take the path provided and convert it to the actual
      * relation aliases being used by the SelectQueryBuilder.
@@ -307,6 +367,7 @@ let ListQueryBuilder = class ListQueryBuilder {
      * This method mutates the customPropertyMap object.
      */
     normalizeCustomPropertyMap(customPropertyMap, options, qb) {
+        var _a, _b, _c;
         for (const [property, value] of Object.entries(customPropertyMap)) {
             if (!this.customPropertyIsBeingUsed(property, options)) {
                 continue;
@@ -314,7 +375,8 @@ let ListQueryBuilder = class ListQueryBuilder {
             const parts = customPropertyMap[property].split('.');
             const entityPart = 2 <= parts.length ? parts[parts.length - 2] : qb.alias;
             const columnPart = parts[parts.length - 1];
-            const relationAlias = qb.expressionMap.aliases.find(a => a.metadata.tableNameWithoutPrefix === entityPart);
+            const relationMetadata = (_a = qb.expressionMap.mainAlias) === null || _a === void 0 ? void 0 : _a.metadata.findRelationWithPropertyPath(entityPart);
+            const relationAlias = (_b = qb.expressionMap.aliases.find(a => a.metadata.tableNameWithoutPrefix === entityPart)) !== null && _b !== void 0 ? _b : (_c = qb.expressionMap.joinAttributes.find(ja => ja.relationCache === relationMetadata)) === null || _c === void 0 ? void 0 : _c.alias;
             if (relationAlias) {
                 customPropertyMap[property] = `${relationAlias.name}.${columnPart}`;
             }
@@ -357,26 +419,34 @@ let ListQueryBuilder = class ListQueryBuilder {
         }
     }
     /**
-     * If this entity is Translatable, then we need to apply appropriate WHERE clauses to limit
-     * the joined translation relations. This method applies a simple "WHERE" on the languageCode
-     * in the case of the default language, otherwise we use a more complex.
+     * @description
+     * If this entity is Translatable, and we are sorting on one of the translatable fields,
+     * then we need to apply appropriate WHERE clauses to limit
+     * the joined translation relations.
      */
-    applyTranslationConditions(qb, entity, ctx, entityAlias) {
+    applyTranslationConditions(qb, entity, sortParams, ctx, entityAlias) {
         const languageCode = (ctx === null || ctx === void 0 ? void 0 : ctx.languageCode) || this.configService.defaultLanguageCode;
         const { columns, translationColumns, alias: defaultAlias, } = (0, connection_utils_1.getColumnMetadata)(this.connection.rawConnection, entity);
         const alias = entityAlias !== null && entityAlias !== void 0 ? entityAlias : defaultAlias;
-        if (translationColumns.length) {
+        const sortKeys = Object.keys(sortParams);
+        let sortingOnTranslatableKey = false;
+        for (const translationColumn of translationColumns) {
+            if (sortKeys.includes(translationColumn.propertyName)) {
+                sortingOnTranslatableKey = true;
+            }
+        }
+        if (translationColumns.length && sortingOnTranslatableKey) {
             const translationsAlias = qb.connection.namingStrategy.eagerJoinRelationAlias(alias, 'translations');
             qb.andWhere(new typeorm_1.Brackets(qb1 => {
                 var _a;
                 qb1.where(`${translationsAlias}.languageCode = :languageCode`, { languageCode });
                 const defaultLanguageCode = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.channel.defaultLanguageCode) !== null && _a !== void 0 ? _a : this.configService.defaultLanguageCode;
+                const translationEntity = translationColumns[0].entityMetadata.target;
                 if (languageCode !== defaultLanguageCode) {
                     // If the current languageCode is not the default, then we create a more
                     // complex WHERE clause to allow us to use the non-default translations and
                     // fall back to the default language if no translation exists.
                     qb1.orWhere(new typeorm_1.Brackets(qb2 => {
-                        const translationEntity = translationColumns[0].entityMetadata.target;
                         const subQb1 = this.connection.rawConnection
                             .createQueryBuilder(translationEntity, 'translation')
                             .where(`translation.base = ${alias}.id`)
@@ -390,7 +460,6 @@ let ListQueryBuilder = class ListQueryBuilder {
                 }
                 else {
                     qb1.orWhere(new typeorm_1.Brackets(qb2 => {
-                        const translationEntity = translationColumns[0].entityMetadata.target;
                         const subQb1 = this.connection.rawConnection
                             .createQueryBuilder(translationEntity, 'translation')
                             .where(`translation.base = ${alias}.id`)
@@ -404,7 +473,7 @@ let ListQueryBuilder = class ListQueryBuilder {
                 }
                 qb.setParameters({
                     nonDefaultLanguageCode: languageCode,
-                    defaultLanguageCode: this.configService.defaultLanguageCode,
+                    defaultLanguageCode,
                 });
             }));
         }

package/dist/service/helpers/list-query-builder/list-query-builder.js.map

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

package/dist/service/helpers/list-query-builder/parse-filter-params.d.ts

@@ -5,7 +5,7 @@ import { VendureEntity } from '../../../entity/base/base.entity';
 export interface WhereCondition {
     clause: string;
     parameters: {
-        [param: string]: string | number;
+        [param: string]: string | number | string[];
     };
 }
 export declare function parseFilterParams<T extends VendureEntity>(connection: Connection, entity: Type<T>, filterParams?: NullOptionals<FilterParameter<T>> | null, customPropertyMap?: {