@vendure/core 1.5.2 → 1.6.0

package/dist/api/common/configurable-operation-codec.js

@@ -35,7 +35,7 @@ let ConfigurableOperationCodec = class ConfigurableOperationCodec {
             }
             for (const arg of operationInput.arguments) {
                 const argDef = def.args[arg.name];
-                if (argDef.type === 'ID' && arg.value) {
+                if (argDef && argDef.type === 'ID' && arg.value) {
                     if (argDef.list === true) {
                         const ids = JSON.parse(arg.value);
                         const decodedIds = ids.map(id => this.idCodecService.decode(id));
@@ -62,7 +62,7 @@ let ConfigurableOperationCodec = class ConfigurableOperationCodec {
             }
             for (const arg of operationInput.args) {
                 const argDef = def.args[arg.name];
-                if (argDef.type === 'ID' && arg.value) {
+                if (argDef && argDef.type === 'ID' && arg.value) {
                     if (argDef.list === true) {
                         const ids = JSON.parse(arg.value);
                         const encodedIds = ids.map(id => this.idCodecService.encode(id));

package/dist/api/common/configurable-operation-codec.js.map

@@ -1 +1 @@
-{"version":3,"file":"configurable-operation-codec.js","sourceRoot":"","sources":["../../../src/api/common/configurable-operation-codec.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAK5C,sDAAgE;AAChE,yCAMsB;AACtB,8EAA0E;AAC1E,gEAA4D;AAC5D,gHAA0G;AAC1G,wFAAmF;AAEnF,yDAAoD;AAGpD,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IACnC,YAAoB,aAA4B,EAAU,cAA8B;QAApE,kBAAa,GAAb,aAAa,CAAe;QAAU,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAE5F;;OAEG;IACH,8BAA8B,CAC1B,OAA4C,EAC5C,KAAmC;QAEnC,MAAM,aAAa,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC3D,KAAK,MAAM,cAAc,IAAI,KAAK,EAAE;YAChC,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC;YACpE,IAAI,CAAC,GAAG,EAAE;gBACN,SAAS;aACZ;YACD,KAAK,MAAM,GAAG,IAAI,cAAc,CAAC,SAAS,EAAE;gBACxC,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAClC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE;oBACnC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;wBACtB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAa,CAAC;wBAC9C,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;wBACjE,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;qBAC1C;yBAAM;wBACH,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;wBACxD,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;qBACzC;iBACJ;aACJ;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,8BAA8B,CAC1B,OAA4C,EAC5C,KAA8B;QAE9B,MAAM,aAAa,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC3D,KAAK,MAAM,cAAc,IAAI,KAAK,EAAE;YAChC,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC;YACpE,IAAI,CAAC,GAAG,EAAE;gBACN,SAAS;aACZ;YACD,KAAK,MAAM,GAAG,IAAI,cAAc,CAAC,IAAI,EAAE;gBACnC,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAClC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE;oBACnC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;wBACtB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAa,CAAC;wBAC9C,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;wBACjE,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;qBAC1C;yBAAM;wBACH,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;wBACxD,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;qBACzC;iBACJ;aACJ;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,sBAAsB,CAAC,OAAuC;QAC1D,QAAQ,OAAO,EAAE;YACb,KAAK,oCAAgB;gBACjB,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,iBAAiB,CAAC;YAC/D,KAAK,6CAAoB;gBACrB,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,qBAAqB,CAAC;YACnE,KAAK,oEAA+B;gBAChC,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,gCAAgC,IAAI,EAAE,CAAC;YACpF,KAAK,4BAAmB,CAAC;YACzB,KAAK,6BAAoB;gBACrB,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,gBAAgB,IAAI,EAAE,CAAC;YACtE,KAAK,2BAAkB;gBACnB,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,mBAAmB,IAAI,EAAE,CAAC;YACzE,KAAK,mCAA0B;gBAC3B,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,2BAA2B,IAAI,EAAE,CAAC;YAChF,KAAK,2BAAkB;gBACnB,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,mBAAmB,IAAI,EAAE,CAAC;YACxE;gBACI,MAAM,IAAI,4BAAmB,CAAC,iDAAiD,EAAE;oBAC7E,IAAI,EAAE,OAAO,CAAC,IAAI;iBACrB,CAAC,CAAC;SACV;IACL,CAAC;CACJ,CAAA;AAtFY,0BAA0B;IADtC,mBAAU,EAAE;qCAE0B,8BAAa,EAA0B,iCAAc;GAD/E,0BAA0B,CAsFtC;AAtFY,gEAA0B"}
+{"version":3,"file":"configurable-operation-codec.js","sourceRoot":"","sources":["../../../src/api/common/configurable-operation-codec.ts"],"names":[],"mappings":"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"}

package/dist/api/decorators/relations.decorator.d.ts

@@ -0,0 +1,102 @@
+import { Type } from '@vendure/common/lib/shared-types';
+import { EntityRelationPaths } from '../../common/index';
+import { VendureEntity } from '../../entity/index';
+export declare type RelationPaths<T extends VendureEntity> = Array<EntityRelationPaths<T>>;
+export declare type FieldsDecoratorConfig = Type<VendureEntity> | {
+    entity: Type<VendureEntity>;
+    depth: number;
+};
+/**
+ * @description
+ * Resolver param decorator which returns an array of relation paths which can be passed through
+ * to the TypeORM data layer in order to join only the required relations. This works by inspecting
+ * the GraphQL `info` object, examining the field selection, and then comparing this with information
+ * about the return type's relations.
+ *
+ * In addition to analyzing the field selection, this decorator also checks for any `@Calculated()`
+ * properties on the entity, and additionally includes relations from the `relations` array of the calculated
+ * metadata, if defined.
+ *
+ * So if, for example, the query only selects the `id` field of an Order, then no other relations need
+ * be joined in the resulting SQL query. This can massively speed up execution time for queries which do
+ * not include many deep nested relations.
+ *
+ * @example
+ * ```TypeScript
+ * \@Query()
+ * \@Allow(Permission.ReadOrder)
+ * orders(
+ *     \@Ctx() ctx: RequestContext,
+ *     \@Args() args: QueryOrdersArgs,
+ *     \@Relations(Order) relations: RelationPaths<Order>,
+ * ): Promise<PaginatedList<Order>> {
+ *     return this.orderService.findAll(ctx, args.options || undefined, relations);
+ * }
+ * ```
+ *
+ * In the above example, given the following query:
+ *
+ * @example
+ * ```GraphQL
+ * {
+ *   orders(options: { take: 10 }) {
+ *     items {
+ *       id
+ *       customer {
+ *         id
+ *         firstName
+ *         lastName
+ *       }
+ *       totalQuantity
+ *       totalWithTax
+ *     }
+ *   }
+ * }
+ * ```
+ * then the value of `relations` will be
+ *
+ * ```
+ * ['customer', 'lines', 'lines.items']
+ * ```
+ * The `'customer'` comes from the fact that the query is nesting the "customer" object, and the `'lines'` & `'lines.items'` are taken
+ * from the `Order` entity's `totalQuantity` property, which uses {@link Calculated} decorator and defines those relations as dependencies
+ * for deriving the calculated value.
+ *
+ * ## Depth
+ *
+ * By default, when inspecting the GraphQL query, the Relations decorator will look 3 levels deep in any nested fields. So, e.g. if
+ * the above `orders` query were changed to:
+ *
+ * @example
+ * ```GraphQL
+ * {
+ *   orders(options: { take: 10 }) {
+ *     items {
+ *       id
+ *       lines {
+ *         productVariant {
+ *           product {
+ *             featuredAsset {
+ *               preview
+ *             }
+ *           }
+ *         }
+ *       }
+ *     }
+ *   }
+ * }
+ * ```
+ * then the `relations` array would include `'lines'`, `'lines.productVariant'`, & `'lines.productVariant.product'` - 3 levels deep - but it would
+ * _not_ include `'lines.productVariant.product.featuredAsset'` since that exceeds the default depth. To specify a custom depth, you would
+ * use the decorator like this:
+ *
+ * @example
+ * ```TypeScript
+ * \@Relations({ entity: Order, depth: 2 }) relations: RelationPaths<Order>,
+ * ```
+ *
+ * @docsCategory request
+ * @docsPage Api Decorator
+ * @since 1.6.0
+ */
+export declare const Relations: (...dataOrPipes: (FieldsDecoratorConfig | import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>>)[]) => ParameterDecorator;

package/dist/api/decorators/relations.decorator.js

@@ -0,0 +1,187 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Relations = void 0;
+const common_1 = require("@nestjs/common");
+const unique_1 = require("@vendure/common/lib/unique");
+const graphql_1 = require("graphql");
+const graphql_fields_1 = __importDefault(require("graphql-fields"));
+const typeorm_1 = require("typeorm");
+const calculated_decorator_1 = require("../../common/calculated-decorator");
+const index_1 = require("../../common/index");
+const DEFAULT_DEPTH = 3;
+const cache = new index_1.TtlCache({ cacheSize: 500, ttl: 5 * 60 * 1000 });
+/**
+ * @description
+ * Resolver param decorator which returns an array of relation paths which can be passed through
+ * to the TypeORM data layer in order to join only the required relations. This works by inspecting
+ * the GraphQL `info` object, examining the field selection, and then comparing this with information
+ * about the return type's relations.
+ *
+ * In addition to analyzing the field selection, this decorator also checks for any `@Calculated()`
+ * properties on the entity, and additionally includes relations from the `relations` array of the calculated
+ * metadata, if defined.
+ *
+ * So if, for example, the query only selects the `id` field of an Order, then no other relations need
+ * be joined in the resulting SQL query. This can massively speed up execution time for queries which do
+ * not include many deep nested relations.
+ *
+ * @example
+ * ```TypeScript
+ * \@Query()
+ * \@Allow(Permission.ReadOrder)
+ * orders(
+ *     \@Ctx() ctx: RequestContext,
+ *     \@Args() args: QueryOrdersArgs,
+ *     \@Relations(Order) relations: RelationPaths<Order>,
+ * ): Promise<PaginatedList<Order>> {
+ *     return this.orderService.findAll(ctx, args.options || undefined, relations);
+ * }
+ * ```
+ *
+ * In the above example, given the following query:
+ *
+ * @example
+ * ```GraphQL
+ * {
+ *   orders(options: { take: 10 }) {
+ *     items {
+ *       id
+ *       customer {
+ *         id
+ *         firstName
+ *         lastName
+ *       }
+ *       totalQuantity
+ *       totalWithTax
+ *     }
+ *   }
+ * }
+ * ```
+ * then the value of `relations` will be
+ *
+ * ```
+ * ['customer', 'lines', 'lines.items']
+ * ```
+ * The `'customer'` comes from the fact that the query is nesting the "customer" object, and the `'lines'` & `'lines.items'` are taken
+ * from the `Order` entity's `totalQuantity` property, which uses {@link Calculated} decorator and defines those relations as dependencies
+ * for deriving the calculated value.
+ *
+ * ## Depth
+ *
+ * By default, when inspecting the GraphQL query, the Relations decorator will look 3 levels deep in any nested fields. So, e.g. if
+ * the above `orders` query were changed to:
+ *
+ * @example
+ * ```GraphQL
+ * {
+ *   orders(options: { take: 10 }) {
+ *     items {
+ *       id
+ *       lines {
+ *         productVariant {
+ *           product {
+ *             featuredAsset {
+ *               preview
+ *             }
+ *           }
+ *         }
+ *       }
+ *     }
+ *   }
+ * }
+ * ```
+ * then the `relations` array would include `'lines'`, `'lines.productVariant'`, & `'lines.productVariant.product'` - 3 levels deep - but it would
+ * _not_ include `'lines.productVariant.product.featuredAsset'` since that exceeds the default depth. To specify a custom depth, you would
+ * use the decorator like this:
+ *
+ * @example
+ * ```TypeScript
+ * \@Relations({ entity: Order, depth: 2 }) relations: RelationPaths<Order>,
+ * ```
+ *
+ * @docsCategory request
+ * @docsPage Api Decorator
+ * @since 1.6.0
+ */
+exports.Relations = common_1.createParamDecorator((data, ctx) => {
+    var _a;
+    const info = ctx.getArgByIndex(3);
+    if (data == null) {
+        throw new index_1.InternalServerError(`The @Relations() decorator requires an entity type argument`);
+    }
+    if (!isGraphQLResolveInfo(info)) {
+        return [];
+    }
+    const cacheKey = info.fieldName + '__' + ctx.getArgByIndex(2).req.body.query;
+    const cachedResult = cache.get(cacheKey);
+    if (cachedResult) {
+        return cachedResult;
+    }
+    const fields = graphql_fields_1.default(info);
+    const targetFields = isPaginatedListQuery(info) ? (_a = fields.items) !== null && _a !== void 0 ? _a : {} : fields;
+    const entity = typeof data === 'function' ? data : data.entity;
+    const maxDepth = typeof data === 'function' ? DEFAULT_DEPTH : data.depth;
+    const relationFields = getRelationPaths(targetFields, entity, maxDepth);
+    const result = unique_1.unique(relationFields);
+    cache.set(cacheKey, result);
+    return result;
+});
+function getRelationPaths(fields, entity, maxDepth, depth = 1) {
+    var _a, _b;
+    const relations = typeorm_1.getMetadataArgsStorage().filterRelations(entity);
+    const metadata = typeorm_1.getMetadataArgsStorage();
+    const relationPaths = [];
+    for (const [property, value] of Object.entries(fields)) {
+        if (property === 'customFields') {
+            const customFieldEntity = (_a = metadata
+                .filterEmbeddeds(entity)
+                .find(e => e.propertyName === 'customFields')) === null || _a === void 0 ? void 0 : _a.type();
+            if (customFieldEntity) {
+                if (depth < maxDepth) {
+                    depth++;
+                    const subPaths = getRelationPaths(value, customFieldEntity, maxDepth, depth);
+                    depth--;
+                    for (const subPath of subPaths) {
+                        relationPaths.push([property, subPath].join('.'));
+                    }
+                }
+            }
+        }
+        else {
+            const relationMetadata = relations.find(r => r.propertyName === property);
+            if (relationMetadata) {
+                relationPaths.push(property);
+                const relatedEntity = typeof relationMetadata.type === 'function'
+                    ? relationMetadata.type()
+                    : relationMetadata.type;
+                if (depth < maxDepth) {
+                    depth++;
+                    const subPaths = getRelationPaths(value, relatedEntity, maxDepth, depth);
+                    depth--;
+                    for (const subPath of subPaths) {
+                        relationPaths.push([property, subPath].join('.'));
+                    }
+                }
+            }
+            const calculatedProperties = (_b = Object.getPrototypeOf(new entity())[calculated_decorator_1.CALCULATED_PROPERTIES]) !== null && _b !== void 0 ? _b : [];
+            const selectedFields = new Set(Object.keys(fields));
+            const dependencyRelations = calculatedProperties
+                .filter(p => { var _a, _b; return selectedFields.has(p.name) && ((_b = (_a = p.listQuery) === null || _a === void 0 ? void 0 : _a.relations) === null || _b === void 0 ? void 0 : _b.length); })
+                .map(p => { var _a, _b; return (_b = (_a = p.listQuery) === null || _a === void 0 ? void 0 : _a.relations) !== null && _b !== void 0 ? _b : []; })
+                .flat();
+            relationPaths.push(...dependencyRelations);
+        }
+    }
+    return relationPaths;
+}
+function isGraphQLResolveInfo(input) {
+    return !!(input && typeof input === 'object' && input.schema instanceof graphql_1.GraphQLSchema);
+}
+function isPaginatedListQuery(info) {
+    const returnType = graphql_1.getNamedType(info.returnType);
+    return graphql_1.isObjectType(returnType) && !!returnType.getInterfaces().find(i => i.name === 'PaginatedList');
+}
+//# sourceMappingURL=relations.decorator.js.map

package/dist/api/decorators/relations.decorator.js.map

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

package/dist/api/index.d.ts

@@ -4,6 +4,7 @@ export * from './common/extract-session-token';
 export * from './decorators/allow.decorator';
 export * from './decorators/transaction.decorator';
 export * from './decorators/api.decorator';
+export * from './decorators/relations.decorator';
 export * from './decorators/request-context.decorator';
 export * from './resolvers/admin/search.resolver';
 export * from './middleware/auth-guard';

package/dist/api/index.js

@@ -15,6 +15,7 @@ __exportStar(require("./common/extract-session-token"), exports);
 __exportStar(require("./decorators/allow.decorator"), exports);
 __exportStar(require("./decorators/transaction.decorator"), exports);
 __exportStar(require("./decorators/api.decorator"), exports);
+__exportStar(require("./decorators/relations.decorator"), exports);
 __exportStar(require("./decorators/request-context.decorator"), exports);
 __exportStar(require("./resolvers/admin/search.resolver"), exports);
 __exportStar(require("./middleware/auth-guard"), exports);

package/dist/api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2DAAyC;AACzC,iEAA+C;AAC/C,+DAA6C;AAC7C,qEAAmD;AACnD,6DAA2C;AAC3C,yEAAuD;AACvD,oEAAkD;AAClD,0DAAwC;AACxC,uEAAqD;AACrD,8DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2DAAyC;AACzC,iEAA+C;AAC/C,+DAA6C;AAC7C,qEAAmD;AACnD,6DAA2C;AAC3C,mEAAiD;AACjD,yEAAuD;AACvD,oEAAkD;AAClD,0DAAwC;AACxC,uEAAqD;AACrD,8DAA4C"}

package/dist/api/resolvers/admin/administrator.resolver.d.ts

@@ -3,11 +3,12 @@ import { PaginatedList } from '@vendure/common/lib/shared-types';
 import { Administrator } from '../../../entity/administrator/administrator.entity';
 import { AdministratorService } from '../../../service/services/administrator.service';
 import { RequestContext } from '../../common/request-context';
+import { RelationPaths } from '../../decorators/relations.decorator';
 export declare class AdministratorResolver {
     private administratorService;
     constructor(administratorService: AdministratorService);
-    administrators(ctx: RequestContext, args: QueryAdministratorsArgs): Promise<PaginatedList<Administrator>>;
-    administrator(ctx: RequestContext, args: QueryAdministratorArgs): Promise<Administrator | undefined>;
+    administrators(ctx: RequestContext, args: QueryAdministratorsArgs, relations: RelationPaths<Administrator>): Promise<PaginatedList<Administrator>>;
+    administrator(ctx: RequestContext, args: QueryAdministratorArgs, relations: RelationPaths<Administrator>): Promise<Administrator | undefined>;
     activeAdministrator(ctx: RequestContext): Promise<Administrator | undefined>;
     createAdministrator(ctx: RequestContext, args: MutationCreateAdministratorArgs): Promise<Administrator>;
     updateAdministrator(ctx: RequestContext, args: MutationUpdateAdministratorArgs): Promise<Administrator>;

package/dist/api/resolvers/admin/administrator.resolver.js

@@ -15,20 +15,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdministratorResolver = void 0;
 const graphql_1 = require("@nestjs/graphql");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
+const administrator_entity_1 = require("../../../entity/administrator/administrator.entity");
 const administrator_service_1 = require("../../../service/services/administrator.service");
 const request_context_1 = require("../../common/request-context");
 const allow_decorator_1 = require("../../decorators/allow.decorator");
+const relations_decorator_1 = require("../../decorators/relations.decorator");
 const request_context_decorator_1 = require("../../decorators/request-context.decorator");
 const transaction_decorator_1 = require("../../decorators/transaction.decorator");
 let AdministratorResolver = class AdministratorResolver {
     constructor(administratorService) {
         this.administratorService = administratorService;
     }
-    administrators(ctx, args) {
-        return this.administratorService.findAll(ctx, args.options || undefined);
+    administrators(ctx, args, relations) {
+        return this.administratorService.findAll(ctx, args.options || undefined, relations);
     }
-    administrator(ctx, args) {
-        return this.administratorService.findOne(ctx, args.id);
+    administrator(ctx, args, relations) {
+        return this.administratorService.findOne(ctx, args.id, relations);
     }
     async activeAdministrator(ctx) {
         if (ctx.activeUserId) {
@@ -65,8 +67,9 @@ __decorate([
     allow_decorator_1.Allow(generated_types_1.Permission.ReadAdministrator),
     __param(0, request_context_decorator_1.Ctx()),
     __param(1, graphql_1.Args()),
+    __param(2, relations_decorator_1.Relations(administrator_entity_1.Administrator)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [request_context_1.RequestContext, Object]),
+    __metadata("design:paramtypes", [request_context_1.RequestContext, Object, Array]),
     __metadata("design:returntype", Promise)
 ], AdministratorResolver.prototype, "administrators", null);
 __decorate([
@@ -74,8 +77,9 @@ __decorate([
     allow_decorator_1.Allow(generated_types_1.Permission.ReadAdministrator),
     __param(0, request_context_decorator_1.Ctx()),
     __param(1, graphql_1.Args()),
+    __param(2, relations_decorator_1.Relations(administrator_entity_1.Administrator)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [request_context_1.RequestContext, Object]),
+    __metadata("design:paramtypes", [request_context_1.RequestContext, Object, Array]),
     __metadata("design:returntype", Promise)
 ], AdministratorResolver.prototype, "administrator", null);
 __decorate([

package/dist/api/resolvers/admin/administrator.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"administrator.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/administrator.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAkE;AAClE,yEAU6C;AAI7C,2FAAuF;AACvF,kEAA8D;AAC9D,sEAAyD;AACzD,0FAAiE;AACjE,kFAAqE;AAGrE,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAC9B,YAAoB,oBAA0C;QAA1C,yBAAoB,GAApB,oBAAoB,CAAsB;IAAG,CAAC;IAIlE,cAAc,CACH,GAAmB,EAClB,IAA6B;QAErC,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,IAAI,SAAS,CAAC,CAAC;IAC7E,CAAC;IAID,aAAa,CACF,GAAmB,EAClB,IAA4B;QAEpC,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3D,CAAC;IAID,KAAK,CAAC,mBAAmB,CAAQ,GAAmB;QAChD,IAAI,GAAG,CAAC,YAAY,EAAE;YAClB,OAAO,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;SAC3E;IACL,CAAC;IAKD,mBAAmB,CACR,GAAmB,EAClB,IAAqC;QAE7C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC;IAKD,mBAAmB,CACR,GAAmB,EAClB,IAAqC;QAE7C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC;IAKD,KAAK,CAAC,yBAAyB,CACpB,GAAmB,EAClB,IAA2C;QAEnD,IAAI,GAAG,CAAC,YAAY,EAAE;YAClB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YACvB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;YAC7F,IAAI,aAAa,EAAE;gBACf,OAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,kCAAO,KAAK,KAAE,EAAE,EAAE,aAAa,CAAC,EAAE,IAAG,CAAC;aACpF;SACJ;IACL,CAAC;IAKD,yBAAyB,CACd,GAAmB,EAClB,IAA2C;QAEnD,OAAO,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxF,CAAC;IAKD,mBAAmB,CACR,GAAmB,EAClB,IAAqC;QAE7C,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC;CACJ,CAAA;AAlFG;IAFC,eAAK,EAAE;IACP,uBAAK,CAAC,4BAAU,CAAC,iBAAiB,CAAC;IAE/B,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,cAAI,EAAE,CAAA;;qCADK,gCAAc;;2DAI7B;AAID;IAFC,eAAK,EAAE;IACP,uBAAK,CAAC,4BAAU,CAAC,iBAAiB,CAAC;IAE/B,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,cAAI,EAAE,CAAA;;qCADK,gCAAc;;0DAI7B;AAID;IAFC,eAAK,EAAE;IACP,uBAAK,CAAC,4BAAU,CAAC,KAAK,CAAC;IACG,WAAA,+BAAG,EAAE,CAAA;;qCAAM,gCAAc;;gEAInD;AAKD;IAHC,mCAAW,EAAE;IACb,kBAAQ,EAAE;IACV,uBAAK,CAAC,4BAAU,CAAC,mBAAmB,CAAC;IAEjC,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,cAAI,EAAE,CAAA;;qCADK,gCAAc;;gEAK7B;AAKD;IAHC,mCAAW,EAAE;IACb,kBAAQ,EAAE;IACV,uBAAK,CAAC,4BAAU,CAAC,mBAAmB,CAAC;IAEjC,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,cAAI,EAAE,CAAA;;qCADK,gCAAc;;gEAK7B;AAKD;IAHC,mCAAW,EAAE;IACb,kBAAQ,EAAE;IACV,uBAAK,CAAC,4BAAU,CAAC,KAAK,CAAC;IAEnB,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,cAAI,EAAE,CAAA;;qCADK,gCAAc;;sEAU7B;AAKD;IAHC,mCAAW,EAAE;IACb,kBAAQ,EAAE;IACV,uBAAK,CAAC,4BAAU,CAAC,mBAAmB,CAAC;IAEjC,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,cAAI,EAAE,CAAA;;qCADK,gCAAc;;sEAI7B;AAKD;IAHC,mCAAW,EAAE;IACb,kBAAQ,EAAE;IACV,uBAAK,CAAC,4BAAU,CAAC,mBAAmB,CAAC;IAEjC,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,cAAI,EAAE,CAAA;;qCADK,gCAAc;;gEAK7B;AAtFQ,qBAAqB;IADjC,kBAAQ,CAAC,eAAe,CAAC;qCAEoB,4CAAoB;GADrD,qBAAqB,CAuFjC;AAvFY,sDAAqB"}
+{"version":3,"file":"administrator.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/administrator.resolver.ts"],"names":[],"mappings":"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"}

package/dist/api/resolvers/admin/asset.resolver.d.ts

@@ -3,11 +3,12 @@ import { PaginatedList } from '@vendure/common/lib/shared-types';
 import { Asset } from '../../../entity/asset/asset.entity';
 import { AssetService } from '../../../service/services/asset.service';
 import { RequestContext } from '../../common/request-context';
+import { RelationPaths } from '../../decorators/relations.decorator';
 export declare class AssetResolver {
     private assetService;
     constructor(assetService: AssetService);
-    asset(ctx: RequestContext, args: QueryAssetArgs): Promise<Asset | undefined>;
-    assets(ctx: RequestContext, args: QueryAssetsArgs): Promise<PaginatedList<Asset>>;
+    asset(ctx: RequestContext, args: QueryAssetArgs, relations: RelationPaths<Asset>): Promise<Asset | undefined>;
+    assets(ctx: RequestContext, args: QueryAssetsArgs, relations: RelationPaths<Asset>): Promise<PaginatedList<Asset>>;
     createAssets(ctx: RequestContext, args: MutationCreateAssetsArgs): Promise<CreateAssetResult[]>;
     updateAsset(ctx: RequestContext, { input }: MutationUpdateAssetArgs): Promise<Asset>;
     deleteAsset(ctx: RequestContext, { input: { assetId, force, deleteFromAllChannels } }: MutationDeleteAssetArgs): Promise<import("@vendure/common/lib/generated-types").DeletionResponse>;

package/dist/api/resolvers/admin/asset.resolver.js

@@ -15,20 +15,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetResolver = void 0;
 const graphql_1 = require("@nestjs/graphql");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
+const asset_entity_1 = require("../../../entity/asset/asset.entity");
 const asset_service_1 = require("../../../service/services/asset.service");
 const request_context_1 = require("../../common/request-context");
 const allow_decorator_1 = require("../../decorators/allow.decorator");
+const relations_decorator_1 = require("../../decorators/relations.decorator");
 const request_context_decorator_1 = require("../../decorators/request-context.decorator");
 const transaction_decorator_1 = require("../../decorators/transaction.decorator");
 let AssetResolver = class AssetResolver {
     constructor(assetService) {
         this.assetService = assetService;
     }
-    async asset(ctx, args) {
-        return this.assetService.findOne(ctx, args.id);
+    async asset(ctx, args, relations) {
+        return this.assetService.findOne(ctx, args.id, relations);
     }
-    async assets(ctx, args) {
-        return this.assetService.findAll(ctx, args.options || undefined);
+    async assets(ctx, args, relations) {
+        return this.assetService.findAll(ctx, args.options || undefined, relations);
     }
     async createAssets(ctx, args) {
         // TODO: Is there some way to parellelize this while still preserving
@@ -58,8 +60,9 @@ __decorate([
     allow_decorator_1.Allow(generated_types_1.Permission.ReadCatalog, generated_types_1.Permission.ReadAsset),
     __param(0, request_context_decorator_1.Ctx()),
     __param(1, graphql_1.Args()),
+    __param(2, relations_decorator_1.Relations(asset_entity_1.Asset)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [request_context_1.RequestContext, Object]),
+    __metadata("design:paramtypes", [request_context_1.RequestContext, Object, Array]),
     __metadata("design:returntype", Promise)
 ], AssetResolver.prototype, "asset", null);
 __decorate([
@@ -67,8 +70,9 @@ __decorate([
     allow_decorator_1.Allow(generated_types_1.Permission.ReadCatalog, generated_types_1.Permission.ReadAsset),
     __param(0, request_context_decorator_1.Ctx()),
     __param(1, graphql_1.Args()),
+    __param(2, relations_decorator_1.Relations(asset_entity_1.Asset)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [request_context_1.RequestContext, Object]),
+    __metadata("design:paramtypes", [request_context_1.RequestContext, Object, Array]),
     __metadata("design:returntype", Promise)
 ], AssetResolver.prototype, "assets", null);
 __decorate([

package/dist/api/resolvers/admin/asset.resolver.js.map

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

package/dist/api/resolvers/admin/collection.resolver.d.ts

@@ -1,4 +1,4 @@
-import { ConfigurableOperationDefinition, DeletionResponse, MutationCreateCollectionArgs, MutationDeleteCollectionArgs, MutationMoveCollectionArgs, MutationUpdateCollectionArgs, QueryCollectionArgs, QueryCollectionsArgs } from '@vendure/common/lib/generated-types';
+import { ConfigurableOperationDefinition, DeletionResponse, MutationCreateCollectionArgs, MutationDeleteCollectionArgs, MutationMoveCollectionArgs, MutationUpdateCollectionArgs, QueryCollectionArgs, QueryCollectionsArgs, QueryPreviewCollectionVariantsArgs } from '@vendure/common/lib/generated-types';
 import { PaginatedList } from '@vendure/common/lib/shared-types';
 import { Translated } from '../../../common/types/locale-types';
 import { Collection } from '../../../entity/collection/collection.entity';
@@ -6,14 +6,16 @@ import { CollectionService } from '../../../service/services/collection.service'
 import { FacetValueService } from '../../../service/services/facet-value.service';
 import { ConfigurableOperationCodec } from '../../common/configurable-operation-codec';
 import { RequestContext } from '../../common/request-context';
+import { RelationPaths } from '../../decorators/relations.decorator';
 export declare class CollectionResolver {
     private collectionService;
     private facetValueService;
     private configurableOperationCodec;
     constructor(collectionService: CollectionService, facetValueService: FacetValueService, configurableOperationCodec: ConfigurableOperationCodec);
     collectionFilters(ctx: RequestContext, args: QueryCollectionsArgs): Promise<ConfigurableOperationDefinition[]>;
-    collections(ctx: RequestContext, args: QueryCollectionsArgs): Promise<PaginatedList<Translated<Collection>>>;
-    collection(ctx: RequestContext, args: QueryCollectionArgs): Promise<Translated<Collection> | undefined>;
+    collections(ctx: RequestContext, args: QueryCollectionsArgs, relations: RelationPaths<Collection>): Promise<PaginatedList<Translated<Collection>>>;
+    collection(ctx: RequestContext, args: QueryCollectionArgs, relations: RelationPaths<Collection>): Promise<Translated<Collection> | undefined>;
+    previewCollectionVariants(ctx: RequestContext, args: QueryPreviewCollectionVariantsArgs, relations: RelationPaths<Collection>): Promise<PaginatedList<import("../../..").ProductVariant>>;
     createCollection(ctx: RequestContext, args: MutationCreateCollectionArgs): Promise<Translated<Collection>>;
     updateCollection(ctx: RequestContext, args: MutationUpdateCollectionArgs): Promise<Translated<Collection>>;
     moveCollection(ctx: RequestContext, args: MutationMoveCollectionArgs): Promise<Translated<Collection>>;

package/dist/api/resolvers/admin/collection.resolver.js

@@ -17,11 +17,13 @@ const graphql_1 = require("@nestjs/graphql");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
 const errors_1 = require("../../../common/error/errors");
 const collection_filter_1 = require("../../../config/catalog/collection-filter");
+const collection_entity_1 = require("../../../entity/collection/collection.entity");
 const collection_service_1 = require("../../../service/services/collection.service");
 const facet_value_service_1 = require("../../../service/services/facet-value.service");
 const configurable_operation_codec_1 = require("../../common/configurable-operation-codec");
 const request_context_1 = require("../../common/request-context");
 const allow_decorator_1 = require("../../decorators/allow.decorator");
+const relations_decorator_1 = require("../../decorators/relations.decorator");
 const request_context_decorator_1 = require("../../decorators/request-context.decorator");
 const transaction_decorator_1 = require("../../decorators/transaction.decorator");
 let CollectionResolver = class CollectionResolver {
@@ -42,28 +44,32 @@ let CollectionResolver = class CollectionResolver {
     async collectionFilters(ctx, args) {
         return this.collectionService.getAvailableFilters(ctx);
     }
-    async collections(ctx, args) {
-        return this.collectionService.findAll(ctx, args.options || undefined).then(res => {
+    async collections(ctx, args, relations) {
+        return this.collectionService.findAll(ctx, args.options || undefined, relations).then(res => {
             res.items.forEach(this.encodeFilters);
             return res;
         });
     }
-    async collection(ctx, args) {
+    async collection(ctx, args, relations) {
         let collection;
         if (args.id) {
-            collection = await this.collectionService.findOne(ctx, args.id);
+            collection = await this.collectionService.findOne(ctx, args.id, relations);
             if (args.slug && collection && collection.slug !== args.slug) {
                 throw new errors_1.UserInputError(`error.collection-id-slug-mismatch`);
             }
         }
         else if (args.slug) {
-            collection = await this.collectionService.findOneBySlug(ctx, args.slug);
+            collection = await this.collectionService.findOneBySlug(ctx, args.slug, relations);
         }
         else {
             throw new errors_1.UserInputError(`error.collection-id-or-slug-must-be-provided`);
         }
         return this.encodeFilters(collection);
     }
+    previewCollectionVariants(ctx, args, relations) {
+        this.configurableOperationCodec.decodeConfigurableOperationIds(collection_filter_1.CollectionFilter, args.input.filters);
+        return this.collectionService.previewCollectionVariants(ctx, args.input, args.options || undefined);
+    }
     async createCollection(ctx, args) {
         const { input } = args;
         this.configurableOperationCodec.decodeConfigurableOperationIds(collection_filter_1.CollectionFilter, input.filters);
@@ -96,8 +102,9 @@ __decorate([
     allow_decorator_1.Allow(generated_types_1.Permission.ReadCatalog, generated_types_1.Permission.ReadCollection),
     __param(0, request_context_decorator_1.Ctx()),
     __param(1, graphql_1.Args()),
+    __param(2, relations_decorator_1.Relations(collection_entity_1.Collection)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [request_context_1.RequestContext, Object]),
+    __metadata("design:paramtypes", [request_context_1.RequestContext, Object, Array]),
     __metadata("design:returntype", Promise)
 ], CollectionResolver.prototype, "collections", null);
 __decorate([
@@ -105,10 +112,21 @@ __decorate([
     allow_decorator_1.Allow(generated_types_1.Permission.ReadCatalog, generated_types_1.Permission.ReadCollection),
     __param(0, request_context_decorator_1.Ctx()),
     __param(1, graphql_1.Args()),
+    __param(2, relations_decorator_1.Relations(collection_entity_1.Collection)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [request_context_1.RequestContext, Object]),
+    __metadata("design:paramtypes", [request_context_1.RequestContext, Object, Array]),
     __metadata("design:returntype", Promise)
 ], CollectionResolver.prototype, "collection", null);
+__decorate([
+    graphql_1.Query(),
+    allow_decorator_1.Allow(generated_types_1.Permission.ReadCatalog, generated_types_1.Permission.ReadCollection),
+    __param(0, request_context_decorator_1.Ctx()),
+    __param(1, graphql_1.Args()),
+    __param(2, relations_decorator_1.Relations(collection_entity_1.Collection)),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [request_context_1.RequestContext, Object, Array]),
+    __metadata("design:returntype", void 0)
+], CollectionResolver.prototype, "previewCollectionVariants", null);
 __decorate([
     transaction_decorator_1.Transaction(),
     graphql_1.Mutation(),