@vendure/core 2.0.0-next.2 → 2.0.0-next.3

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

@@ -35,7 +35,7 @@ const parse_sort_params_1 = require("./parse-sort-params");
  * ```GraphQL
  * type BlogPost implements Node {
  *   id: ID!
- *   published: DataTime!
+ *   published: DateTime!
  *   title: String!
  *   body: String!
  * }
@@ -117,24 +117,25 @@ let ListQueryBuilder = class ListQueryBuilder {
         const repo = extendedOptions.ctx
             ? this.connection.getRepository(extendedOptions.ctx, entity)
             : this.connection.getRepository(entity);
-        const qb = repo.createQueryBuilder(entity.name.toLowerCase());
+        const qb = repo.createQueryBuilder(extendedOptions.entityAlias || entity.name.toLowerCase());
+        const minimumRequiredRelations = this.getMinimumRequiredRelations(repo, options, extendedOptions);
         FindOptionsUtils_1.FindOptionsUtils.applyFindManyOptionsOrConditionsToQueryBuilder(qb, {
-            relations: extendedOptions.relations,
+            relations: minimumRequiredRelations,
             take,
             skip,
             where: extendedOptions.where || {},
         });
         // tslint:disable-next-line:no-non-null-assertion
         FindOptionsUtils_1.FindOptionsUtils.joinEagerRelations(qb, qb.alias, qb.expressionMap.mainAlias.metadata);
-        this.applyTranslationConditions(qb, entity, extendedOptions.ctx);
+        this.applyTranslationConditions(qb, entity, extendedOptions.ctx, extendedOptions.entityAlias);
         // join the tables required by calculated columns
         this.joinCalculatedColumnRelations(qb, entity, options);
-        const { customPropertyMap } = extendedOptions;
+        const { customPropertyMap, entityAlias } = extendedOptions;
         if (customPropertyMap) {
-            this.normalizeCustomPropertyMap(customPropertyMap, qb);
+            this.normalizeCustomPropertyMap(customPropertyMap, options, qb);
         }
-        const sort = (0, parse_sort_params_1.parseSortParams)(rawConnection, entity, Object.assign({}, options.sort, extendedOptions.orderBy), customPropertyMap);
-        const filter = (0, parse_filter_params_1.parseFilterParams)(rawConnection, entity, options.filter, customPropertyMap);
+        const sort = (0, parse_sort_params_1.parseSortParams)(rawConnection, entity, Object.assign({}, options.sort, extendedOptions.orderBy), customPropertyMap, entityAlias);
+        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;
             if (filterOperator === generated_types_1.LogicalOperator.AND) {
@@ -151,12 +152,13 @@ let ListQueryBuilder = class ListQueryBuilder {
             }
         }
         if (extendedOptions.channelId) {
-            const channelFilter = (0, parse_channel_param_1.parseChannelParam)(rawConnection, entity, 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.orderBy(sort);
+        this.optimizeGetManyAndCountMethod(qb, repo, extendedOptions, minimumRequiredRelations);
         return qb;
     }
     parseTakeSkipParams(apiType, options) {
@@ -175,24 +177,120 @@ let ListQueryBuilder = class ListQueryBuilder {
         }
         return { take, skip };
     }
+    /**
+     * @description
+     * As part of list optimization, we only join the minimum required relations which are needed to
+     * get the base list query. Other relations are then joined individually in the patched `getManyAndCount()`
+     * method.
+     */
+    getMinimumRequiredRelations(repository, options, extendedOptions) {
+        const requiredRelations = [];
+        if (extendedOptions.channelId) {
+            requiredRelations.push('channels');
+        }
+        if (extendedOptions.customPropertyMap) {
+            const metadata = repository.metadata;
+            for (const [property, path] of Object.entries(extendedOptions.customPropertyMap)) {
+                if (!this.customPropertyIsBeingUsed(property, options)) {
+                    // If the custom property is not being used to filter or sort, then we don't need
+                    // to join the associated relations.
+                    continue;
+                }
+                const tableNameLower = path.split('.')[0];
+                const entityMetadata = repository.manager.connection.entityMetadatas.find(em => em.tableName === tableNameLower);
+                if (entityMetadata) {
+                    const relationMetadata = metadata.relations.find(r => r.type === entityMetadata.target);
+                    if (relationMetadata) {
+                        requiredRelations.push(relationMetadata.propertyName);
+                    }
+                }
+            }
+        }
+        return (0, unique_1.unique)(requiredRelations);
+    }
+    customPropertyIsBeingUsed(property, options) {
+        var _a, _b;
+        return !!(((_a = options.sort) === null || _a === void 0 ? void 0 : _a[property]) || ((_b = options.filter) === null || _b === void 0 ? void 0 : _b[property]));
+    }
+    /**
+     * @description
+     * This will monkey-patch the `getManyAndCount()` method in order to implement a more efficient
+     * parallel-query based approach to joining multiple relations. This is loosely based on the
+     * solution outlined here: https://github.com/typeorm/typeorm/issues/3857#issuecomment-633006643
+     *
+     * TODO: When upgrading to TypeORM v0.3+, this will likely become redundant due to the new
+     * `relationLoadStrategy` feature.
+     */
+    optimizeGetManyAndCountMethod(qb, repo, extendedOptions, alreadyJoined) {
+        const originalGetManyAndCount = qb.getManyAndCount.bind(qb);
+        qb.getManyAndCount = async () => {
+            var _a, _b, _c;
+            const relations = (0, unique_1.unique)((_a = extendedOptions.relations) !== null && _a !== void 0 ? _a : []);
+            const [entities, count] = await originalGetManyAndCount();
+            if (relations == null || alreadyJoined.sort().join() === (relations === null || relations === void 0 ? void 0 : relations.sort().join())) {
+                // No further relations need to be joined, so we just
+                // return the regular result.
+                return [entities, count];
+            }
+            const entityMap = new Map(entities.map(e => [e.id, e]));
+            const entitiesIds = entities.map(({ id }) => id);
+            const splitRelations = relations.map(r => r.split('.'));
+            const groupedRelationsMap = new Map();
+            for (const relationParts of splitRelations) {
+                const group = groupedRelationsMap.get(relationParts[0]);
+                if (group) {
+                    group.push(relationParts.join('.'));
+                }
+                else {
+                    groupedRelationsMap.set(relationParts[0], [relationParts.join('.')]);
+                }
+            }
+            // If the extendedOptions includes relations that were already joined, then
+            // we ignore those now so as not to do the work of joining twice.
+            for (const tableName of alreadyJoined) {
+                if (((_b = groupedRelationsMap.get(tableName)) === null || _b === void 0 ? void 0 : _b.length) === 1) {
+                    groupedRelationsMap.delete(tableName);
+                }
+            }
+            const entitiesIdsWithRelations = await Promise.all((_c = Array.from(groupedRelationsMap.values())) === null || _c === void 0 ? void 0 : _c.map(relationPaths => {
+                return repo
+                    .findByIds(entitiesIds, {
+                    select: ['id'],
+                    relations: relationPaths,
+                    loadEagerRelations: false,
+                })
+                    .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];
+                }
+            }
+            return [Array.from(entityMap.values()), count];
+        };
+    }
     /**
      * 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.
      *
      * This method mutates the customPropertyMap object.
      */
-    normalizeCustomPropertyMap(customPropertyMap, qb) {
-        for (const [key, value] of Object.entries(customPropertyMap)) {
-            const parts = customPropertyMap[key].split('.');
+    normalizeCustomPropertyMap(customPropertyMap, options, qb) {
+        for (const [property, value] of Object.entries(customPropertyMap)) {
+            if (!this.customPropertyIsBeingUsed(property, options)) {
+                continue;
+            }
+            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);
             if (relationAlias) {
-                customPropertyMap[key] = `${relationAlias.name}.${columnPart}`;
+                customPropertyMap[property] = `${relationAlias.name}.${columnPart}`;
             }
             else {
-                vendure_logger_1.Logger.error(`The customPropertyMap entry "${key}:${value}" could not be resolved to a related table`);
-                delete customPropertyMap[key];
+                vendure_logger_1.Logger.error(`The customPropertyMap entry "${property}:${value}" could not be resolved to a related table`);
+                delete customPropertyMap[property];
             }
         }
     }
@@ -233,9 +331,10 @@ let ListQueryBuilder = class ListQueryBuilder {
      * 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.
      */
-    applyTranslationConditions(qb, entity, ctx) {
+    applyTranslationConditions(qb, entity, ctx, entityAlias) {
         const languageCode = (ctx === null || ctx === void 0 ? void 0 : ctx.languageCode) || this.configService.defaultLanguageCode;
-        const { columns, translationColumns, alias } = (0, connection_utils_1.getColumnMetadata)(this.connection.rawConnection, entity);
+        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 translationsAlias = qb.connection.namingStrategy.eagerJoinRelationAlias(alias, 'translations');
             qb.andWhere(new typeorm_1.Brackets(qb1 => {

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-channel-param.d.ts

@@ -6,4 +6,4 @@ import { WhereCondition } from './parse-filter-params';
  * Creates a WhereCondition for a channel-aware entity, filtering for only those entities
  * which are assigned to the channel specified by channelId,
  */
-export declare function parseChannelParam<T extends VendureEntity>(connection: Connection, entity: Type<T>, channelId: ID): WhereCondition | undefined;
+export declare function parseChannelParam<T extends VendureEntity>(connection: Connection, entity: Type<T>, channelId: ID, entityAlias?: string): WhereCondition | undefined;

package/dist/service/helpers/list-query-builder/parse-channel-param.js

@@ -5,9 +5,9 @@ exports.parseChannelParam = void 0;
  * Creates a WhereCondition for a channel-aware entity, filtering for only those entities
  * which are assigned to the channel specified by channelId,
  */
-function parseChannelParam(connection, entity, channelId) {
+function parseChannelParam(connection, entity, channelId, entityAlias) {
     const metadata = connection.getMetadata(entity);
-    const alias = metadata.name.toLowerCase();
+    const alias = entityAlias !== null && entityAlias !== void 0 ? entityAlias : metadata.name.toLowerCase();
     const relations = metadata.relations;
     const channelRelation = relations.find(r => r.propertyName === 'channels');
     if (!channelRelation) {

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

@@ -1 +1 @@
-{"version":3,"file":"parse-channel-param.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-channel-param.ts"],"names":[],"mappings":";;;AAOA;;;GAGG;AACH,SAAgB,iBAAiB,CAC7B,UAAsB,EACtB,MAAe,EACf,SAAa;IAEb,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1C,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACrC,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC;IAC3E,IAAI,CAAC,eAAe,EAAE;QAClB,OAAO;KACV;IACD,OAAO;QACH,MAAM,EAAE,GAAG,KAAK,4BAA4B;QAC5C,UAAU,EAAE,EAAE,SAAS,EAAE;KAC5B,CAAC;AACN,CAAC;AAhBD,8CAgBC"}
+{"version":3,"file":"parse-channel-param.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-channel-param.ts"],"names":[],"mappings":";;;AAOA;;;GAGG;AACH,SAAgB,iBAAiB,CAC7B,UAAsB,EACtB,MAAe,EACf,SAAa,EACb,WAAoB;IAEpB,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACzD,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACrC,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC;IAC3E,IAAI,CAAC,eAAe,EAAE;QAClB,OAAO;KACV;IACD,OAAO;QACH,MAAM,EAAE,GAAG,KAAK,4BAA4B;QAC5C,UAAU,EAAE,EAAE,SAAS,EAAE;KAC5B,CAAC;AACN,CAAC;AAjBD,8CAiBC"}

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

@@ -10,4 +10,4 @@ export interface WhereCondition {
 }
 export declare function parseFilterParams<T extends VendureEntity>(connection: Connection, entity: Type<T>, filterParams?: NullOptionals<FilterParameter<T>> | null, customPropertyMap?: {
     [name: string]: string;
-}): WhereCondition[];
+}, entityAlias?: string): WhereCondition[];

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

@@ -6,11 +6,12 @@ const DateUtils_1 = require("typeorm/util/DateUtils");
 const errors_1 = require("../../../common/error/errors");
 const connection_utils_1 = require("./connection-utils");
 const get_calculated_columns_1 = require("./get-calculated-columns");
-function parseFilterParams(connection, entity, filterParams, customPropertyMap) {
+function parseFilterParams(connection, entity, filterParams, customPropertyMap, entityAlias) {
     if (!filterParams) {
         return [];
     }
-    const { columns, translationColumns, alias } = (0, connection_utils_1.getColumnMetadata)(connection, entity);
+    const { columns, translationColumns, alias: defaultAlias } = (0, connection_utils_1.getColumnMetadata)(connection, entity);
+    const alias = entityAlias !== null && entityAlias !== void 0 ? entityAlias : defaultAlias;
     const calculatedColumns = (0, get_calculated_columns_1.getCalculatedColumns)(entity);
     const output = [];
     const dbType = connection.options.type;

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

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

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

@@ -11,4 +11,4 @@ import { VendureEntity } from '../../../entity/base/base.entity';
  */
 export declare function parseSortParams<T extends VendureEntity>(connection: Connection, entity: Type<T>, sortParams?: NullOptionals<SortParameter<T>> | null, customPropertyMap?: {
     [name: string]: string;
-}): OrderByCondition;
+}, entityAlias?: string): OrderByCondition;

package/dist/service/helpers/list-query-builder/parse-sort-params.js

@@ -12,11 +12,12 @@ const get_calculated_columns_1 = require("./get-calculated-columns");
  * @param entity
  * @param sortParams
  */
-function parseSortParams(connection, entity, sortParams, customPropertyMap) {
+function parseSortParams(connection, entity, sortParams, customPropertyMap, entityAlias) {
     if (!sortParams || Object.keys(sortParams).length === 0) {
         return {};
     }
-    const { columns, translationColumns, alias } = (0, connection_utils_1.getColumnMetadata)(connection, entity);
+    const { columns, translationColumns, alias: defaultAlias } = (0, connection_utils_1.getColumnMetadata)(connection, entity);
+    const alias = entityAlias !== null && entityAlias !== void 0 ? entityAlias : defaultAlias;
     const calculatedColumns = (0, get_calculated_columns_1.getCalculatedColumns)(entity);
     const output = {};
     for (const [key, order] of Object.entries(sortParams)) {
@@ -31,7 +32,7 @@ function parseSortParams(connection, entity, sortParams, customPropertyMap) {
         }
         else if (calculatedColumnDef) {
             const instruction = calculatedColumnDef.listQuery;
-            if (instruction) {
+            if (instruction && instruction.expression) {
                 output[(0, connection_utils_1.escapeCalculatedColumnExpression)(connection, instruction.expression)] = order;
             }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"parse-sort-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-sort-params.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAIpD,yDAA8D;AAI9D,yDAAyF;AACzF,qEAAgE;AAEhE;;;;;;GAMG;AACH,SAAgB,eAAe,CAC3B,UAAsB,EACtB,MAAe,EACf,UAAmD,EACnD,iBAA8C;IAE9C,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACrD,OAAO,EAAE,CAAC;KACb;IACD,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,IAAA,oCAAiB,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACrF,MAAM,iBAAiB,GAAG,IAAA,6CAAoB,EAAC,MAAM,CAAC,CAAC;IACvD,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACnD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;QACxE,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,CAAC;QACjE,IAAI,cAAc,EAAE;YAChB,MAAM,CAAC,GAAG,KAAK,IAAI,cAAc,CAAC,YAAY,EAAE,CAAC,GAAG,KAAY,CAAC;SACpE;aAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,EAAE;YAC7D,MAAM,iBAAiB,GAAG,UAAU,CAAC,cAAc,CAAC,sBAAsB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YAClG,MAAM,CAAC,GAAG,iBAAiB,IAAI,GAAG,EAAE,CAAC,GAAG,KAAY,CAAC;SACxD;aAAM,IAAI,mBAAmB,EAAE;YAC5B,MAAM,WAAW,GAAG,mBAAmB,CAAC,SAAS,CAAC;YAClD,IAAI,WAAW,EAAE;gBACb,MAAM,CAAC,IAAA,mDAAgC,EAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,GAAG,KAAY,CAAC;aAC/F;SACJ;aAAM,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,GAAG,CAAC,EAAE;YACjC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,KAAY,CAAC;SACjD;aAAM;YACH,MAAM,IAAI,uBAAc,CAAC,0BAA0B,EAAE;gBACjD,SAAS,EAAE,GAAG;gBACd,WAAW,EAAE;oBACT,GAAG,kBAAkB,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,kBAAkB,CAAC,CAAC;oBAC1D,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;iBACnD,CAAC,IAAI,CAAC,IAAI,CAAC;aACf,CAAC,CAAC;SACN;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAtCD,0CAsCC;AAED,SAAS,kBAAkB,CAAC,OAAyB;IACjD,OAAO,IAAA,eAAM,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"parse-sort-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-sort-params.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAIpD,yDAA8D;AAI9D,yDAAyF;AACzF,qEAAgE;AAEhE;;;;;;GAMG;AACH,SAAgB,eAAe,CAC3B,UAAsB,EACtB,MAAe,EACf,UAAmD,EACnD,iBAA8C,EAC9C,WAAoB;IAEpB,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACrD,OAAO,EAAE,CAAC;KACb;IACD,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,IAAA,oCAAiB,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACnG,MAAM,KAAK,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,YAAY,CAAC;IAC1C,MAAM,iBAAiB,GAAG,IAAA,6CAAoB,EAAC,MAAM,CAAC,CAAC;IACvD,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACnD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;QACxE,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,CAAC;QACjE,IAAI,cAAc,EAAE;YAChB,MAAM,CAAC,GAAG,KAAK,IAAI,cAAc,CAAC,YAAY,EAAE,CAAC,GAAG,KAAY,CAAC;SACpE;aAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,EAAE;YAC7D,MAAM,iBAAiB,GAAG,UAAU,CAAC,cAAc,CAAC,sBAAsB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YAClG,MAAM,CAAC,GAAG,iBAAiB,IAAI,GAAG,EAAE,CAAC,GAAG,KAAY,CAAC;SACxD;aAAM,IAAI,mBAAmB,EAAE;YAC5B,MAAM,WAAW,GAAG,mBAAmB,CAAC,SAAS,CAAC;YAClD,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,EAAE;gBACvC,MAAM,CAAC,IAAA,mDAAgC,EAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,GAAG,KAAY,CAAC;aAC/F;SACJ;aAAM,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,GAAG,CAAC,EAAE;YACjC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,KAAY,CAAC;SACjD;aAAM;YACH,MAAM,IAAI,uBAAc,CAAC,0BAA0B,EAAE;gBACjD,SAAS,EAAE,GAAG;gBACd,WAAW,EAAE;oBACT,GAAG,kBAAkB,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,kBAAkB,CAAC,CAAC;oBAC1D,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;iBACnD,CAAC,IAAI,CAAC,IAAI,CAAC;aACf,CAAC,CAAC;SACN;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAxCD,0CAwCC;AAED,SAAS,kBAAkB,CAAC,OAAyB;IACjD,OAAO,IAAA,eAAM,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AACpD,CAAC"}

package/dist/service/helpers/order-calculator/prorate.js

@@ -20,7 +20,7 @@ function prorate(weights, amount) {
     let added = 0;
     let i = 0;
     for (const w of weights) {
-        actual[i] = amount * (w / totalWeight);
+        actual[i] = totalWeight === 0 ? amount / weights.length : amount * (w / totalWeight);
         rounded[i] = Math.floor(actual[i]);
         error[i] = actual[i] - rounded[i];
         added += rounded[i];

package/dist/service/helpers/order-calculator/prorate.js.map

@@ -1 +1 @@
-{"version":3,"file":"prorate.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/prorate.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;GASG;AACH,SAAgB,OAAO,CAAC,OAAiB,EAAE,MAAc;IACrD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE9B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACrB,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC;QACvC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAClC,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC,IAAI,CAAC,CAAC;KACV;IAED,OAAO,KAAK,GAAG,MAAM,EAAE;QACnB,IAAI,QAAQ,GAAG,GAAG,CAAC;QACnB,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE;YAC7B,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE;gBACrB,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACpB,aAAa,GAAG,CAAC,CAAC;aACrB;SACJ;QAED,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5B,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAE1B,KAAK,IAAI,CAAC,CAAC;KACd;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AApCD,0BAoCC"}
+{"version":3,"file":"prorate.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/prorate.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;GASG;AACH,SAAgB,OAAO,CAAC,OAAiB,EAAE,MAAc;IACrD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE9B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACrB,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC;QACrF,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAClC,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC,IAAI,CAAC,CAAC;KACV;IAED,OAAO,KAAK,GAAG,MAAM,EAAE;QACnB,IAAI,QAAQ,GAAG,GAAG,CAAC;QACnB,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE;YAC7B,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE;gBACrB,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACpB,aAAa,GAAG,CAAC,CAAC;aACrB;SACJ;QAED,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5B,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAE1B,KAAK,IAAI,CAAC,CAAC;KACd;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AApCD,0BAoCC"}

package/dist/service/helpers/slug-validator/slug-validator.js

@@ -28,6 +28,7 @@ let SlugValidator = class SlugValidator {
                     t.slug = (0, normalize_string_1.normalizeString)(t.slug, '-');
                     let match;
                     let suffix = 1;
+                    const seen = [];
                     const alreadySuffixed = /-\d+$/;
                     do {
                         const qb = this.connection
@@ -41,17 +42,25 @@ let SlugValidator = class SlugValidator {
                         if (input.id) {
                             qb.andWhere(`translation.base != :id`, { id: input.id });
                         }
+                        if (seen.length) {
+                            qb.andWhere(`translation.id NOT IN (:...seen)`, { seen });
+                        }
                         match = await qb.getOne();
-                        if (match && !match.base.deletedAt) {
-                            suffix++;
-                            if (alreadySuffixed.test(t.slug)) {
-                                t.slug = t.slug.replace(alreadySuffixed, `-${suffix}`);
+                        if (match) {
+                            if (!match.base.deletedAt) {
+                                suffix++;
+                                if (alreadySuffixed.test(t.slug)) {
+                                    t.slug = t.slug.replace(alreadySuffixed, `-${suffix}`);
+                                }
+                                else {
+                                    t.slug = `${t.slug}-${suffix}`;
+                                }
                             }
                             else {
-                                t.slug = `${t.slug}-${suffix}`;
+                                seen.push(match.id);
                             }
                         }
-                    } while (match && !match.base.deletedAt);
+                    } while (match);
                 }
             }
         }

package/dist/service/helpers/slug-validator/slug-validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"slug-validator.js","sourceRoot":"","sources":["../../../../src/service/helpers/slug-validator/slug-validator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,2EAAuE;AAIvE,2FAAuF;AAqBvF,IAAa,aAAa,GAA1B,MAAa,aAAa;IACtB,YAAoB,UAAmC;QAAnC,eAAU,GAAV,UAAU,CAAyB;IAAG,CAAC;IAE3D;;;OAGG;IACH,KAAK,CAAC,aAAa,CACf,GAAmB,EACnB,KAAQ,EACR,iBAA0B;QAE1B,IAAI,KAAK,CAAC,YAAY,EAAE;YACpB,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,YAAY,EAAE;gBAChC,IAAI,CAAC,CAAC,IAAI,EAAE;oBACR,CAAC,CAAC,IAAI,GAAG,IAAA,kCAAe,EAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBACtC,IAAI,KAAoB,CAAC;oBACzB,IAAI,MAAM,GAAG,CAAC,CAAC;oBACf,MAAM,eAAe,GAAG,OAAO,CAAC;oBAChC,GAAG;wBACC,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU;6BACrB,aAAa,CAAC,GAAG,EAAE,iBAAiB,CAAC;6BACrC,kBAAkB,CAAC,aAAa,CAAC;6BACjC,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,CAAC;6BAC9C,KAAK,CAAC,0BAA0B,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;6BACnD,QAAQ,CAAC,0CAA0C,EAAE;4BAClD,YAAY,EAAE,CAAC,CAAC,YAAY;yBAC/B,CAAC,CAAC;wBACP,IAAI,KAAK,CAAC,EAAE,EAAE;4BACV,EAAE,CAAC,QAAQ,CAAC,yBAAyB,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;yBAC5D;wBACD,KAAK,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;wBAC1B,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE;4BAChC,MAAM,EAAE,CAAC;4BACT,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gCAC9B,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,MAAM,EAAE,CAAC,CAAC;6BAC1D;iCAAM;gCACH,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;6BAClC;yBACJ;qBACJ,QAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE;iBAC5C;aACJ;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AA9CY,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAEuB,kDAAuB;GAD9C,aAAa,CA8CzB;AA9CY,sCAAa"}
+{"version":3,"file":"slug-validator.js","sourceRoot":"","sources":["../../../../src/service/helpers/slug-validator/slug-validator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,2EAAuE;AAIvE,2FAAuF;AAqBvF,IAAa,aAAa,GAA1B,MAAa,aAAa;IACtB,YAAoB,UAAmC;QAAnC,eAAU,GAAV,UAAU,CAAyB;IAAG,CAAC;IAE3D;;;OAGG;IACH,KAAK,CAAC,aAAa,CACf,GAAmB,EACnB,KAAQ,EACR,iBAA0B;QAE1B,IAAI,KAAK,CAAC,YAAY,EAAE;YACpB,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,YAAY,EAAE;gBAChC,IAAI,CAAC,CAAC,IAAI,EAAE;oBACR,CAAC,CAAC,IAAI,GAAG,IAAA,kCAAe,EAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBACtC,IAAI,KAAoB,CAAC;oBACzB,IAAI,MAAM,GAAG,CAAC,CAAC;oBACf,MAAM,IAAI,GAAS,EAAE,CAAC;oBACtB,MAAM,eAAe,GAAG,OAAO,CAAC;oBAChC,GAAG;wBACC,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU;6BACrB,aAAa,CAAC,GAAG,EAAE,iBAAiB,CAAC;6BACrC,kBAAkB,CAAC,aAAa,CAAC;6BACjC,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,CAAC;6BAC9C,KAAK,CAAC,0BAA0B,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;6BACnD,QAAQ,CAAC,0CAA0C,EAAE;4BAClD,YAAY,EAAE,CAAC,CAAC,YAAY;yBAC/B,CAAC,CAAA;wBACN,IAAI,KAAK,CAAC,EAAE,EAAE;4BACV,EAAE,CAAC,QAAQ,CAAC,yBAAyB,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;yBAC5D;wBACD,IAAI,IAAI,CAAC,MAAM,EAAE;4BACb,EAAE,CAAC,QAAQ,CAAC,kCAAkC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;yBAC7D;wBACD,KAAK,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;wBAC1B,IAAI,KAAK,EAAE;4BACP,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE;gCACvB,MAAM,EAAE,CAAC;gCACT,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;oCAC9B,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,MAAM,EAAE,CAAC,CAAC;iCAC1D;qCAAM;oCACH,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;iCAClC;6BACJ;iCAAM;gCACH,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;6BACvB;yBACJ;qBACJ,QAAQ,KAAK,EAAE;iBACnB;aACJ;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAtDY,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAEuB,kDAAuB;GAD9C,aAAa,CAsDzB;AAtDY,sCAAa"}

package/dist/service/helpers/utils/translate-entity.js

@@ -26,8 +26,7 @@ function translateEntity(translatable, languageCode) {
             languageCode,
         });
     }
-    const translated = Object.assign({}, translatable);
-    Object.setPrototypeOf(translated, Object.getPrototypeOf(translatable));
+    const translated = Object.create(Object.getPrototypeOf(translatable), Object.getOwnPropertyDescriptors(translatable));
     for (const [key, value] of Object.entries(translation)) {
         if (key === 'customFields') {
             if (!translated.customFields) {

package/dist/service/helpers/utils/translate-entity.js.map

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

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

@@ -1,6 +1,7 @@
 import { CreateAdministratorInput, DeletionResult, UpdateAdministratorInput } 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 { ListQueryOptions } from '../../common/types/common-types';
 import { ConfigService } from '../../config';
 import { TransactionalConnection } from '../../connection/transactional-connection';
@@ -33,17 +34,17 @@ export declare class AdministratorService {
      * @description
      * Get a paginated list of Administrators.
      */
-    findAll(ctx: RequestContext, options?: ListQueryOptions<Administrator>): Promise<PaginatedList<Administrator>>;
+    findAll(ctx: RequestContext, options?: ListQueryOptions<Administrator>, relations?: RelationPaths<Administrator>): Promise<PaginatedList<Administrator>>;
     /**
      * @description
      * Get an Administrator by id.
      */
-    findOne(ctx: RequestContext, administratorId: ID): Promise<Administrator | undefined>;
+    findOne(ctx: RequestContext, administratorId: ID, relations?: RelationPaths<Administrator>): Promise<Administrator | undefined>;
     /**
      * @description
      * Get an Administrator based on the User id.
      */
-    findOneByUserId(ctx: RequestContext, userId: ID): Promise<Administrator | undefined>;
+    findOneByUserId(ctx: RequestContext, userId: ID, relations?: RelationPaths<Administrator>): Promise<Administrator | undefined>;
     /**
      * @description
      * Create a new Administrator.

package/dist/service/services/administrator.service.js

@@ -54,10 +54,10 @@ let AdministratorService = class AdministratorService {
      * @description
      * Get a paginated list of Administrators.
      */
-    findAll(ctx, options) {
+    findAll(ctx, options, relations) {
         return this.listQueryBuilder
             .build(administrator_entity_1.Administrator, options, {
-            relations: ['user', 'user.roles'],
+            relations: relations !== null && relations !== void 0 ? relations : ['user', 'user.roles'],
             where: { deletedAt: null },
             ctx,
         })
@@ -71,9 +71,9 @@ let AdministratorService = class AdministratorService {
      * @description
      * Get an Administrator by id.
      */
-    findOne(ctx, administratorId) {
+    findOne(ctx, administratorId, relations) {
         return this.connection.getRepository(ctx, administrator_entity_1.Administrator).findOne(administratorId, {
-            relations: ['user', 'user.roles'],
+            relations: relations !== null && relations !== void 0 ? relations : ['user', 'user.roles'],
             where: {
                 deletedAt: null,
             },
@@ -83,8 +83,9 @@ let AdministratorService = class AdministratorService {
      * @description
      * Get an Administrator based on the User id.
      */
-    findOneByUserId(ctx, userId) {
+    findOneByUserId(ctx, userId, relations) {
         return this.connection.getRepository(ctx, administrator_entity_1.Administrator).findOne({
+            relations,
             where: {
                 user: { id: userId },
                 deletedAt: null,

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

@@ -1 +1 @@
-{"version":3,"file":"administrator.service.js","sourceRoot":"","sources":["../../../src/service/services/administrator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAI6C;AAI7C,sEAAkE;AAClE,sDAAqF;AACrF,8CAAiD;AAEjD,yCAA6C;AAC7C,wFAAoF;AACpF,0FAAgF;AAChF,gIAAoH;AACpH,+DAAqD;AACrD,+CAA2C;AAC3C,oFAAgF;AAChF,gFAA2E;AAC3E,kHAA4G;AAC5G,yFAAoF;AACpF,gFAA4E;AAC5E,gEAA4D;AAE5D,iDAA6C;AAC7C,iDAA6C;AAE7C;;;;;GAKG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YACY,UAAmC,EACnC,aAA4B,EAC5B,gBAAkC,EAClC,cAA8B,EAC9B,WAAwB,EACxB,WAAwB,EACxB,0BAAsD,EACtD,QAAkB;QAPlB,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,aAAQ,GAAR,QAAQ,CAAU;IAC3B,CAAC;IAEJ,gBAAgB;IAChB,KAAK,CAAC,kBAAkB;QACpB,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACxC,CAAC;IAED;;;OAGG;IACH,OAAO,CACH,GAAmB,EACnB,OAAyC;QAEzC,OAAO,IAAI,CAAC,gBAAgB;aACvB,KAAK,CAAC,oCAAa,EAAE,OAAO,EAAE;YAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC;YACjC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;YAC1B,GAAG;SACN,CAAC;aACD,eAAe,EAAE;aACjB,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5B,KAAK;YACL,UAAU;SACb,CAAC,CAAC,CAAC;IACZ,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,GAAmB,EAAE,eAAmB;QAC5C,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,oCAAa,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE;YAC9E,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC;YACjC,KAAK,EAAE;gBACH,SAAS,EAAE,IAAI;aAClB;SACJ,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACH,eAAe,CAAC,GAAmB,EAAE,MAAU;QAC3C,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,oCAAa,CAAC,CAAC,OAAO,CAAC;YAC7D,KAAK,EAAE;gBACH,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;gBACpB,SAAS,EAAE,IAAI;aAClB;SACJ,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAA+B;QAC7D,MAAM,aAAa,GAAG,IAAI,oCAAa,CAAC,KAAK,CAAC,CAAC;QAC/C,aAAa,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QACrG,IAAI,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU;aAC3C,aAAa,CAAC,GAAG,EAAE,oCAAa,CAAC;aACjC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;YAChC,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,oBAAoB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;SACtF;QACD,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CACjD,GAAG,EACH,oCAAa,EACb,KAAK,EACL,oBAAoB,CACvB,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,wCAAkB,CAAC,GAAG,EAAE,oBAAoB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3F,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAA+B;QAC7D,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,IAAI,4BAAmB,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC5D;QACD,IAAI,oBAAoB,GAAG,IAAA,0BAAW,EAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAC7D,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,oCAAa,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAE/F,IAAI,KAAK,CAAC,YAAY,EAAE;YACpB,oBAAoB,CAAC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC;YAC1D,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;SAClF;QACD,IAAI,KAAK,CAAC,QAAQ,EAAE;YAChB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC5E,IAAI,IAAI,EAAE;gBACN,MAAM,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;gBAC9D,gBAAgB,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC/E,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,gEAA0B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aAC/F;SACJ;QACD,IAAI,KAAK,CAAC,OAAO,EAAE;YACf,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACpE,IAAI,gBAAgB,EAAE;gBAClB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;gBAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE;oBAC/D,MAAM,IAAI,4BAAmB,CAAC,4CAA4C,CAAC,CAAC;iBAC/E;aACJ;YACD,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK;iBACrC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;iBACpB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAE,KAAK,CAAC,OAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAEtE,MAAM,MAAM,GAAI,KAAK,CAAC,OAAgB,CAAC,MAAM,CACzC,MAAM,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,CACvE,CAAC;YAEF,aAAa,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3F,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;gBAChC,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;aAC/E;YACD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,mCAAe,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;YACnF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,mCAAe,CAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;SACxF;QACD,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CACjD,GAAG,EACH,oCAAa,EACb,KAAK,EACL,oBAAoB,CACvB,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,wCAAkB,CAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACpF,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,UAAU,CAAC,GAAmB,EAAE,eAAmB,EAAE,MAAU;QACjE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAC/D,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,IAAI,4BAAmB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;SACnE;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,4BAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjD;QACD,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kBAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3F,OAAO,aAAa,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,UAAU,CAAC,GAAmB,EAAE,EAAM;QACxC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,oCAAa,EAAE,EAAE,EAAE;YACjF,SAAS,EAAE,CAAC,MAAM,CAAC;SACtB,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC9D,IAAI,gBAAgB,EAAE;YAClB,MAAM,IAAI,4BAAmB,CAAC,qCAAqC,CAAC,CAAC;SACxE;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,oCAAa,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QAClG,iDAAiD;QACjD,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,aAAa,CAAC,IAAK,CAAC,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,wCAAkB,CAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QACjF,OAAO;YACH,MAAM,EAAE,gCAAc,CAAC,OAAO;SACjC,CAAC;IACN,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,gBAAgB,CAAC,GAAmB,EAAE,EAAM;QACtD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;QAClE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,oCAAa,CAAC,CAAC,IAAI,CAAC;YAC3E,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC;SACpC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAChC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,cAAc,CAAC,EAAE,CAAC,CACpE,CAAC;QACF,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE;YACxB,OAAO,KAAK,CAAC;SAChB;aAAM;YACH,OAAO,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SAC7C;IACL,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,sBAAsB;QAChC,MAAM,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;QAEjE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,kBAAI,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE;gBACH,UAAU,EAAE,qBAAqB,CAAC,UAAU;aAC/C;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,EAAE;YACjB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YAClE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,gCAAc,CAAC,KAAK,EAAE,EAAE;gBAC5D,YAAY,EAAE,qBAAqB,CAAC,UAAU;gBAC9C,QAAQ,EAAE,qBAAqB,CAAC,QAAQ;gBACxC,SAAS,EAAE,OAAO;gBAClB,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;aAC/B,CAAC,CAAC;SACN;aAAM;YACH,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,oCAAa,CAAC,CAAC,OAAO,CAAC;gBAClF,KAAK,EAAE;oBACH,IAAI,EAAE,cAAc;iBACvB;aACJ,CAAC,CAAC;YACH,IAAI,CAAC,kBAAkB,EAAE;gBACrB,MAAM,aAAa,GAAG,IAAI,oCAAa,CAAC;oBACpC,YAAY,EAAE,qBAAqB,CAAC,UAAU;oBAC9C,SAAS,EAAE,OAAO;oBAClB,QAAQ,EAAE,OAAO;iBACpB,CAAC,CAAC;gBACH,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU;qBAC7C,aAAa,CAAC,oCAAa,CAAC;qBAC5B,IAAI,CAAC,aAAa,CAAC,CAAC;gBACzB,oBAAoB,CAAC,IAAI,GAAG,cAAc,CAAC;gBAC3C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,oCAAa,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;aACjF;iBAAM,IAAI,kBAAkB,CAAC,SAAS,IAAI,IAAI,EAAE;gBAC7C,kBAAkB,CAAC,SAAS,GAAG,IAAI,CAAC;gBACpC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,oCAAa,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;aAC/E;YAED,IAAI,cAAc,CAAC,SAAS,IAAI,IAAI,EAAE;gBAClC,cAAc,CAAC,SAAS,GAAG,IAAI,CAAC;gBAChC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,kBAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aAClE;SACJ;IACL,CAAC;CACJ,CAAA;AAjQY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAGe,kDAAuB;QACpB,sBAAa;QACV,qCAAgB;QAClB,gCAAc;QACjB,0BAAW;QACX,0BAAW;QACI,0DAA0B;QAC5C,oBAAQ;GATrB,oBAAoB,CAiQhC;AAjQY,oDAAoB"}
+{"version":3,"file":"administrator.service.js","sourceRoot":"","sources":["../../../src/service/services/administrator.service.ts"],"names":[],"mappings":"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"}

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

@@ -4,6 +4,7 @@ import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { ReadStream } from 'fs-extra';
 import { Readable } from 'stream';
 import { RequestContext } from '../../api/common/request-context';
+import { RelationPaths } from '../../api/index';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { Asset } from '../../entity/asset/asset.entity';
@@ -56,8 +57,8 @@ export declare class AssetService {
     private customFieldRelationService;
     private permittedMimeTypes;
     constructor(connection: TransactionalConnection, configService: ConfigService, listQueryBuilder: ListQueryBuilder, eventBus: EventBus, tagService: TagService, channelService: ChannelService, roleService: RoleService, customFieldRelationService: CustomFieldRelationService);
-    findOne(ctx: RequestContext, id: ID): Promise<Asset | undefined>;
-    findAll(ctx: RequestContext, options?: AssetListOptions): Promise<PaginatedList<Asset>>;
+    findOne(ctx: RequestContext, id: ID, relations?: RelationPaths<Asset>): Promise<Asset | undefined>;
+    findAll(ctx: RequestContext, options?: AssetListOptions, relations?: RelationPaths<Asset>): Promise<PaginatedList<Asset>>;
     getFeaturedAsset<T extends Omit<EntityWithAssets, 'assets'>>(ctx: RequestContext, entity: T): Promise<Asset | undefined>;
     /**
      * @description