@vendure/core 2.0.0-next.1 → 2.0.0-next.4

package/dist/service/services/product-option-group.service.d.ts

@@ -1,6 +1,7 @@
 import { CreateProductOptionGroupInput, UpdateProductOptionGroupInput } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
+import { RelationPaths } from '../../api/index';
 import { Translated } from '../../common/types/locale-types';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { ProductOptionGroup } from '../../entity/product-option-group/product-option-group.entity';
@@ -19,8 +20,8 @@ export declare class ProductOptionGroupService {
     private customFieldRelationService;
     private eventBus;
     constructor(connection: TransactionalConnection, translatableSaver: TranslatableSaver, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus);
-    findAll(ctx: RequestContext, filterTerm?: string): Promise<Array<Translated<ProductOptionGroup>>>;
-    findOne(ctx: RequestContext, id: ID): Promise<Translated<ProductOptionGroup> | undefined>;
+    findAll(ctx: RequestContext, filterTerm?: string, relations?: RelationPaths<ProductOptionGroup>): Promise<Array<Translated<ProductOptionGroup>>>;
+    findOne(ctx: RequestContext, id: ID, relations?: RelationPaths<ProductOptionGroup>): Promise<Translated<ProductOptionGroup> | undefined>;
     getOptionGroupsByProductId(ctx: RequestContext, id: ID): Promise<Array<Translated<ProductOptionGroup>>>;
     create(ctx: RequestContext, input: CreateProductOptionGroupInput): Promise<Translated<ProductOptionGroup>>;
     update(ctx: RequestContext, input: UpdateProductOptionGroupInput): Promise<Translated<ProductOptionGroup>>;

package/dist/service/services/product-option-group.service.js

@@ -34,9 +34,9 @@ let ProductOptionGroupService = class ProductOptionGroupService {
         this.customFieldRelationService = customFieldRelationService;
         this.eventBus = eventBus;
     }
-    findAll(ctx, filterTerm) {
+    findAll(ctx, filterTerm, relations) {
         const findOptions = {
-            relations: ['options'],
+            relations: relations !== null && relations !== void 0 ? relations : ['options'],
         };
         if (filterTerm) {
             findOptions.where = {
@@ -48,11 +48,11 @@ let ProductOptionGroupService = class ProductOptionGroupService {
             .find(findOptions)
             .then(groups => groups.map(group => (0, translate_entity_1.translateDeep)(group, ctx.languageCode, ['options'])));
     }
-    findOne(ctx, id) {
+    findOne(ctx, id, relations) {
         return this.connection
             .getRepository(ctx, product_option_group_entity_1.ProductOptionGroup)
             .findOne(id, {
-            relations: ['options'],
+            relations: relations !== null && relations !== void 0 ? relations : ['options'],
         })
             .then(group => group && (0, translate_entity_1.translateDeep)(group, ctx.languageCode, ['options']));
     }

package/dist/service/services/product-option-group.service.js.map

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

package/dist/service/services/product-variant.service.d.ts

@@ -1,6 +1,7 @@
 import { AssignProductVariantsToChannelInput, CreateProductVariantInput, DeletionResponse, RemoveProductVariantsFromChannelInput, UpdateProductVariantInput } from '@vendure/common/lib/generated-types';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { RequestContextCacheService } from '../../cache/request-context-cache.service';
 import { ListQueryOptions } from '../../common/types/common-types';
 import { Translated } from '../../common/types/locale-types';
@@ -47,14 +48,14 @@ export declare class ProductVariantService {
     private productPriceApplicator;
     constructor(connection: TransactionalConnection, configService: ConfigService, taxCategoryService: TaxCategoryService, facetValueService: FacetValueService, assetService: AssetService, translatableSaver: TranslatableSaver, eventBus: EventBus, listQueryBuilder: ListQueryBuilder, globalSettingsService: GlobalSettingsService, stockMovementService: StockMovementService, channelService: ChannelService, roleService: RoleService, customFieldRelationService: CustomFieldRelationService, requestCache: RequestContextCacheService, productPriceApplicator: ProductPriceApplicator);
     findAll(ctx: RequestContext, options?: ListQueryOptions<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
-    findOne(ctx: RequestContext, productVariantId: ID): Promise<Translated<ProductVariant> | undefined>;
+    findOne(ctx: RequestContext, productVariantId: ID, relations?: RelationPaths<ProductVariant>): Promise<Translated<ProductVariant> | undefined>;
     findByIds(ctx: RequestContext, ids: ID[]): Promise<Array<Translated<ProductVariant>>>;
-    getVariantsByProductId(ctx: RequestContext, productId: ID, options?: ListQueryOptions<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
+    getVariantsByProductId(ctx: RequestContext, productId: ID, options?: ListQueryOptions<ProductVariant>, relations?: RelationPaths<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
     /**
      * @description
      * Returns a {@link PaginatedList} of all ProductVariants associated with the given Collection.
      */
-    getVariantsByCollectionId(ctx: RequestContext, collectionId: ID, options: ListQueryOptions<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
+    getVariantsByCollectionId(ctx: RequestContext, collectionId: ID, options: ListQueryOptions<ProductVariant>, relations?: RelationPaths<ProductVariant>): Promise<PaginatedList<Translated<ProductVariant>>>;
     /**
      * @description
      * Returns all Channels to which the ProductVariant is assigned.
@@ -85,6 +86,7 @@ export declare class ProductVariantService {
      * as well as the local and global `outOfStockThreshold` settings.
      */
     getSaleableStockLevel(ctx: RequestContext, variant: ProductVariant): Promise<number>;
+    private getOutOfStockThreshold;
     /**
      * @description
      * Returns the stockLevel to display to the customer, as specified by the configured
@@ -116,6 +118,12 @@ export declare class ProductVariantService {
      * Is optimized to make as few DB calls as possible using caching based on the open request.
      */
     hydratePriceFields<F extends 'currencyCode' | 'price' | 'priceWithTax' | 'taxRateApplied'>(ctx: RequestContext, variant: ProductVariant, priceField: F): Promise<ProductVariant[F]>;
+    /**
+     * @description
+     * Given an array of ProductVariants from the database, this method will apply the correct price and tax
+     * and translate each item.
+     */
+    private applyPricesAndTranslateVariants;
     /**
      * @description
      * Populates the `price` field with the price for the specified channel.

package/dist/service/services/product-variant.service.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductVariantService = void 0;
 const common_1 = require("@nestjs/common");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
+const unique_1 = require("@vendure/common/lib/unique");
 const request_context_cache_service_1 = require("../../cache/request-context-cache.service");
 const errors_1 = require("../../common/error/errors");
 const utils_1 = require("../../common/utils");
@@ -73,18 +74,17 @@ let ProductVariantService = class ProductVariantService {
         })
             .getManyAndCount()
             .then(async ([variants, totalItems]) => {
-            const items = await Promise.all(variants.map(async (variant) => (0, translate_entity_1.translateDeep)(await this.applyChannelPriceAndTax(variant, ctx), ctx.languageCode)));
+            const items = await this.applyPricesAndTranslateVariants(ctx, variants);
             return {
                 items,
                 totalItems,
             };
         });
     }
-    findOne(ctx, productVariantId) {
-        const relations = ['product', 'product.featuredAsset', 'taxCategory'];
+    findOne(ctx, productVariantId, relations) {
         return this.connection
             .findOneInChannel(ctx, product_variant_entity_1.ProductVariant, productVariantId, ctx.channelId, {
-            relations,
+            relations: [...(relations || ['product', 'product.featuredAsset']), 'taxCategory'],
             where: { deletedAt: null },
         })
             .then(async (result) => {
@@ -107,26 +107,21 @@ let ProductVariantService = class ProductVariantService {
                 'featuredAsset',
             ],
         })
-            .then(variants => {
-            return Promise.all(variants.map(async (variant) => (0, translate_entity_1.translateDeep)(await this.applyChannelPriceAndTax(variant, ctx), ctx.languageCode, [
-                'options',
-                'facetValues',
-                ['facetValues', 'facet'],
-            ])));
-        });
+            .then(variants => this.applyPricesAndTranslateVariants(ctx, variants));
     }
-    getVariantsByProductId(ctx, productId, options = {}) {
-        const relations = [
-            'options',
-            'facetValues',
-            'facetValues.facet',
-            'taxCategory',
-            'assets',
-            'featuredAsset',
-        ];
+    getVariantsByProductId(ctx, productId, options = {}, relations) {
         const qb = this.listQueryBuilder
             .build(product_variant_entity_1.ProductVariant, options, {
-            relations,
+            relations: [
+                ...(relations || [
+                    'options',
+                    'facetValues',
+                    'facetValues.facet',
+                    'assets',
+                    'featuredAsset',
+                ]),
+                'taxCategory',
+            ],
             orderBy: { id: 'ASC' },
             where: { deletedAt: null },
             ctx,
@@ -141,14 +136,7 @@ let ProductVariantService = class ProductVariantService {
             qb.andWhere('productvariant.enabled = :enabled', { enabled: true });
         }
         return qb.getManyAndCount().then(async ([variants, totalItems]) => {
-            const items = await Promise.all(variants.map(async (variant) => {
-                const variantWithPrices = await this.applyChannelPriceAndTax(variant, ctx);
-                return (0, translate_entity_1.translateDeep)(variantWithPrices, ctx.languageCode, [
-                    'options',
-                    'facetValues',
-                    ['facetValues', 'facet'],
-                ]);
-            }));
+            const items = await this.applyPricesAndTranslateVariants(ctx, variants);
             return {
                 items,
                 totalItems,
@@ -159,10 +147,10 @@ let ProductVariantService = class ProductVariantService {
      * @description
      * Returns a {@link PaginatedList} of all ProductVariants associated with the given Collection.
      */
-    getVariantsByCollectionId(ctx, collectionId, options) {
+    getVariantsByCollectionId(ctx, collectionId, options, relations = []) {
         const qb = this.listQueryBuilder
             .build(product_variant_entity_1.ProductVariant, options, {
-            relations: ['taxCategory', 'channels'],
+            relations: (0, unique_1.unique)([...relations, 'taxCategory']),
             channelId: ctx.channelId,
             ctx,
         })
@@ -175,10 +163,7 @@ let ProductVariantService = class ProductVariantService {
             qb.andWhere('product.enabled = :enabled', { enabled: true });
         }
         return qb.getManyAndCount().then(async ([variants, totalItems]) => {
-            const items = await Promise.all(variants.map(async (variant) => {
-                const variantWithPrices = await this.applyChannelPriceAndTax(variant, ctx);
-                return (0, translate_entity_1.translateDeep)(variantWithPrices, ctx.languageCode);
-            }));
+            const items = await this.applyPricesAndTranslateVariants(ctx, variants);
             return {
                 items,
                 totalItems,
@@ -202,9 +187,10 @@ let ProductVariantService = class ProductVariantService {
      */
     async getVariantByOrderLineId(ctx, orderLineId) {
         const { productVariant } = await this.connection.getEntityOrThrow(ctx, entity_1.OrderLine, orderLineId, {
-            relations: ['productVariant'],
+            relations: ['productVariant', 'productVariant.taxCategory'],
+            includeSoftDeleted: true,
         });
-        return (0, translate_entity_1.translateDeep)(productVariant, ctx.languageCode);
+        return (0, translate_entity_1.translateDeep)(await this.applyChannelPriceAndTax(productVariant, ctx), ctx.languageCode);
     }
     /**
      * @description
@@ -254,6 +240,17 @@ let ProductVariantService = class ProductVariantService {
             : variant.outOfStockThreshold;
         return variant.stockOnHand - variant.stockAllocated - effectiveOutOfStockThreshold;
     }
+    async getOutOfStockThreshold(ctx, variant) {
+        const { outOfStockThreshold, trackInventory } = await this.requestCache.get(ctx, 'globalSettings', () => this.globalSettingsService.getSettings(ctx));
+        const inventoryNotTracked = variant.trackInventory === generated_types_1.GlobalFlag.FALSE ||
+            (variant.trackInventory === generated_types_1.GlobalFlag.INHERIT && trackInventory === false);
+        if (inventoryNotTracked) {
+            return 0;
+        }
+        else {
+            return variant.useGlobalOutOfStockThreshold ? outOfStockThreshold : variant.outOfStockThreshold;
+        }
+    }
     /**
      * @description
      * Returns the stockLevel to display to the customer, as specified by the configured
@@ -353,7 +350,8 @@ let ProductVariantService = class ProductVariantService {
             channelId: ctx.channelId,
             relations: ['facetValues', 'facetValues.channels'],
         });
-        if (input.stockOnHand && input.stockOnHand < 0) {
+        const outOfStockThreshold = await this.getOutOfStockThreshold(ctx, existingVariant);
+        if (input.stockOnHand && input.stockOnHand < outOfStockThreshold) {
             throw new errors_1.UserInputError('error.stockonhand-cannot-be-negative');
         }
         const inputWithoutPrice = Object.assign({}, input);
@@ -453,11 +451,11 @@ let ProductVariantService = class ProductVariantService {
                 var _a;
                 try {
                     if (!((_a = variant.productVariantPrices) === null || _a === void 0 ? void 0 : _a.length)) {
-                        const variantWithPrices = await this.connection.getEntityOrThrow(ctx, product_variant_entity_1.ProductVariant, variant.id, { relations: ['productVariantPrices'] });
+                        const variantWithPrices = await this.connection.getEntityOrThrow(ctx, product_variant_entity_1.ProductVariant, variant.id, { relations: ['productVariantPrices'], includeSoftDeleted: true });
                         variant.productVariantPrices = variantWithPrices.productVariantPrices;
                     }
                     if (!variant.taxCategory) {
-                        const variantWithTaxCategory = await this.connection.getEntityOrThrow(ctx, product_variant_entity_1.ProductVariant, variant.id, { relations: ['taxCategory'] });
+                        const variantWithTaxCategory = await this.connection.getEntityOrThrow(ctx, product_variant_entity_1.ProductVariant, variant.id, { relations: ['taxCategory'], includeSoftDeleted: true });
                         variant.taxCategory = variantWithTaxCategory.taxCategory;
                     }
                     resolve(await this.applyChannelPriceAndTax(variant, ctx));
@@ -471,6 +469,21 @@ let ProductVariantService = class ProductVariantService {
         const hydratedVariant = await populatePricesPromise;
         return hydratedVariant[priceField];
     }
+    /**
+     * @description
+     * Given an array of ProductVariants from the database, this method will apply the correct price and tax
+     * and translate each item.
+     */
+    async applyPricesAndTranslateVariants(ctx, variants) {
+        return await Promise.all(variants.map(async (variant) => {
+            const variantWithPrices = await this.applyChannelPriceAndTax(variant, ctx);
+            return (0, translate_entity_1.translateDeep)(variantWithPrices, ctx.languageCode, [
+                'options',
+                'facetValues',
+                ['facetValues', 'facet'],
+            ]);
+        }));
+    }
     /**
      * @description
      * Populates the `price` field with the price for the specified channel.

package/dist/service/services/product-variant.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-variant.service.js","sourceRoot":"","sources":["../../../src/service/services/product-variant.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"product-variant.service.js","sourceRoot":"","sources":["../../../src/service/services/product-variant.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAS6C;AAE7C,uDAAoD;AAIpD,6FAAuF;AACvF,sDAAgG;AAGhG,8CAAiD;AACjD,gEAA4D;AAC5D,wFAAoF;AACpF,yCAOsB;AAEtB,6FAAkF;AAClF,wHAA4G;AAC5G,gGAAqF;AACrF,wEAA8D;AAC9D,yDAAqD;AACrD,wGAAkG;AAClG,wFAAmF;AACnF,kHAA4G;AAC5G,yFAAoF;AACpF,2GAAsG;AACtG,yFAAqF;AACrF,gEAA4D;AAC5D,wEAAkE;AAElE,mDAA+C;AAC/C,uDAAmD;AACnD,+DAA0D;AAC1D,uEAAkE;AAClE,iDAA6C;AAC7C,qEAAgE;AAChE,iEAA4D;AAE5D;;;;;GAKG;AAEH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAC9B,YACY,UAAmC,EACnC,aAA4B,EAC5B,kBAAsC,EACtC,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,QAAkB,EAClB,gBAAkC,EAClC,qBAA4C,EAC5C,oBAA0C,EAC1C,cAA8B,EAC9B,WAAwB,EACxB,0BAAsD,EACtD,YAAwC,EACxC,sBAA8C;QAd9C,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,aAAQ,GAAR,QAAQ,CAAU;QAClB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACxB,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,iBAAY,GAAZ,YAAY,CAA4B;QACxC,2BAAsB,GAAtB,sBAAsB,CAAwB;IACvD,CAAC;IAEJ,KAAK,CAAC,OAAO,CACT,GAAmB,EACnB,OAA0C;QAE1C,MAAM,SAAS,GAAG,CAAC,eAAe,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC,gBAAgB;aACvB,KAAK,CAAC,uCAAc,EAAE,OAAO,EAAE;YAC5B,SAAS;YACT,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;YAC1B,GAAG;SACN,CAAC;aACD,eAAe,EAAE;aACjB,IAAI,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE;YACnC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACxE,OAAO;gBACH,KAAK;gBACL,UAAU;aACb,CAAC;QACN,CAAC,CAAC,CAAC;IACX,CAAC;IAED,OAAO,CACH,GAAmB,EACnB,gBAAoB,EACpB,SAAyC;QAEzC,OAAO,IAAI,CAAC,UAAU;aACjB,gBAAgB,CAAC,GAAG,EAAE,uCAAc,EAAE,gBAAgB,EAAE,GAAG,CAAC,SAAS,EAAE;YACpE,SAAS,EAAE,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,EAAE,aAAa,CAAC;YAClF,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;SAC7B,CAAC;aACD,IAAI,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;YACjB,IAAI,MAAM,EAAE;gBACR,OAAO,IAAA,gCAAa,EAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,YAAY,EAAE;oBACpF,SAAS;iBACZ,CAAC,CAAC;aACN;QACL,CAAC,CAAC,CAAC;IACX,CAAC;IAED,SAAS,CAAC,GAAmB,EAAE,GAAS;QACpC,OAAO,IAAI,CAAC,UAAU;aACjB,kBAAkB,CAAC,GAAG,EAAE,uCAAc,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE;YACzD,SAAS,EAAE;gBACP,SAAS;gBACT,aAAa;gBACb,mBAAmB;gBACnB,aAAa;gBACb,QAAQ;gBACR,eAAe;aAClB;SACJ,CAAC;aACD,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,sBAAsB,CAClB,GAAmB,EACnB,SAAa,EACb,UAA4C,EAAE,EAC9C,SAAyC;QAEzC,MAAM,EAAE,GAAG,IAAI,CAAC,gBAAgB;aAC3B,KAAK,CAAC,uCAAc,EAAE,OAAO,EAAE;YAC5B,SAAS,EAAE;gBACP,GAAG,CAAC,SAAS,IAAI;oBACb,SAAS;oBACT,aAAa;oBACb,mBAAmB;oBACnB,QAAQ;oBACR,eAAe;iBAClB,CAAC;gBACF,aAAa;aAChB;YACD,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;YACtB,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;YAC1B,GAAG;SACN,CAAC;aACD,kBAAkB,CAAC,yBAAyB,EAAE,SAAS,EAAE,yBAAyB,EAAE;YACjF,SAAS,EAAE,GAAG,CAAC,SAAS;SAC3B,CAAC;aACD,kBAAkB,CAAC,wBAAwB,EAAE,SAAS,EAAE,yBAAyB,EAAE;YAChF,SAAS;SACZ,CAAC,CAAC;QAEP,IAAI,GAAG,CAAC,OAAO,KAAK,MAAM,EAAE;YACxB,EAAE,CAAC,QAAQ,CAAC,mCAAmC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACvE;QAED,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE;YAC9D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACxE,OAAO;gBACH,KAAK;gBACL,UAAU;aACb,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACH,yBAAyB,CACrB,GAAmB,EACnB,YAAgB,EAChB,OAAyC,EACzC,YAA2C,EAAE;QAE7C,MAAM,EAAE,GAAG,IAAI,CAAC,gBAAgB;aAC3B,KAAK,CAAC,uCAAc,EAAE,OAAO,EAAE;YAC5B,SAAS,EAAE,IAAA,eAAM,EAAC,CAAC,GAAG,SAAS,EAAE,aAAa,CAAC,CAAC;YAChD,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,GAAG;SACN,CAAC;aACD,QAAQ,CAAC,4BAA4B,EAAE,YAAY,CAAC;aACpD,QAAQ,CAAC,wBAAwB,EAAE,SAAS,CAAC;aAC7C,QAAQ,CAAC,2BAA2B,CAAC;aACrC,QAAQ,CAAC,kCAAkC,CAAC;aAC5C,QAAQ,CAAC,+BAA+B,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QAEjE,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,IAAI,EAAE;YAC3F,EAAE,CAAC,QAAQ,CAAC,4BAA4B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAChE;QAED,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE;YAC9D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACxE,OAAO;gBACH,KAAK;gBACL,UAAU;aACb,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,yBAAyB,CAAC,GAAmB,EAAE,gBAAoB;QACrE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,uCAAc,EAAE,gBAAgB,EAAE;YAC1F,SAAS,EAAE,CAAC,UAAU,CAAC;YACvB,SAAS,EAAE,GAAG,CAAC,SAAS;SAC3B,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,QAAQ,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,uBAAuB,CAAC,GAAmB,EAAE,WAAe;QAC9D,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,kBAAS,EAAE,WAAW,EAAE;YAC3F,SAAS,EAAE,CAAC,gBAAgB,EAAE,4BAA4B,CAAC;YAC3D,kBAAkB,EAAE,IAAI;SAC3B,CAAC,CAAC;QACH,OAAO,IAAA,gCAAa,EAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACpG,CAAC;IAED;;;OAGG;IACH,oBAAoB,CAAC,GAAmB,EAAE,SAAa;QACnD,OAAO,IAAI,CAAC,UAAU;aACjB,gBAAgB,CAAC,GAAG,EAAE,uCAAc,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE;YAC7D,SAAS,EAAE,CAAC,SAAS,CAAC;SACzB,CAAC;aACD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,gCAAa,EAAC,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;IAED,wBAAwB,CAAC,GAAmB,EAAE,SAAa;QACvD,OAAO,IAAI,CAAC,UAAU;aACjB,gBAAgB,CAAC,GAAG,EAAE,uCAAc,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE;YAC7D,SAAS,EAAE,CAAC,aAAa,EAAE,mBAAmB,EAAE,sBAAsB,CAAC;SAC1E,CAAC;aACD,IAAI,CAAC,OAAO,CAAC,EAAE,CACZ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,gCAAa,EAAC,CAAC,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAC9F,CAAC;IACV,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,oBAAoB,CAAC,GAAmB,EAAE,OAAuB;QACnE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,wBAAO,EAAE,OAAO,CAAC,SAAS,EAAE;YACpF,kBAAkB,EAAE,IAAI;SAC3B,CAAC,CAAC;QACH,OAAO,IAAA,gCAAa,EAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,qBAAqB,CAAC,GAAmB,EAAE,OAAuB;QACpE,MAAM,EAAE,mBAAmB,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CACvE,GAAG,EACH,gBAAgB,EAChB,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,GAAG,CAAC,CACpD,CAAC;QAEF,MAAM,mBAAmB,GACrB,OAAO,CAAC,cAAc,KAAK,4BAAU,CAAC,KAAK;YAC3C,CAAC,OAAO,CAAC,cAAc,KAAK,4BAAU,CAAC,OAAO,IAAI,cAAc,KAAK,KAAK,CAAC,CAAC;QAChF,IAAI,mBAAmB,EAAE;YACrB,OAAO,MAAM,CAAC,gBAAgB,CAAC;SAClC;QAED,MAAM,4BAA4B,GAAG,OAAO,CAAC,4BAA4B;YACrE,CAAC,CAAC,mBAAmB;YACrB,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC;QAElC,OAAO,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,cAAc,GAAG,4BAA4B,CAAC;IACvF,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,GAAmB,EAAE,OAAuB;QAC7E,MAAM,EAAE,mBAAmB,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CACvE,GAAG,EACH,gBAAgB,EAChB,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,GAAG,CAAC,CACpD,CAAC;QAEF,MAAM,mBAAmB,GACrB,OAAO,CAAC,cAAc,KAAK,4BAAU,CAAC,KAAK;YAC3C,CAAC,OAAO,CAAC,cAAc,KAAK,4BAAU,CAAC,OAAO,IAAI,cAAc,KAAK,KAAK,CAAC,CAAC;QAChF,IAAI,mBAAmB,EAAE;YACrB,OAAO,CAAC,CAAC;SACZ;aAAM;YACH,OAAO,OAAO,CAAC,4BAA4B,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC;SACnG;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,oBAAoB,CAAC,GAAmB,EAAE,OAAuB;QACnE,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QACnE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1E,OAAO,oBAAoB,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAChF,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,wBAAwB,CAAC,GAAmB,EAAE,OAAuB;QACvE,MAAM,EAAE,mBAAmB,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAClG,MAAM,mBAAmB,GACrB,OAAO,CAAC,cAAc,KAAK,4BAAU,CAAC,KAAK;YAC3C,CAAC,OAAO,CAAC,cAAc,KAAK,4BAAU,CAAC,OAAO,IAAI,cAAc,KAAK,KAAK,CAAC,CAAC;QAChF,IAAI,mBAAmB,EAAE;YACrB,OAAO,MAAM,CAAC,gBAAgB,CAAC;SAClC;QAED,OAAO,OAAO,CAAC,WAAW,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CACR,GAAmB,EACnB,KAAkC;QAElC,MAAM,GAAG,GAAS,EAAE,CAAC;QACrB,KAAK,MAAM,YAAY,IAAI,KAAK,EAAE;YAC9B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;YACtD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAChB;QACD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACvD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,2CAAmB,CAAC,GAAG,EAAE,eAAe,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACvF,OAAO,eAAe,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,MAAM,CACR,GAAmB,EACnB,KAAkC;QAElC,KAAK,MAAM,YAAY,IAAI,KAAK,EAAE;YAC9B,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;SAC9C;QACD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,CACxC,GAAG,EACH,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACvB,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,2CAAmB,CAAC,GAAG,EAAE,eAAe,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACvF,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,GAAmB,EAAE,KAAgC;QAC5E,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;YAClB,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC;SACxB;QACD,IAAI,KAAK,CAAC,KAAK,IAAI,IAAI,EAAE;YACrB,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC;SACnB;QACD,KAAK,CAAC,aAAa,GAAG,CAAC,MAAM,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5F,MAAM,iBAAiB,qBAChB,KAAK,CACX,CAAC;QACF,OAAO,iBAAiB,CAAC,KAAK,CAAC;QAC/B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;YACvD,GAAG;YACH,KAAK,EAAE,iBAAiB;YACxB,UAAU,EAAE,uCAAc;YAC1B,eAAe,EAAE,8DAAyB;YAC1C,UAAU,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;gBACxB,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;gBAC5B,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,EAAE;oBAC/B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU;yBACxC,aAAa,CAAC,GAAG,EAAE,qCAAa,CAAC;yBACjC,SAAS,CAAC,SAAS,CAAC,CAAC;oBAC1B,OAAO,CAAC,OAAO,GAAG,eAAe,CAAC;iBACrC;gBACD,IAAI,KAAK,CAAC,aAAa,EAAE;oBACrB,OAAO,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;iBAC1F;gBACD,OAAO,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,SAAS,EAAS,CAAC;gBACjD,OAAO,CAAC,WAAW,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,aAAa,EAAS,CAAC;gBACzD,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;gBACjE,MAAM,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACnE,CAAC;YACD,qBAAqB,EAAE;gBACnB,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,aAAa,EAAE,KAAK,CAAC,aAAa;aACrC;SACJ,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC,GAAG,EAAE,uCAAc,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAClG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;QACvE,IAAI,KAAK,CAAC,WAAW,IAAI,IAAI,IAAI,KAAK,CAAC,WAAW,KAAK,CAAC,EAAE;YACtD,MAAM,IAAI,CAAC,oBAAoB,CAAC,yBAAyB,CACrD,GAAG,EACH,cAAc,CAAC,EAAE,EACjB,CAAC,EACD,KAAK,CAAC,WAAW,CACpB,CAAC;SACL;QAED,MAAM,gBAAgB,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,CAAC,iCAAiC,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QACjG,IAAI,CAAC,IAAA,mBAAW,EAAC,GAAG,CAAC,SAAS,EAAE,gBAAgB,CAAC,EAAE;YAC/C,gFAAgF;YAChF,oFAAoF;YACpF,wCAAwC;YACxC,MAAM,IAAI,CAAC,iCAAiC,CACxC,GAAG,EACH,cAAc,CAAC,EAAE,EACjB,KAAK,CAAC,KAAK,EACX,gBAAgB,CACnB,CAAC;SACL;QACD,OAAO,cAAc,CAAC,EAAE,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,GAAmB,EAAE,KAAgC;QAC5E,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,uCAAc,EAAE,KAAK,CAAC,EAAE,EAAE;YAC1F,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,CAAC,aAAa,EAAE,sBAAsB,CAAC;SACrD,CAAC,CAAC;QACH,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACpF,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,GAAG,mBAAmB,EAAE;YAC9D,MAAM,IAAI,uBAAc,CAAC,sCAAsC,CAAC,CAAC;SACpE;QACD,MAAM,iBAAiB,qBAChB,KAAK,CACX,CAAC;QACF,OAAO,iBAAiB,CAAC,KAAK,CAAC;QAC/B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;YACvD,GAAG;YACH,KAAK,EAAE,iBAAiB;YACxB,UAAU,EAAE,uCAAc;YAC1B,eAAe,EAAE,8DAAyB;YAC1C,UAAU,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;gBAClB,IAAI,KAAK,CAAC,aAAa,EAAE;oBACrB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;oBACpF,IAAI,WAAW,EAAE;wBACb,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC;qBAC/B;iBACJ;gBACD,IAAI,KAAK,CAAC,aAAa,EAAE;oBACrB,MAAM,0BAA0B,GAAG,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CACvE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAA,mBAAW,EAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CACxE,CAAC;oBACF,CAAC,CAAC,WAAW,GAAG;wBACZ,GAAG,0BAA0B;wBAC7B,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;qBACxE,CAAC;iBACL;gBACD,IAAI,KAAK,CAAC,WAAW,IAAI,IAAI,EAAE;oBAC3B,MAAM,IAAI,CAAC,oBAAoB,CAAC,yBAAyB,CACrD,GAAG,EACH,eAAe,CAAC,EAAE,EAClB,eAAe,CAAC,WAAW,EAC3B,KAAK,CAAC,WAAW,CACpB,CAAC;iBACL;gBACD,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;gBAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YAC9D,CAAC;YACD,qBAAqB,EAAE;gBACnB,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,aAAa,EAAE,KAAK,CAAC,aAAa;aACrC;SACJ,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC,GAAG,EAAE,uCAAc,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAClG,IAAI,KAAK,CAAC,KAAK,IAAI,IAAI,EAAE;YACrB,MAAM,sBAAsB,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,4BAAmB,CAAC,CAAC;YACvF,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC;gBACtD,KAAK,EAAE;oBACH,OAAO,EAAE,KAAK,CAAC,EAAE;oBACjB,SAAS,EAAE,GAAG,CAAC,SAAS;iBAC3B;aACJ,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,EAAE;gBACf,MAAM,IAAI,4BAAmB,CAAC,4CAA4C,CAAC,CAAC;aAC/E;YACD,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YACjC,MAAM,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACnD;QACD,OAAO,cAAc,CAAC,EAAE,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,iCAAiC,CACnC,GAAmB,EACnB,gBAAoB,EACpB,KAAa,EACb,SAAa;QAEb,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,4BAAmB,CAAC,CAAC,OAAO,CAAC;YACrF,KAAK,EAAE;gBACH,OAAO,EAAE,gBAAgB;gBACzB,SAAS;aACZ;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,EAAE;YACf,YAAY,GAAG,IAAI,4BAAmB,CAAC;gBACnC,SAAS;gBACT,OAAO,EAAE,IAAI,uCAAc,CAAC,EAAE,EAAE,EAAE,gBAAgB,EAAE,CAAC;aACxD,CAAC,CAAC;SACN;QACD,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC;QAC3B,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,4BAAmB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAmB,EAAE,EAAa;QAC/C,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACzF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,OAAO,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;SAClC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3F,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,2CAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QAC7E,OAAO;YACH,MAAM,EAAE,gCAAc,CAAC,OAAO;SACjC,CAAC;IACN,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,kBAAkB,CACpB,GAAmB,EACnB,OAAuB,EACvB,UAAa;QAEb,MAAM,QAAQ,GAAG,gCAAgC,OAAO,CAAC,EAAE,EAAE,CAAC;QAC9D,IAAI,qBAAqB,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAA0B,GAAG,EAAE,QAAQ,CAAC,CAAC;QAE1F,IAAI,CAAC,qBAAqB,EAAE;YACxB,qBAAqB,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;;gBAC1D,IAAI;oBACA,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,oBAAoB,0CAAE,MAAM,CAAA,EAAE;wBACvC,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAC5D,GAAG,EACH,uCAAc,EACd,OAAO,CAAC,EAAE,EACV,EAAE,SAAS,EAAE,CAAC,sBAAsB,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACpE,CAAC;wBACF,OAAO,CAAC,oBAAoB,GAAG,iBAAiB,CAAC,oBAAoB,CAAC;qBACzE;oBACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;wBACtB,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CACjE,GAAG,EACH,uCAAc,EACd,OAAO,CAAC,EAAE,EACV,EAAE,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAC3D,CAAC;wBACF,OAAO,CAAC,WAAW,GAAG,sBAAsB,CAAC,WAAW,CAAC;qBAC5D;oBACD,OAAO,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;iBAC7D;gBAAC,OAAO,CAAM,EAAE;oBACb,MAAM,CAAC,CAAC,CAAC,CAAC;iBACb;YACL,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,qBAAqB,CAAC,CAAC;SAC/D;QACD,MAAM,eAAe,GAAG,MAAM,qBAAqB,CAAC;QACpD,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,+BAA+B,CACzC,GAAmB,EACnB,QAA0B;QAE1B,OAAO,MAAM,OAAO,CAAC,GAAG,CACpB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YACzB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAC3E,OAAO,IAAA,gCAAa,EAAC,iBAAiB,EAAE,GAAG,CAAC,YAAY,EAAE;gBACtD,SAAS;gBACT,aAAa;gBACb,CAAC,aAAa,EAAE,OAAO,CAAC;aAC3B,CAAC,CAAC;QACP,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,uBAAuB,CACzB,OAAuB,EACvB,GAAmB,EACnB,KAAa;QAEb,OAAO,IAAI,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACpF,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,8BAA8B,CAChC,GAAmB,EACnB,KAA0C;;QAE1C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,0BAA0B,CACnE,GAAG,EACH,KAAK,CAAC,SAAS,EACf,4BAAU,CAAC,aAAa,CAC3B,CAAC;QACF,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,IAAI,uBAAc,EAAE,CAAC;SAC9B;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU;aACjC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC;aAClC,SAAS,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;QAClF,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QACtE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,IAAI,OAAO,CAAC,SAAS,EAAE;gBACnB,SAAS;aACZ;YACD,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,GAAG,EAAE,wBAAO,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/F,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,GAAG,EAAE,uCAAc,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/F,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;YAC9E,MAAM,KAAK,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,gBAAgB,EAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;YACrF,MAAM,IAAI,CAAC,iCAAiC,CACxC,GAAG,EACH,OAAO,CAAC,EAAE,EACV,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,WAAW,CAAC,EAC/B,KAAK,CAAC,SAAS,CAClB,CAAC;YACF,MAAM,QAAQ,GAAG,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAI,EAAE,CAAC;YAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;SAC1F;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAC/B,GAAG,EACH,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC1B,CAAC;QACF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,0DAA0B,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;SACpG;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gCAAgC,CAClC,GAAmB,EACnB,KAA4C;QAE5C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,0BAA0B,CACnE,GAAG,EACH,KAAK,CAAC,SAAS,EACf,4BAAU,CAAC,aAAa,CAC3B,CAAC;QACF,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,IAAI,uBAAc,EAAE,CAAC;SAC9B;QACD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC;QACrE,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAAC,EAAE;YACjD,MAAM,IAAI,uBAAc,CAAC,uDAAuD,CAAC,CAAC;SACrF;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU;aACjC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC;aAClC,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACxC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,uCAAc,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YACjG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,4BAAmB,CAAC,CAAC,MAAM,CAAC;gBACjE,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,OAAO;aACV,CAAC,CAAC;YACH,6FAA6F;YAC7F,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,IAAI,CAAC;gBAClF,KAAK,EAAE;oBACH,SAAS,EAAE,OAAO,CAAC,SAAS;iBAC/B;gBACD,SAAS,EAAE,CAAC,UAAU,CAAC;aAC1B,CAAC,CAAC;YACH,MAAM,2BAA2B,GAAI,EAAgB,CAAC,MAAM,CACxD,GAAG,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAC5C,CAAC;YACF,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,SAAS,CAAC,EAAE;gBAClE,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,wBAAO,EAAE,OAAO,CAAC,SAAS,EAAE;oBAC1E,KAAK,CAAC,SAAS;iBAClB,CAAC,CAAC;aACN;SACJ;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAC/B,GAAG,EACH,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC1B,CAAC;QACF,4FAA4F;QAC5F,2FAA2F;QAC3F,kCAAkC;QAClC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,0DAA0B,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;SACnG;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,GAAmB,EAAE,KAAgC;QACxF,kFAAkF;QAClF,0DAA0D;QAC1D,MAAM,YAAY,GAAG,CACjB,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,wBAAO,EAAE,KAAK,CAAC,SAAS,EAAE;YAClE,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,CAAC,cAAc,EAAE,sBAAsB,CAAC;YACnD,kBAAkB,EAAE,KAAK;SAC5B,CAAC,CACL,CAAC,YAAY,CAAC;QAEf,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC;QAExC,IAAI,SAAS,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,EAAE;YAC1C,IAAI,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAC;SACpD;QACD,IACI,CAAC,IAAA,0BAAW,EACR,SAAS,EACT,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAClD,EACH;YACE,IAAI,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAC;SACpD;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,wBAAO,EAAE,KAAK,CAAC,SAAS,EAAE;YAClF,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,CAAC,UAAU,EAAE,kBAAkB,CAAC;YAC3C,kBAAkB,EAAE,KAAK;SAC5B,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAErD,OAAO,CAAC,QAAQ;aACX,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;aACzB,OAAO,CAAC,OAAO,CAAC,EAAE;YACf,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YACnE,IAAI,gBAAgB,KAAK,cAAc,EAAE;gBACrC,MAAM,IAAI,uBAAc,CAAC,0DAA0D,EAAE;oBACjF,WAAW,EAAE,IAAA,gCAAa,EAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI;iBAC7D,CAAC,CAAC;aACN;QACL,CAAC,CAAC,CAAC;IACX,CAAC;IAEO,6BAA6B,CAAC,YAAkC;QACpE,MAAM,IAAI,uBAAc,CAAC,iDAAiD,EAAE;YACxE,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,EAAE,MAAM,CAAC;SACxD,CAAC,CAAC;IACP,CAAC;IAEO,QAAQ,CAAI,GAAQ,EAAE,IAAY,EAAE,IAAc;QACtD,OAAO,GAAG;aACL,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAC9B,IAAI,EAAE;aACN,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACrC,GAAmB,EACnB,aAAoC;;QAEpC,IAAI,WAAwB,CAAC;QAC7B,IAAI,aAAa,EAAE;YACf,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,oBAAW,EAAE,aAAa,CAAC,CAAC;SACzF;aAAM;YACH,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACjE,WAAW,GAAG,MAAA,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,mCAAI,aAAa,CAAC,CAAC,CAAC,CAAC;SACnF;QACD,IAAI,CAAC,WAAW,EAAE;YACd,sDAAsD;YACtD,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;SACrF;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;CACJ,CAAA;AAxuBY,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAGe,kDAAuB;QACpB,8BAAa;QACR,yCAAkB;QACnB,uCAAiB;QACtB,4BAAY;QACP,sCAAiB;QAC1B,oBAAQ;QACA,qCAAgB;QACX,+CAAqB;QACtB,6CAAoB;QAC1B,gCAAc;QACjB,0BAAW;QACI,0DAA0B;QACxC,0DAA0B;QAChB,iDAAsB;GAhBjD,qBAAqB,CAwuBjC;AAxuBY,sDAAqB"}

package/dist/service/services/product.service.d.ts

@@ -1,6 +1,7 @@
 import { AssignProductsToChannelInput, CreateProductInput, DeletionResponse, RemoveOptionGroupFromProductResult, RemoveProductsFromChannelInput, UpdateProductInput } from '@vendure/common/lib/generated-types';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { ErrorResultUnion } from '../../common/error/error-result';
 import { ListQueryOptions } from '../../common/types/common-types';
 import { Translated } from '../../common/types/locale-types';
@@ -42,16 +43,16 @@ export declare class ProductService {
     private customFieldRelationService;
     private readonly relations;
     constructor(connection: TransactionalConnection, channelService: ChannelService, roleService: RoleService, assetService: AssetService, productVariantService: ProductVariantService, facetValueService: FacetValueService, taxRateService: TaxRateService, collectionService: CollectionService, listQueryBuilder: ListQueryBuilder, translatableSaver: TranslatableSaver, eventBus: EventBus, slugValidator: SlugValidator, customFieldRelationService: CustomFieldRelationService);
-    findAll(ctx: RequestContext, options?: ListQueryOptions<Product>): Promise<PaginatedList<Translated<Product>>>;
-    findOne(ctx: RequestContext, productId: ID): Promise<Translated<Product> | undefined>;
-    findByIds(ctx: RequestContext, productIds: ID[]): Promise<Array<Translated<Product>>>;
+    findAll(ctx: RequestContext, options?: ListQueryOptions<Product>, relations?: RelationPaths<Product>): Promise<PaginatedList<Translated<Product>>>;
+    findOne(ctx: RequestContext, productId: ID, relations?: RelationPaths<Product>): Promise<Translated<Product> | undefined>;
+    findByIds(ctx: RequestContext, productIds: ID[], relations?: RelationPaths<Product>): Promise<Array<Translated<Product>>>;
     /**
      * @description
      * Returns all Channels to which the Product is assigned.
      */
     getProductChannels(ctx: RequestContext, productId: ID): Promise<Channel[]>;
     getFacetValuesForProduct(ctx: RequestContext, productId: ID): Promise<Array<Translated<FacetValue>>>;
-    findOneBySlug(ctx: RequestContext, slug: string): Promise<Translated<Product> | undefined>;
+    findOneBySlug(ctx: RequestContext, slug: string, relations?: RelationPaths<Product>): Promise<Translated<Product> | undefined>;
     create(ctx: RequestContext, input: CreateProductInput): Promise<Translated<Product>>;
     update(ctx: RequestContext, input: UpdateProductInput): Promise<Translated<Product>>;
     softDelete(ctx: RequestContext, productId: ID): Promise<DeletionResponse>;

package/dist/service/services/product.service.js

@@ -60,10 +60,10 @@ let ProductService = class ProductService {
         this.customFieldRelationService = customFieldRelationService;
         this.relations = ['featuredAsset', 'assets', 'channels', 'facetValues', 'facetValues.facet'];
     }
-    async findAll(ctx, options) {
+    async findAll(ctx, options, relations) {
         return this.listQueryBuilder
             .build(product_entity_1.Product, options, {
-            relations: this.relations,
+            relations: relations || this.relations,
             channelId: ctx.channelId,
             where: { deletedAt: null },
             ctx,
@@ -77,9 +77,15 @@ let ProductService = class ProductService {
             };
         });
     }
-    async findOne(ctx, productId) {
+    async findOne(ctx, productId, relations) {
+        const effectiveRelations = relations !== null && relations !== void 0 ? relations : this.relations;
+        if (relations && effectiveRelations.includes('facetValues')) {
+            // We need the facet to determine with the FacetValues are public
+            // when serving via the Shop API.
+            effectiveRelations.push('facetValues.facet');
+        }
         const product = await this.connection.findOneInChannel(ctx, product_entity_1.Product, productId, ctx.channelId, {
-            relations: this.relations,
+            relations: (0, unique_1.unique)(effectiveRelations),
             where: {
                 deletedAt: null,
             },
@@ -89,9 +95,11 @@ let ProductService = class ProductService {
         }
         return (0, translate_entity_1.translateDeep)(product, ctx.languageCode, ['facetValues', ['facetValues', 'facet']]);
     }
-    async findByIds(ctx, productIds) {
+    async findByIds(ctx, productIds, relations) {
         const qb = this.connection.getRepository(ctx, product_entity_1.Product).createQueryBuilder('product');
-        typeorm_1.FindOptionsUtils.applyFindManyOptionsOrConditionsToQueryBuilder(qb, { relations: this.relations });
+        typeorm_1.FindOptionsUtils.applyFindManyOptionsOrConditionsToQueryBuilder(qb, {
+            relations: (relations && false) || this.relations,
+        });
         // tslint:disable-next-line:no-non-null-assertion
         typeorm_1.FindOptionsUtils.joinEagerRelations(qb, qb.alias, qb.expressionMap.mainAlias.metadata);
         return qb
@@ -121,9 +129,11 @@ let ProductService = class ProductService {
         })
             .then(variant => !variant ? [] : variant.facetValues.map(o => (0, translate_entity_1.translateDeep)(o, ctx.languageCode, ['facet'])));
     }
-    async findOneBySlug(ctx, slug) {
+    async findOneBySlug(ctx, slug, relations) {
         const qb = this.connection.getRepository(ctx, product_entity_1.Product).createQueryBuilder('product');
-        typeorm_1.FindOptionsUtils.applyFindManyOptionsOrConditionsToQueryBuilder(qb, { relations: this.relations });
+        typeorm_1.FindOptionsUtils.applyFindManyOptionsOrConditionsToQueryBuilder(qb, {
+            relations: (relations && false) || this.relations,
+        });
         // tslint:disable-next-line:no-non-null-assertion
         typeorm_1.FindOptionsUtils.joinEagerRelations(qb, qb.alias, qb.expressionMap.mainAlias.metadata);
         const translationQb = this.connection

package/dist/service/services/product.service.js.map

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

package/dist/service/services/promotion.service.d.ts

@@ -2,6 +2,7 @@ import { ApplyCouponCodeResult } from '@vendure/common/lib/generated-shop-types'
 import { AssignPromotionsToChannelInput, ConfigurableOperationDefinition, CreatePromotionInput, CreatePromotionResult, DeletionResponse, RemovePromotionsFromChannelInput, UpdatePromotionInput, UpdatePromotionResult } from '@vendure/common/lib/generated-types';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../api/common/request-context';
+import { RelationPaths } from '../../api/index';
 import { ErrorResultUnion, JustErrorResults } from '../../common/error/error-result';
 import { ListQueryOptions } from '../../common/types/common-types';
 import { ConfigService } from '../../config/config.service';
@@ -30,8 +31,8 @@ export declare class PromotionService {
     availableConditions: PromotionCondition[];
     availableActions: PromotionAction[];
     constructor(connection: TransactionalConnection, configService: ConfigService, channelService: ChannelService, listQueryBuilder: ListQueryBuilder, configArgService: ConfigArgService, eventBus: EventBus);
-    findAll(ctx: RequestContext, options?: ListQueryOptions<Promotion>): Promise<PaginatedList<Promotion>>;
-    findOne(ctx: RequestContext, adjustmentSourceId: ID): Promise<Promotion | undefined>;
+    findAll(ctx: RequestContext, options?: ListQueryOptions<Promotion>, relations?: RelationPaths<Promotion>): Promise<PaginatedList<Promotion>>;
+    findOne(ctx: RequestContext, adjustmentSourceId: ID, relations?: RelationPaths<Promotion>): Promise<Promotion | undefined>;
     getPromotionConditions(ctx: RequestContext): ConfigurableOperationDefinition[];
     getPromotionActions(ctx: RequestContext): ConfigurableOperationDefinition[];
     createPromotion(ctx: RequestContext, input: CreatePromotionInput): Promise<ErrorResultUnion<CreatePromotionResult, Promotion>>;

package/dist/service/services/promotion.service.js

@@ -48,12 +48,12 @@ let PromotionService = class PromotionService {
         this.availableConditions = this.configService.promotionOptions.promotionConditions || [];
         this.availableActions = this.configService.promotionOptions.promotionActions || [];
     }
-    findAll(ctx, options) {
+    findAll(ctx, options, relations = []) {
         return this.listQueryBuilder
             .build(promotion_entity_1.Promotion, options, {
             where: { deletedAt: null },
             channelId: ctx.channelId,
-            relations: ['channels'],
+            relations,
             ctx,
         })
             .getManyAndCount()
@@ -62,9 +62,10 @@ let PromotionService = class PromotionService {
             totalItems,
         }));
     }
-    async findOne(ctx, adjustmentSourceId) {
+    async findOne(ctx, adjustmentSourceId, relations = []) {
         return this.connection.findOneInChannel(ctx, promotion_entity_1.Promotion, adjustmentSourceId, ctx.channelId, {
             where: { deletedAt: null },
+            relations,
         });
     }
     getPromotionConditions(ctx) {
@@ -192,7 +193,8 @@ let PromotionService = class PromotionService {
             .createQueryBuilder('order')
             .leftJoin('order.promotions', 'promotion')
             .where('promotion.id = :promotionId', { promotionId })
-            .andWhere('order.customer = :customerId', { customerId });
+            .andWhere('order.customer = :customerId', { customerId })
+            .andWhere('order.state != :state', { state: 'Cancelled' });
         return qb.getCount();
     }
     calculatePriorityScore(input) {