@vendure/core 2.2.4 → 2.2.5

package/dist/api/api-internal-modules.d.ts

@@ -26,8 +26,8 @@ import { ShippingMethodEntityResolver } from './resolvers/entity/shipping-method
 import { TaxRateEntityResolver } from './resolvers/entity/tax-rate-entity.resolver';
 import { UserEntityResolver } from './resolvers/entity/user-entity.resolver';
 import { ZoneEntityResolver } from './resolvers/entity/zone-entity.resolver';
-export declare const entityResolvers: (typeof AssetEntityResolver | typeof ChannelEntityResolver | typeof CollectionEntityResolver | typeof CountryEntityResolver | typeof CustomerEntityResolver | typeof CustomerGroupEntityResolver | typeof FacetEntityResolver | typeof FacetValueEntityResolver | typeof FulfillmentEntityResolver | typeof FulfillmentLineEntityResolver | typeof OrderEntityResolver | typeof OrderLineEntityResolver | typeof PaymentEntityResolver | typeof ProductEntityResolver | typeof ProductOptionEntityResolver | typeof ProductOptionGroupEntityResolver | typeof ProductVariantEntityResolver | typeof RefundEntityResolver | typeof RefundLineEntityResolver | typeof RoleEntityResolver | typeof ShippingLineEntityResolver | typeof ShippingMethodEntityResolver | typeof TaxRateEntityResolver | typeof UserEntityResolver | typeof ZoneEntityResolver)[];
-export declare const adminEntityResolvers: (typeof AdministratorEntityResolver | typeof CustomerAdminEntityResolver | typeof FulfillmentAdminEntityResolver | typeof JobEntityResolver | typeof OrderAdminEntityResolver | typeof PaymentAdminEntityResolver | typeof PaymentMethodEntityResolver | typeof ProductAdminEntityResolver | typeof ProductVariantAdminEntityResolver)[];
+export declare const entityResolvers: (typeof ProductVariantEntityResolver | typeof ProductEntityResolver | typeof AssetEntityResolver | typeof ChannelEntityResolver | typeof CollectionEntityResolver | typeof CountryEntityResolver | typeof CustomerEntityResolver | typeof CustomerGroupEntityResolver | typeof FacetEntityResolver | typeof FacetValueEntityResolver | typeof FulfillmentEntityResolver | typeof FulfillmentLineEntityResolver | typeof OrderEntityResolver | typeof OrderLineEntityResolver | typeof PaymentEntityResolver | typeof ProductOptionEntityResolver | typeof ProductOptionGroupEntityResolver | typeof RefundEntityResolver | typeof RefundLineEntityResolver | typeof RoleEntityResolver | typeof ShippingLineEntityResolver | typeof UserEntityResolver | typeof TaxRateEntityResolver | typeof ShippingMethodEntityResolver | typeof ZoneEntityResolver)[];
+export declare const adminEntityResolvers: (typeof ProductVariantAdminEntityResolver | typeof ProductAdminEntityResolver | typeof AdministratorEntityResolver | typeof CustomerAdminEntityResolver | typeof OrderAdminEntityResolver | typeof PaymentMethodEntityResolver | typeof FulfillmentAdminEntityResolver | typeof PaymentAdminEntityResolver | typeof JobEntityResolver)[];
 /**
  * The internal module containing some shared providers used by more than
  * one API module.

package/dist/api/config/generate-resolvers.d.ts

@@ -117,10 +117,10 @@ export declare function generateResolvers(configService: ConfigService, customFi
         __resolveType(value: any): "SinglePrice" | "PriceRange";
     };
     CustomFieldConfig: {
-        __resolveType(value: any): "TextCustomFieldConfig" | "RelationCustomFieldConfig" | "LocaleTextCustomFieldConfig" | "BooleanCustomFieldConfig" | "StringCustomFieldConfig" | "LocaleStringCustomFieldConfig" | "IntCustomFieldConfig" | "FloatCustomFieldConfig" | "DateTimeCustomFieldConfig" | undefined;
+        __resolveType(value: any): "RelationCustomFieldConfig" | "StringCustomFieldConfig" | "LocaleStringCustomFieldConfig" | "TextCustomFieldConfig" | "LocaleTextCustomFieldConfig" | "IntCustomFieldConfig" | "FloatCustomFieldConfig" | "BooleanCustomFieldConfig" | "DateTimeCustomFieldConfig" | undefined;
     };
     CustomField: {
-        __resolveType(value: any): "TextCustomFieldConfig" | "RelationCustomFieldConfig" | "LocaleTextCustomFieldConfig" | "BooleanCustomFieldConfig" | "StringCustomFieldConfig" | "LocaleStringCustomFieldConfig" | "IntCustomFieldConfig" | "FloatCustomFieldConfig" | "DateTimeCustomFieldConfig" | undefined;
+        __resolveType(value: any): "RelationCustomFieldConfig" | "StringCustomFieldConfig" | "LocaleStringCustomFieldConfig" | "TextCustomFieldConfig" | "LocaleTextCustomFieldConfig" | "IntCustomFieldConfig" | "FloatCustomFieldConfig" | "BooleanCustomFieldConfig" | "DateTimeCustomFieldConfig" | undefined;
     };
     ErrorResult: {
         __resolveType(value: ErrorResult): string;
@@ -197,10 +197,10 @@ export declare function generateResolvers(configService: ConfigService, customFi
         __resolveType(value: any): "SinglePrice" | "PriceRange";
     };
     CustomFieldConfig: {
-        __resolveType(value: any): "TextCustomFieldConfig" | "RelationCustomFieldConfig" | "LocaleTextCustomFieldConfig" | "BooleanCustomFieldConfig" | "StringCustomFieldConfig" | "LocaleStringCustomFieldConfig" | "IntCustomFieldConfig" | "FloatCustomFieldConfig" | "DateTimeCustomFieldConfig" | undefined;
+        __resolveType(value: any): "RelationCustomFieldConfig" | "StringCustomFieldConfig" | "LocaleStringCustomFieldConfig" | "TextCustomFieldConfig" | "LocaleTextCustomFieldConfig" | "IntCustomFieldConfig" | "FloatCustomFieldConfig" | "BooleanCustomFieldConfig" | "DateTimeCustomFieldConfig" | undefined;
     };
     CustomField: {
-        __resolveType(value: any): "TextCustomFieldConfig" | "RelationCustomFieldConfig" | "LocaleTextCustomFieldConfig" | "BooleanCustomFieldConfig" | "StringCustomFieldConfig" | "LocaleStringCustomFieldConfig" | "IntCustomFieldConfig" | "FloatCustomFieldConfig" | "DateTimeCustomFieldConfig" | undefined;
+        __resolveType(value: any): "RelationCustomFieldConfig" | "StringCustomFieldConfig" | "LocaleStringCustomFieldConfig" | "TextCustomFieldConfig" | "LocaleTextCustomFieldConfig" | "IntCustomFieldConfig" | "FloatCustomFieldConfig" | "BooleanCustomFieldConfig" | "DateTimeCustomFieldConfig" | undefined;
     };
     ErrorResult: {
         __resolveType(value: ErrorResult): string;

package/dist/api/config/graphql-custom-fields.js

@@ -15,13 +15,13 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
     const schema = typeof typeDefsOrSchema === 'string' ? (0, graphql_1.buildSchema)(typeDefsOrSchema) : typeDefsOrSchema;
     let customFieldTypeDefs = '';
     if (!schema.getType('JSON')) {
-        customFieldTypeDefs += `
-            scalar JSON
+        customFieldTypeDefs += `
+            scalar JSON
         `;
     }
     if (!schema.getType('DateTime')) {
-        customFieldTypeDefs += `
-            scalar DateTime
+        customFieldTypeDefs += `
+            scalar DateTime
         `;
     }
     const customFieldsConfig = (0, get_custom_fields_config_without_interfaces_1.getCustomFieldsConfigWithoutInterfaces)(customFieldConfig, schema);
@@ -59,72 +59,72 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
         const filterableFields = customEntityFields.filter(field => field.type !== 'relation');
         if (schema.getType(entityName)) {
             if (customEntityFields.length) {
-                customFieldTypeDefs += `
-                    type ${entityName}CustomFields {
-                        ${mapToFields(customEntityFields, wrapListType(getGraphQlType))}
-                    }
-
-                    extend type ${entityName} {
-                        customFields: ${entityName}CustomFields
-                    }
+                customFieldTypeDefs += `
+                    type ${entityName}CustomFields {
+                        ${mapToFields(customEntityFields, wrapListType(getGraphQlType))}
+                    }
+
+                    extend type ${entityName} {
+                        customFields: ${entityName}CustomFields
+                    }
                 `;
             }
             else {
-                customFieldTypeDefs += `
-                    extend type ${entityName} {
-                        customFields: JSON
-                    }
+                customFieldTypeDefs += `
+                    extend type ${entityName} {
+                        customFields: JSON
+                    }
                 `;
             }
         }
         if (localizedFields.length && schema.getType(`${entityName}Translation`)) {
-            customFieldTypeDefs += `
-                    type ${entityName}TranslationCustomFields {
-                         ${mapToFields(localizedFields, wrapListType(getGraphQlType))}
-                    }
-
-                    extend type ${entityName}Translation {
-                        customFields: ${entityName}TranslationCustomFields
-                    }
+            customFieldTypeDefs += `
+                    type ${entityName}TranslationCustomFields {
+                         ${mapToFields(localizedFields, wrapListType(getGraphQlType))}
+                    }
+
+                    extend type ${entityName}Translation {
+                        customFields: ${entityName}TranslationCustomFields
+                    }
                 `;
         }
         if (schema.getType(`Create${entityName}Input`)) {
             if (writeableNonLocalizedFields.length) {
-                customFieldTypeDefs += `
-                    input Create${entityName}CustomFieldsInput {
-                       ${mapToFields(writeableNonLocalizedFields, wrapListType(getGraphQlInputType), shared_utils_1.getGraphQlInputName)}
-                    }
-
-                    extend input Create${entityName}Input {
-                        customFields: Create${entityName}CustomFieldsInput
-                    }
+                customFieldTypeDefs += `
+                    input Create${entityName}CustomFieldsInput {
+                       ${mapToFields(writeableNonLocalizedFields, wrapListType(getGraphQlInputType), shared_utils_1.getGraphQlInputName)}
+                    }
+
+                    extend input Create${entityName}Input {
+                        customFields: Create${entityName}CustomFieldsInput
+                    }
                 `;
             }
             else {
-                customFieldTypeDefs += `
-                   extend input Create${entityName}Input {
-                       customFields: JSON
-                   }
+                customFieldTypeDefs += `
+                   extend input Create${entityName}Input {
+                       customFields: JSON
+                   }
                `;
             }
         }
         if (schema.getType(`Update${entityName}Input`)) {
             if (writeableNonLocalizedFields.length) {
-                customFieldTypeDefs += `
-                    input Update${entityName}CustomFieldsInput {
-                       ${mapToFields(writeableNonLocalizedFields, wrapListType(getGraphQlInputType), shared_utils_1.getGraphQlInputName)}
-                    }
-
-                    extend input Update${entityName}Input {
-                        customFields: Update${entityName}CustomFieldsInput
-                    }
+                customFieldTypeDefs += `
+                    input Update${entityName}CustomFieldsInput {
+                       ${mapToFields(writeableNonLocalizedFields, wrapListType(getGraphQlInputType), shared_utils_1.getGraphQlInputName)}
+                    }
+
+                    extend input Update${entityName}Input {
+                        customFields: Update${entityName}CustomFieldsInput
+                    }
                 `;
             }
             else {
-                customFieldTypeDefs += `
-                    extend input Update${entityName}Input {
-                        customFields: JSON
-                    }
+                customFieldTypeDefs += `
+                    extend input Update${entityName}Input {
+                        customFields: JSON
+                    }
                 `;
             }
         }
@@ -132,17 +132,17 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
         if (customEntityNonListFields.length && schema.getType(`${entityName}SortParameter`)) {
             // Sorting list fields makes no sense, so we only add "sort" fields
             // to non-list fields.
-            customFieldTypeDefs += `
-                    extend input ${entityName}SortParameter {
-                         ${mapToFields(customEntityNonListFields, () => 'SortOrder')}
-                    }
+            customFieldTypeDefs += `
+                    extend input ${entityName}SortParameter {
+                         ${mapToFields(customEntityNonListFields, () => 'SortOrder')}
+                    }
                 `;
         }
         if (filterableFields.length && schema.getType(`${entityName}FilterParameter`)) {
-            customFieldTypeDefs += `
-                    extend input ${entityName}FilterParameter {
-                         ${mapToFields(filterableFields, getFilterOperator)}
-                    }
+            customFieldTypeDefs += `
+                    extend input ${entityName}FilterParameter {
+                         ${mapToFields(filterableFields, getFilterOperator)}
+                    }
                 `;
         }
         if (writeableLocalizedFields) {
@@ -154,21 +154,21 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
             for (const inputName of translationInputs) {
                 if (schema.getType(inputName)) {
                     if (writeableLocalizedFields.length) {
-                        customFieldTypeDefs += `
-                            input ${inputName}CustomFields {
-                                ${mapToFields(writeableLocalizedFields, wrapListType(getGraphQlType))}
-                            }
-
-                            extend input ${inputName} {
-                                customFields: ${inputName}CustomFields
-                            }
+                        customFieldTypeDefs += `
+                            input ${inputName}CustomFields {
+                                ${mapToFields(writeableLocalizedFields, wrapListType(getGraphQlType))}
+                            }
+
+                            extend input ${inputName} {
+                                customFields: ${inputName}CustomFields
+                            }
                         `;
                     }
                     else {
-                        customFieldTypeDefs += `
-                            extend input ${inputName} {
-                                customFields: JSON
-                            }
+                        customFieldTypeDefs += `
+                            extend input ${inputName} {
+                                customFields: JSON
+                            }
                         `;
                     }
                 }
@@ -180,26 +180,26 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
         // For custom fields on the Address entity, we also extend the OrderAddress
         // type (which is used to store address snapshots on Orders)
         if (schema.getType('OrderAddress')) {
-            customFieldTypeDefs += `
-                extend type OrderAddress {
-                    customFields: AddressCustomFields
-                }
+            customFieldTypeDefs += `
+                extend type OrderAddress {
+                    customFields: AddressCustomFields
+                }
             `;
         }
         if (schema.getType('UpdateOrderAddressInput')) {
-            customFieldTypeDefs += `
-                extend input UpdateOrderAddressInput {
-                    customFields: UpdateAddressCustomFieldsInput
-                }
+            customFieldTypeDefs += `
+                extend input UpdateOrderAddressInput {
+                    customFields: UpdateAddressCustomFieldsInput
+                }
             `;
         }
     }
     else {
         if (schema.getType('OrderAddress')) {
-            customFieldTypeDefs += `
-                extend type OrderAddress {
-                    customFields: JSON
-                }
+            customFieldTypeDefs += `
+                extend type OrderAddress {
+                    customFields: JSON
+                }
         `;
         }
     }
@@ -208,28 +208,28 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
 exports.addGraphQLCustomFields = addGraphQLCustomFields;
 function addServerConfigCustomFields(typeDefsOrSchema, customFieldConfig) {
     const schema = typeof typeDefsOrSchema === 'string' ? (0, graphql_1.buildSchema)(typeDefsOrSchema) : typeDefsOrSchema;
-    const customFieldTypeDefs = `
-            """
-            This type is deprecated in v2.2 in favor of the EntityCustomFields type,
-            which allows custom fields to be defined on user-supplies entities.
-            """
-            type CustomFields {
-                ${Object.keys(customFieldConfig).reduce((output, name) => output + name + ': [CustomFieldConfig!]!\n', '')}
-            }
-
-            type EntityCustomFields {
-                entityName: String!
-                customFields: [CustomFieldConfig!]!
-            }
-
-            extend type ServerConfig {
-                """
-                This field is deprecated in v2.2 in favor of the entityCustomFields field,
-                which allows custom fields to be defined on user-supplies entities.
-                """
-                customFieldConfig: CustomFields!
-                entityCustomFields: [EntityCustomFields!]!
-            }
+    const customFieldTypeDefs = `
+            """
+            This type is deprecated in v2.2 in favor of the EntityCustomFields type,
+            which allows custom fields to be defined on user-supplies entities.
+            """
+            type CustomFields {
+                ${Object.keys(customFieldConfig).reduce((output, name) => output + name + ': [CustomFieldConfig!]!\n', '')}
+            }
+
+            type EntityCustomFields {
+                entityName: String!
+                customFields: [CustomFieldConfig!]!
+            }
+
+            extend type ServerConfig {
+                """
+                This field is deprecated in v2.2 in favor of the entityCustomFields field,
+                which allows custom fields to be defined on user-supplies entities.
+                """
+                customFieldConfig: CustomFields!
+                entityCustomFields: [EntityCustomFields!]!
+            }
         `;
     return (0, graphql_1.extendSchema)(schema, (0, graphql_1.parse)(customFieldTypeDefs));
 }
@@ -237,10 +237,10 @@ exports.addServerConfigCustomFields = addServerConfigCustomFields;
 function addActiveAdministratorCustomFields(typeDefsOrSchema, administratorCustomFields) {
     const schema = typeof typeDefsOrSchema === 'string' ? (0, graphql_1.buildSchema)(typeDefsOrSchema) : typeDefsOrSchema;
     const writableCustomFields = administratorCustomFields === null || administratorCustomFields === void 0 ? void 0 : administratorCustomFields.filter(field => field.readonly !== true);
-    const extension = `
-        extend input UpdateActiveAdministratorInput {
-            customFields: ${0 < (writableCustomFields === null || writableCustomFields === void 0 ? void 0 : writableCustomFields.length) ? 'UpdateAdministratorCustomFieldsInput' : 'JSON'}
-        }
+    const extension = `
+        extend input UpdateActiveAdministratorInput {
+            customFields: ${0 < (writableCustomFields === null || writableCustomFields === void 0 ? void 0 : writableCustomFields.length) ? 'UpdateAdministratorCustomFieldsInput' : 'JSON'}
+        }
     `;
     return (0, graphql_1.extendSchema)(schema, (0, graphql_1.parse)(extension));
 }
@@ -261,14 +261,14 @@ function addRegisterCustomerCustomFieldsInput(typeDefsOrSchema, customerCustomFi
     if (publicWritableCustomFields.length < 1) {
         return schema;
     }
-    const customFieldTypeDefs = `
-        input RegisterCustomerCustomFieldsInput {
-            ${mapToFields(publicWritableCustomFields, wrapListType(getGraphQlInputType), shared_utils_1.getGraphQlInputName)}
-        }
-
-        extend input RegisterCustomerInput {
-            customFields: RegisterCustomerCustomFieldsInput
-        }
+    const customFieldTypeDefs = `
+        input RegisterCustomerCustomFieldsInput {
+            ${mapToFields(publicWritableCustomFields, wrapListType(getGraphQlInputType), shared_utils_1.getGraphQlInputName)}
+        }
+
+        extend input RegisterCustomerInput {
+            customFields: RegisterCustomerCustomFieldsInput
+        }
     `;
     return (0, graphql_1.extendSchema)(schema, (0, graphql_1.parse)(customFieldTypeDefs));
 }
@@ -283,10 +283,10 @@ function addModifyOrderCustomFields(typeDefsOrSchema, orderCustomFields) {
         return schema;
     }
     if (schema.getType('ModifyOrderInput') && schema.getType('UpdateOrderCustomFieldsInput')) {
-        const customFieldTypeDefs = `
-                extend input ModifyOrderInput {
-                    customFields: UpdateOrderCustomFieldsInput
-                }
+        const customFieldTypeDefs = `
+                extend input ModifyOrderInput {
+                    customFields: UpdateOrderCustomFieldsInput
+                }
             `;
         return (0, graphql_1.extendSchema)(schema, (0, graphql_1.parse)(customFieldTypeDefs));
     }
@@ -352,34 +352,34 @@ function addOrderLineCustomFieldsInput(typeDefsOrSchema, orderLineCustomFields)
     }
     let extendedSchema = new graphql_1.GraphQLSchema(schemaConfig);
     if (schema.getType('AddItemInput')) {
-        const customFieldTypeDefs = `
-            extend input AddItemInput {
-                customFields: OrderLineCustomFieldsInput
-            }
+        const customFieldTypeDefs = `
+            extend input AddItemInput {
+                customFields: OrderLineCustomFieldsInput
+            }
         `;
         extendedSchema = (0, graphql_1.extendSchema)(extendedSchema, (0, graphql_1.parse)(customFieldTypeDefs));
     }
     if (schema.getType('OrderLineInput')) {
-        const customFieldTypeDefs = `
-            extend input OrderLineInput {
-                customFields: OrderLineCustomFieldsInput
-            }
+        const customFieldTypeDefs = `
+            extend input OrderLineInput {
+                customFields: OrderLineCustomFieldsInput
+            }
         `;
         extendedSchema = (0, graphql_1.extendSchema)(extendedSchema, (0, graphql_1.parse)(customFieldTypeDefs));
     }
     if (schema.getType('AddItemToDraftOrderInput')) {
-        const customFieldTypeDefs = `
-            extend input AddItemToDraftOrderInput {
-                customFields: OrderLineCustomFieldsInput
-            }
+        const customFieldTypeDefs = `
+            extend input AddItemToDraftOrderInput {
+                customFields: OrderLineCustomFieldsInput
+            }
         `;
         extendedSchema = (0, graphql_1.extendSchema)(extendedSchema, (0, graphql_1.parse)(customFieldTypeDefs));
     }
     if (schema.getType('AdjustDraftOrderLineInput')) {
-        const customFieldTypeDefs = `
-            extend input AdjustDraftOrderLineInput {
-                customFields: OrderLineCustomFieldsInput
-            }
+        const customFieldTypeDefs = `
+            extend input AdjustDraftOrderLineInput {
+                customFields: OrderLineCustomFieldsInput
+            }
         `;
         extendedSchema = (0, graphql_1.extendSchema)(extendedSchema, (0, graphql_1.parse)(customFieldTypeDefs));
     }
@@ -391,17 +391,17 @@ function addShippingMethodQuoteCustomFields(typeDefsOrSchema, shippingMethodCust
     let customFieldTypeDefs = '';
     const publicCustomFields = shippingMethodCustomFields.filter(f => f.public !== false);
     if (0 < publicCustomFields.length) {
-        customFieldTypeDefs = `
-            extend type ShippingMethodQuote {
-                customFields: ShippingMethodCustomFields
-            }
+        customFieldTypeDefs = `
+            extend type ShippingMethodQuote {
+                customFields: ShippingMethodCustomFields
+            }
         `;
     }
     else {
-        customFieldTypeDefs = `
-            extend type ShippingMethodQuote {
-                customFields: JSON
-            }
+        customFieldTypeDefs = `
+            extend type ShippingMethodQuote {
+                customFields: JSON
+            }
         `;
     }
     return (0, graphql_1.extendSchema)(schema, (0, graphql_1.parse)(customFieldTypeDefs));
@@ -412,17 +412,17 @@ function addPaymentMethodQuoteCustomFields(typeDefsOrSchema, paymentMethodCustom
     let customFieldTypeDefs = '';
     const publicCustomFields = paymentMethodCustomFields.filter(f => f.public !== false);
     if (0 < publicCustomFields.length) {
-        customFieldTypeDefs = `
-            extend type PaymentMethodQuote {
-                customFields: PaymentMethodCustomFields
-            }
+        customFieldTypeDefs = `
+            extend type PaymentMethodQuote {
+                customFields: PaymentMethodCustomFields
+            }
         `;
     }
     else {
-        customFieldTypeDefs = `
-            extend type PaymentMethodQuote {
-                customFields: JSON
-            }
+        customFieldTypeDefs = `
+            extend type PaymentMethodQuote {
+                customFields: JSON
+            }
         `;
     }
     return (0, graphql_1.extendSchema)(schema, (0, graphql_1.parse)(customFieldTypeDefs));

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

@@ -27,7 +27,7 @@ export declare class OrderResolver {
     setOrderCustomFields(ctx: RequestContext, args: MutationSetOrderCustomFieldsArgs): Promise<Order>;
     setOrderCustomer(ctx: RequestContext, { input }: MutationSetOrderCustomerArgs): Promise<Order>;
     transitionOrderToState(ctx: RequestContext, args: MutationTransitionOrderToStateArgs): Promise<Order | import("../../../common/error/generated-graphql-shop-errors").OrderStateTransitionError>;
-    transitionFulfillmentToState(ctx: RequestContext, args: MutationTransitionFulfillmentToStateArgs): Promise<import("../../..").FulfillmentStateTransitionError | Fulfillment>;
+    transitionFulfillmentToState(ctx: RequestContext, args: MutationTransitionFulfillmentToStateArgs): Promise<Fulfillment | import("../../..").FulfillmentStateTransitionError>;
     transitionPaymentToState(ctx: RequestContext, args: MutationTransitionPaymentToStateArgs): Promise<ErrorResultUnion<TransitionPaymentToStateResult, Payment>>;
     modifyOrder(ctx: RequestContext, args: MutationModifyOrderArgs): Promise<ErrorResultUnion<import("@vendure/common/lib/generated-types").ModifyOrderResult, Order>>;
     addManualPaymentToOrder(ctx: RequestContext, args: MutationAddManualPaymentToOrderArgs): Promise<ErrorResultUnion<import("@vendure/common/lib/generated-types").AddManualPaymentToOrderResult, Order>>;

package/dist/api/resolvers/entity/order-entity.resolver.d.ts

@@ -16,6 +16,7 @@ export declare class OrderEntityResolver {
     surcharges(ctx: RequestContext, order: Order): Promise<import("../../..").Surcharge[]>;
     customer(ctx: RequestContext, order: Order): Promise<import("../../..").Customer | undefined>;
     lines(ctx: RequestContext, order: Order): Promise<import("../../..").OrderLine[]>;
+    shippingLines(ctx: RequestContext, order: Order): Promise<import("../../..").ShippingLine[]>;
     history(ctx: RequestContext, apiType: ApiType, order: Order, args: OrderHistoryArgs): Promise<import("@vendure/common/lib/shared-types").PaginatedList<import("../../../entity/history-entry/order-history-entry.entity").OrderHistoryEntry>>;
     promotions(ctx: RequestContext, order: Order): Promise<import("../../..").Promotion[]>;
 }

package/dist/api/resolvers/entity/order-entity.resolver.js

@@ -63,6 +63,13 @@ let OrderEntityResolver = class OrderEntityResolver {
         const { lines } = await (0, utils_1.assertFound)(this.orderService.findOne(ctx, order.id));
         return lines;
     }
+    async shippingLines(ctx, order) {
+        if (order.shippingLines) {
+            return order.shippingLines;
+        }
+        const { shippingLines } = await (0, utils_1.assertFound)(this.orderService.findOne(ctx, order.id, ['shippingLines.shippingMethod']));
+        return shippingLines;
+    }
     async history(ctx, apiType, order, args) {
         const publicOnly = apiType === 'shop';
         const options = Object.assign({}, args.options);
@@ -123,6 +130,14 @@ __decorate([
     __metadata("design:paramtypes", [request_context_1.RequestContext, order_entity_1.Order]),
     __metadata("design:returntype", Promise)
 ], OrderEntityResolver.prototype, "lines", null);
+__decorate([
+    (0, graphql_1.ResolveField)(),
+    __param(0, (0, request_context_decorator_1.Ctx)()),
+    __param(1, (0, graphql_1.Parent)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [request_context_1.RequestContext, order_entity_1.Order]),
+    __metadata("design:returntype", Promise)
+], OrderEntityResolver.prototype, "shippingLines", null);
 __decorate([
     (0, graphql_1.ResolveField)(),
     __param(0, (0, request_context_decorator_1.Ctx)()),

package/dist/api/resolvers/entity/order-entity.resolver.js.map

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

package/dist/config/entity/entity-duplicators/index.d.ts

@@ -1,5 +1,5 @@
-export declare const defaultEntityDuplicators: (import("../entity-duplicator").EntityDuplicator<{}> | import("../entity-duplicator").EntityDuplicator<{
-    includeFacetValues: {
+export declare const defaultEntityDuplicators: (import("../entity-duplicator").EntityDuplicator<{
+    includeVariants: {
         type: "boolean";
         defaultValue: true;
         label: {
@@ -7,8 +7,8 @@ export declare const defaultEntityDuplicators: (import("../entity-duplicator").E
             value: string;
         }[];
     };
-}> | import("../entity-duplicator").EntityDuplicator<{
-    includeVariants: {
+}> | import("../entity-duplicator").EntityDuplicator<{}> | import("../entity-duplicator").EntityDuplicator<{
+    includeFacetValues: {
         type: "boolean";
         defaultValue: true;
         label: {

package/dist/config/fulfillment/default-fulfillment-process.js

@@ -79,7 +79,6 @@ exports.defaultFulfillmentProcess = {
                 quantity: l.quantity,
             }));
             await stockMovementService.createCancellationsForOrderLines(ctx, orderLineInput);
-            // const lines = await groupOrderItemsIntoLines(ctx, orderLineInput);
             await stockMovementService.createAllocationsForOrderLines(ctx, orderLineInput);
         }
         if (fromState === 'Created' && toState === 'Pending') {

package/dist/config/fulfillment/default-fulfillment-process.js.map

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