chore: Fix merge errors

packages/admin-ui/src/lib/core/src/common/introspection-result.ts

@@ -8,29 +8,29 @@ export interface PossibleTypesResultData {
 const result: PossibleTypesResultData = {
     possibleTypes: {
         AddFulfillmentToOrderResult: [
-            'Fulfillment',
+            'CreateFulfillmentError',
             'EmptyOrderLineSelectionError',
-            'ItemsAlreadyFulfilledError',
+            'Fulfillment',
+            'FulfillmentStateTransitionError',
             'InsufficientStockOnHandError',
             'InvalidFulfillmentHandlerError',
-            'FulfillmentStateTransitionError',
-            'CreateFulfillmentError',
+            'ItemsAlreadyFulfilledError',
         ],
-        AddManualPaymentToOrderResult: ['Order', 'ManualPaymentStateError'],
+        AddManualPaymentToOrderResult: ['ManualPaymentStateError', 'Order'],
         AuthenticationResult: ['CurrentUser', 'InvalidCredentialsError'],
         CancelOrderResult: [
-            'Order',
+            'CancelActiveOrderError',
             'EmptyOrderLineSelectionError',
-            'QuantityTooGreatError',
             'MultipleOrderError',
-            'CancelActiveOrderError',
+            'Order',
             'OrderStateTransitionError',
+            'QuantityTooGreatError',
         ],
-        CancelPaymentResult: ['Payment', 'CancelPaymentError', 'PaymentStateTransitionError'],
+        CancelPaymentResult: ['CancelPaymentError', 'Payment', 'PaymentStateTransitionError'],
         CreateAssetResult: ['Asset', 'MimeTypeError'],
         CreateChannelResult: ['Channel', 'LanguageNotAvailableError'],
         CreateCustomerResult: ['Customer', 'EmailAddressConflictError'],
-        CreatePromotionResult: ['Promotion', 'MissingConditionsError'],
+        CreatePromotionResult: ['MissingConditionsError', 'Promotion'],
         CustomField: [
             'BooleanCustomFieldConfig',
             'DateTimeCustomFieldConfig',
@@ -42,13 +42,13 @@ const result: PossibleTypesResultData = {
             'TextCustomFieldConfig',
         ],
         CustomFieldConfig: [
-            'StringCustomFieldConfig',
-            'LocaleStringCustomFieldConfig',
-            'IntCustomFieldConfig',
-            'FloatCustomFieldConfig',
             'BooleanCustomFieldConfig',
             'DateTimeCustomFieldConfig',
+            'FloatCustomFieldConfig',
+            'IntCustomFieldConfig',
+            'LocaleStringCustomFieldConfig',
             'RelationCustomFieldConfig',
+            'StringCustomFieldConfig',
             'TextCustomFieldConfig',
         ],
         ErrorResult: [
@@ -91,17 +91,17 @@ const result: PossibleTypesResultData = {
             'SettlePaymentError',
         ],
         ModifyOrderResult: [
-            'Order',
+            'CouponCodeExpiredError',
+            'CouponCodeInvalidError',
+            'CouponCodeLimitError',
+            'InsufficientStockError',
+            'NegativeQuantityError',
             'NoChangesSpecifiedError',
+            'Order',
+            'OrderLimitError',
             'OrderModificationStateError',
             'PaymentMethodMissingError',
             'RefundPaymentIdMissingError',
-            'OrderLimitError',
-            'NegativeQuantityError',
-            'InsufficientStockError',
-            'CouponCodeExpiredError',
-            'CouponCodeInvalidError',
-            'CouponCodeLimitError',
         ],
         NativeAuthenticationResult: ['CurrentUser', 'InvalidCredentialsError', 'NativeAuthStrategyError'],
         Node: [
@@ -167,34 +167,34 @@ const result: PossibleTypesResultData = {
             'TaxRateList',
         ],
         RefundOrderResult: [
-            'Refund',
-            'QuantityTooGreatError',
+            'AlreadyRefundedError',
+            'MultipleOrderError',
             'NothingToRefundError',
             'OrderStateTransitionError',
-            'MultipleOrderError',
             'PaymentOrderMismatchError',
+            'QuantityTooGreatError',
+            'Refund',
             'RefundOrderStateError',
-            'AlreadyRefundedError',
             'RefundStateTransitionError',
         ],
         RemoveOptionGroupFromProductResult: ['Product', 'ProductOptionInUseError'],
         SearchResultPrice: ['PriceRange', 'SinglePrice'],
         SettlePaymentResult: [
+            'OrderStateTransitionError',
             'Payment',
-            'SettlePaymentError',
             'PaymentStateTransitionError',
-            'OrderStateTransitionError',
+            'SettlePaymentError',
         ],
         SettleRefundResult: ['Refund', 'RefundStateTransitionError'],
         StockMovement: ['Allocation', 'Cancellation', 'Release', 'Return', 'Sale', 'StockAdjustment'],
-        StockMovementItem: ['StockAdjustment', 'Allocation', 'Sale', 'Cancellation', 'Return', 'Release'],
+        StockMovementItem: ['Allocation', 'Cancellation', 'Release', 'Return', 'Sale', 'StockAdjustment'],
         TransitionFulfillmentToStateResult: ['Fulfillment', 'FulfillmentStateTransitionError'],
         TransitionOrderToStateResult: ['Order', 'OrderStateTransitionError'],
         TransitionPaymentToStateResult: ['Payment', 'PaymentStateTransitionError'],
         UpdateChannelResult: ['Channel', 'LanguageNotAvailableError'],
         UpdateCustomerResult: ['Customer', 'EmailAddressConflictError'],
-        UpdateGlobalSettingsResult: ['GlobalSettings', 'ChannelDefaultLanguageError'],
-        UpdatePromotionResult: ['Promotion', 'MissingConditionsError'],
+        UpdateGlobalSettingsResult: ['ChannelDefaultLanguageError', 'GlobalSettings'],
+        UpdatePromotionResult: ['MissingConditionsError', 'Promotion'],
     },
 };
 export default result;

packages/admin-ui/src/lib/core/src/data/providers/product-data.service.ts

@@ -280,7 +280,7 @@ export class ProductDataService {
         >(DELETE_PRODUCT_OPTION, { id });
     }
 
-    removeOptionGroupFromProduct(variables: RemoveOptionGroupFromProduct.Variables) {
+    removeOptionGroupFromProduct(variables: Codegen.RemoveOptionGroupFromProductMutationVariables) {
         return this.baseDataService.mutate<
             Codegen.RemoveOptionGroupFromProductMutation,
             Codegen.RemoveOptionGroupFromProductMutationVariables

packages/core/e2e/collection.e2e-spec.ts

@@ -15,14 +15,15 @@ import { pick } from '../../common/lib/pick';
 import { productIdCollectionFilter, variantIdCollectionFilter } from '../src/index';
 
 import { COLLECTION_FRAGMENT, FACET_VALUE_FRAGMENT } from './graphql/fragments';
+import * as Codegen from './graphql/generated-e2e-admin-types';
 import {
     CollectionFragment,
+    CurrencyCode,
     DeletionResult,
     FacetValueFragment,
     LanguageCode,
     SortOrder,
 } from './graphql/generated-e2e-admin-types';
-import * as Codegen from './graphql/generated-e2e-admin-types';
 import {
     CREATE_CHANNEL,
     CREATE_COLLECTION,
@@ -1119,10 +1120,6 @@ describe('Collection resolver', () => {
                 { id: 'T_3', name: 'Electronics' },
                 { id: 'T_4', name: 'Computers' },
                 { id: 'T_5', name: 'Pear' },
-                {
-                    id: 'T_8',
-                    name: 'Computers Breadcrumbs',
-                },
                 {
                     id: 'T_9',
                     name: 'Computers Breadcrumbs',

packages/core/e2e/payment-process.e2e-spec.ts

@@ -23,7 +23,11 @@ import { ORDER_WITH_LINES_FRAGMENT } from './graphql/fragments';
 import * as Codegen from './graphql/generated-e2e-admin-types';
 import { ErrorCode } from './graphql/generated-e2e-admin-types';
 import * as CodegenShop from './graphql/generated-e2e-shop-types';
-import { ADMIN_TRANSITION_TO_STATE, GET_ORDER } from './graphql/shared-definitions';
+import {
+    ADMIN_TRANSITION_TO_STATE,
+    GET_ORDER,
+    TRANSITION_PAYMENT_TO_STATE,
+} from './graphql/shared-definitions';
 import { ADD_ITEM_TO_ORDER, ADD_PAYMENT, GET_ACTIVE_ORDER } from './graphql/shop-definitions';
 import { proceedToArrangingPayment } from './utils/test-order-utils';
 

packages/core/e2e/product-option.e2e-spec.ts

@@ -8,8 +8,14 @@ import { omit } from '../../common/lib/omit';
 
 import { PRODUCT_OPTION_GROUP_FRAGMENT } from './graphql/fragments';
 import * as Codegen from './graphql/generated-e2e-admin-types';
-import { LanguageCode } from './graphql/generated-e2e-admin-types';
-import { CREATE_PRODUCT_OPTION_GROUP } from './graphql/shared-definitions';
+import { DeletionResult, LanguageCode } from './graphql/generated-e2e-admin-types';
+import {
+    ADD_OPTION_GROUP_TO_PRODUCT,
+    CREATE_PRODUCT,
+    CREATE_PRODUCT_OPTION_GROUP,
+    CREATE_PRODUCT_VARIANTS,
+    DELETE_PRODUCT_VARIANT,
+} from './graphql/shared-definitions';
 import { assertThrowsWithMessage } from './utils/assert-throws-with-message';
 
 // tslint:disable:no-non-null-assertion
@@ -168,21 +174,21 @@ describe('ProductOption resolver', () => {
             });
 
             const result = await adminClient.query<
-                AddOptionGroupToProductMutation,
-                AddOptionGroupToProductMutationVariables
+                Codegen.AddOptionGroupToProductMutation,
+                Codegen.AddOptionGroupToProductMutationVariables
             >(ADD_OPTION_GROUP_TO_PRODUCT, {
                 optionGroupId: sizeGroup.id,
                 productId: createProduct.id,
             });
 
             const { productOptionGroup } = await adminClient.query<
-                GetProductOptionGroupQuery,
-                GetProductOptionGroupQueryVariables
+                Codegen.GetProductOptionGroupQuery,
+                Codegen.GetProductOptionGroupQueryVariables
             >(GET_PRODUCT_OPTION_GROUP, {
                 id: sizeGroup.id,
             });
 
-            const variantInput: CreateProductVariantsMutationVariables['input'] =
+            const variantInput: Codegen.CreateProductVariantsMutationVariables['input'] =
                 productOptionGroup!.options.map((option, i) => ({
                     productId: createProduct.id,
                     sku: `TS-${option.code}`,
@@ -191,8 +197,8 @@ describe('ProductOption resolver', () => {
                 }));
 
             const { createProductVariants } = await adminClient.query<
-                CreateProductVariantsMutation,
-                CreateProductVariantsMutationVariables
+                Codegen.CreateProductVariantsMutation,
+                Codegen.CreateProductVariantsMutationVariables
             >(CREATE_PRODUCT_VARIANTS, {
                 input: variantInput,
             });
@@ -204,20 +210,20 @@ describe('ProductOption resolver', () => {
             'attempting to delete a non-existent id throws',
             assertThrowsWithMessage(
                 () =>
-                    adminClient.query<DeleteProductOptionMutation, DeleteProductOptionMutationVariables>(
-                        DELETE_PRODUCT_OPTION,
-                        {
-                            id: '999999',
-                        },
-                    ),
+                    adminClient.query<
+                        Codegen.DeleteProductOptionMutation,
+                        Codegen.DeleteProductOptionMutationVariables
+                    >(DELETE_PRODUCT_OPTION, {
+                        id: '999999',
+                    }),
                 "No ProductOption with the id '999999' could be found",
             ),
         );
 
         it('cannot delete ProductOption that is used by a ProductVariant', async () => {
             const { deleteProductOption } = await adminClient.query<
-                DeleteProductOptionMutation,
-                DeleteProductOptionMutationVariables
+                Codegen.DeleteProductOptionMutation,
+                Codegen.DeleteProductOptionMutationVariables
             >(DELETE_PRODUCT_OPTION, {
                 id: sizeOptionGroupWithOptions.options.find(o => o.code === 'medium')!.id,
             });
@@ -230,8 +236,8 @@ describe('ProductOption resolver', () => {
 
         it('can delete ProductOption after deleting associated ProductVariant', async () => {
             const { deleteProductVariant } = await adminClient.query<
-                DeleteProductVariantMutation,
-                DeleteProductVariantMutationVariables
+                Codegen.DeleteProductVariantMutation,
+                Codegen.DeleteProductVariantMutationVariables
             >(DELETE_PRODUCT_VARIANT, {
                 id: variants.find(v => v!.name.includes('medium'))!.id,
             });
@@ -239,8 +245,8 @@ describe('ProductOption resolver', () => {
             expect(deleteProductVariant.result).toBe(DeletionResult.DELETED);
 
             const { deleteProductOption } = await adminClient.query<
-                DeleteProductOptionMutation,
-                DeleteProductOptionMutationVariables
+                Codegen.DeleteProductOptionMutation,
+                Codegen.DeleteProductOptionMutationVariables
             >(DELETE_PRODUCT_OPTION, {
                 id: sizeOptionGroupWithOptions.options.find(o => o.code === 'medium')!.id,
             });
@@ -250,8 +256,8 @@ describe('ProductOption resolver', () => {
 
         it('deleted ProductOptions not included in query result', async () => {
             const { productOptionGroup } = await adminClient.query<
-                GetProductOptionGroupQuery,
-                GetProductOptionGroupQueryVariables
+                Codegen.GetProductOptionGroupQuery,
+                Codegen.GetProductOptionGroupQueryVariables
             >(GET_PRODUCT_OPTION_GROUP, {
                 id: sizeGroup.id,
             });

packages/core/e2e/product.e2e-spec.ts

@@ -1217,8 +1217,8 @@ describe('Product resolver', () => {
 
             // not really testing this, but just cleaning up for later tests
             const { removeOptionGroupFromProduct } = await adminClient.query<
-                RemoveOptionGroupFromProduct.Mutation,
-                RemoveOptionGroupFromProduct.Variables
+                Codegen.RemoveOptionGroupFromProductMutation,
+                Codegen.RemoveOptionGroupFromProductMutationVariables
             >(REMOVE_OPTION_GROUP_FROM_PRODUCT, {
                 optionGroupId: optionGroup.id,
                 productId: newProduct.id,
@@ -1409,7 +1409,7 @@ describe('Product resolver', () => {
                             },
                         ],
                     });
-                }, 'ProductVariant optionIds must include one optionId from each of the groups: curvy-monitor-monitor-size, laptop-ram'),
+                }, 'ProductVariant optionIds must include one optionId from each of the groups: group-2, group-3'),
             );
 
             it(
@@ -1428,7 +1428,7 @@ describe('Product resolver', () => {
                             },
                         ],
                     });
-                }, 'ProductVariant optionIds must include one optionId from each of the groups: curvy-monitor-monitor-size, laptop-ram'),
+                }, 'ProductVariant optionIds must include one optionId from each of the groups: group-2, group-3'),
             );
 
             it('createProductVariants works', async () => {

packages/core/src/common/error/generated-graphql-admin-errors.ts

@@ -15,17 +15,19 @@ export type Scalars = {
 export class ErrorResult {
   readonly __typename: string;
   readonly errorCode: string;
-message: Scalars['String'];
+  readonly message: Scalars['String'];
 }
 
 export class AlreadyRefundedError extends ErrorResult {
   readonly __typename = 'AlreadyRefundedError';
   readonly errorCode = 'ALREADY_REFUNDED_ERROR' as any;
   readonly message = 'ALREADY_REFUNDED_ERROR';
+  readonly refundId: Scalars['ID'];
   constructor(
-    public refundId: Scalars['ID'],
+    input: { refundId: Scalars['ID'] }
   ) {
     super();
+    this.refundId = input.refundId
   }
 }
 
@@ -33,10 +35,12 @@ export class CancelActiveOrderError extends ErrorResult {
   readonly __typename = 'CancelActiveOrderError';
   readonly errorCode = 'CANCEL_ACTIVE_ORDER_ERROR' as any;
   readonly message = 'CANCEL_ACTIVE_ORDER_ERROR';
+  readonly orderState: Scalars['String'];
   constructor(
-    public orderState: Scalars['String'],
+    input: { orderState: Scalars['String'] }
   ) {
     super();
+    this.orderState = input.orderState
   }
 }
 
@@ -44,10 +48,12 @@ export class CancelPaymentError extends ErrorResult {
   readonly __typename = 'CancelPaymentError';
   readonly errorCode = 'CANCEL_PAYMENT_ERROR' as any;
   readonly message = 'CANCEL_PAYMENT_ERROR';
+  readonly paymentErrorMessage: Scalars['String'];
   constructor(
-    public paymentErrorMessage: Scalars['String'],
+    input: { paymentErrorMessage: Scalars['String'] }
   ) {
     super();
+    this.paymentErrorMessage = input.paymentErrorMessage
   }
 }
 
@@ -55,11 +61,14 @@ export class ChannelDefaultLanguageError extends ErrorResult {
   readonly __typename = 'ChannelDefaultLanguageError';
   readonly errorCode = 'CHANNEL_DEFAULT_LANGUAGE_ERROR' as any;
   readonly message = 'CHANNEL_DEFAULT_LANGUAGE_ERROR';
+  readonly channelCode: Scalars['String'];
+  readonly language: Scalars['String'];
   constructor(
-    public language: Scalars['String'],
-    public channelCode: Scalars['String'],
+    input: { channelCode: Scalars['String'], language: Scalars['String'] }
   ) {
     super();
+    this.channelCode = input.channelCode
+    this.language = input.language
   }
 }
 
@@ -67,10 +76,12 @@ export class CouponCodeExpiredError extends ErrorResult {
   readonly __typename = 'CouponCodeExpiredError';
   readonly errorCode = 'COUPON_CODE_EXPIRED_ERROR' as any;
   readonly message = 'COUPON_CODE_EXPIRED_ERROR';
+  readonly couponCode: Scalars['String'];
   constructor(
-    public couponCode: Scalars['String'],
+    input: { couponCode: Scalars['String'] }
   ) {
     super();
+    this.couponCode = input.couponCode
   }
 }
 
@@ -78,10 +89,12 @@ export class CouponCodeInvalidError extends ErrorResult {
   readonly __typename = 'CouponCodeInvalidError';
   readonly errorCode = 'COUPON_CODE_INVALID_ERROR' as any;
   readonly message = 'COUPON_CODE_INVALID_ERROR';
+  readonly couponCode: Scalars['String'];
   constructor(
-    public couponCode: Scalars['String'],
+    input: { couponCode: Scalars['String'] }
   ) {
     super();
+    this.couponCode = input.couponCode
   }
 }
 
@@ -89,11 +102,14 @@ export class CouponCodeLimitError extends ErrorResult {
   readonly __typename = 'CouponCodeLimitError';
   readonly errorCode = 'COUPON_CODE_LIMIT_ERROR' as any;
   readonly message = 'COUPON_CODE_LIMIT_ERROR';
+  readonly couponCode: Scalars['String'];
+  readonly limit: Scalars['Int'];
   constructor(
-    public couponCode: Scalars['String'],
-    public limit: Scalars['Int'],
+    input: { couponCode: Scalars['String'], limit: Scalars['Int'] }
   ) {
     super();
+    this.couponCode = input.couponCode
+    this.limit = input.limit
   }
 }
 
@@ -101,10 +117,12 @@ export class CreateFulfillmentError extends ErrorResult {
   readonly __typename = 'CreateFulfillmentError';
   readonly errorCode = 'CREATE_FULFILLMENT_ERROR' as any;
   readonly message = 'CREATE_FULFILLMENT_ERROR';
+  readonly fulfillmentHandlerError: Scalars['String'];
   constructor(
-    public fulfillmentHandlerError: Scalars['String'],
+    input: { fulfillmentHandlerError: Scalars['String'] }
   ) {
     super();
+    this.fulfillmentHandlerError = input.fulfillmentHandlerError
   }
 }
 
@@ -113,6 +131,7 @@ export class EmailAddressConflictError extends ErrorResult {
   readonly errorCode = 'EMAIL_ADDRESS_CONFLICT_ERROR' as any;
   readonly message = 'EMAIL_ADDRESS_CONFLICT_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -123,6 +142,7 @@ export class EmptyOrderLineSelectionError extends ErrorResult {
   readonly errorCode = 'EMPTY_ORDER_LINE_SELECTION_ERROR' as any;
   readonly message = 'EMPTY_ORDER_LINE_SELECTION_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -132,12 +152,16 @@ export class FulfillmentStateTransitionError extends ErrorResult {
   readonly __typename = 'FulfillmentStateTransitionError';
   readonly errorCode = 'FULFILLMENT_STATE_TRANSITION_ERROR' as any;
   readonly message = 'FULFILLMENT_STATE_TRANSITION_ERROR';
+  readonly fromState: Scalars['String'];
+  readonly toState: Scalars['String'];
+  readonly transitionError: Scalars['String'];
   constructor(
-    public transitionError: Scalars['String'],
-    public fromState: Scalars['String'],
-    public toState: Scalars['String'],
+    input: { fromState: Scalars['String'], toState: Scalars['String'], transitionError: Scalars['String'] }
   ) {
     super();
+    this.fromState = input.fromState
+    this.toState = input.toState
+    this.transitionError = input.transitionError
   }
 }
 
@@ -145,11 +169,14 @@ export class InsufficientStockError extends ErrorResult {
   readonly __typename = 'InsufficientStockError';
   readonly errorCode = 'INSUFFICIENT_STOCK_ERROR' as any;
   readonly message = 'INSUFFICIENT_STOCK_ERROR';
+  readonly order: any;
+  readonly quantityAvailable: Scalars['Int'];
   constructor(
-    public quantityAvailable: Scalars['Int'],
-    public order: any,
+    input: { order: any, quantityAvailable: Scalars['Int'] }
   ) {
     super();
+    this.order = input.order
+    this.quantityAvailable = input.quantityAvailable
   }
 }
 
@@ -157,12 +184,16 @@ export class InsufficientStockOnHandError extends ErrorResult {
   readonly __typename = 'InsufficientStockOnHandError';
   readonly errorCode = 'INSUFFICIENT_STOCK_ON_HAND_ERROR' as any;
   readonly message = 'INSUFFICIENT_STOCK_ON_HAND_ERROR';
+  readonly productVariantId: Scalars['ID'];
+  readonly productVariantName: Scalars['String'];
+  readonly stockOnHand: Scalars['Int'];
   constructor(
-    public productVariantId: Scalars['ID'],
-    public productVariantName: Scalars['String'],
-    public stockOnHand: Scalars['Int'],
+    input: { productVariantId: Scalars['ID'], productVariantName: Scalars['String'], stockOnHand: Scalars['Int'] }
   ) {
     super();
+    this.productVariantId = input.productVariantId
+    this.productVariantName = input.productVariantName
+    this.stockOnHand = input.stockOnHand
   }
 }
 
@@ -170,10 +201,12 @@ export class InvalidCredentialsError extends ErrorResult {
   readonly __typename = 'InvalidCredentialsError';
   readonly errorCode = 'INVALID_CREDENTIALS_ERROR' as any;
   readonly message = 'INVALID_CREDENTIALS_ERROR';
+  readonly authenticationError: Scalars['String'];
   constructor(
-    public authenticationError: Scalars['String'],
+    input: { authenticationError: Scalars['String'] }
   ) {
     super();
+    this.authenticationError = input.authenticationError
   }
 }
 
@@ -182,6 +215,7 @@ export class InvalidFulfillmentHandlerError extends ErrorResult {
   readonly errorCode = 'INVALID_FULFILLMENT_HANDLER_ERROR' as any;
   readonly message = 'INVALID_FULFILLMENT_HANDLER_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -192,6 +226,7 @@ export class ItemsAlreadyFulfilledError extends ErrorResult {
   readonly errorCode = 'ITEMS_ALREADY_FULFILLED_ERROR' as any;
   readonly message = 'ITEMS_ALREADY_FULFILLED_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -201,10 +236,12 @@ export class LanguageNotAvailableError extends ErrorResult {
   readonly __typename = 'LanguageNotAvailableError';
   readonly errorCode = 'LANGUAGE_NOT_AVAILABLE_ERROR' as any;
   readonly message = 'LANGUAGE_NOT_AVAILABLE_ERROR';
+  readonly languageCode: Scalars['String'];
   constructor(
-    public languageCode: Scalars['String'],
+    input: { languageCode: Scalars['String'] }
   ) {
     super();
+    this.languageCode = input.languageCode
   }
 }
 
@@ -213,6 +250,7 @@ export class ManualPaymentStateError extends ErrorResult {
   readonly errorCode = 'MANUAL_PAYMENT_STATE_ERROR' as any;
   readonly message = 'MANUAL_PAYMENT_STATE_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -222,11 +260,14 @@ export class MimeTypeError extends ErrorResult {
   readonly __typename = 'MimeTypeError';
   readonly errorCode = 'MIME_TYPE_ERROR' as any;
   readonly message = 'MIME_TYPE_ERROR';
+  readonly fileName: Scalars['String'];
+  readonly mimeType: Scalars['String'];
   constructor(
-    public fileName: Scalars['String'],
-    public mimeType: Scalars['String'],
+    input: { fileName: Scalars['String'], mimeType: Scalars['String'] }
   ) {
     super();
+    this.fileName = input.fileName
+    this.mimeType = input.mimeType
   }
 }
 
@@ -235,6 +276,7 @@ export class MissingConditionsError extends ErrorResult {
   readonly errorCode = 'MISSING_CONDITIONS_ERROR' as any;
   readonly message = 'MISSING_CONDITIONS_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -245,6 +287,7 @@ export class MultipleOrderError extends ErrorResult {
   readonly errorCode = 'MULTIPLE_ORDER_ERROR' as any;
   readonly message = 'MULTIPLE_ORDER_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -255,6 +298,7 @@ export class NativeAuthStrategyError extends ErrorResult {
   readonly errorCode = 'NATIVE_AUTH_STRATEGY_ERROR' as any;
   readonly message = 'NATIVE_AUTH_STRATEGY_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -265,6 +309,7 @@ export class NegativeQuantityError extends ErrorResult {
   readonly errorCode = 'NEGATIVE_QUANTITY_ERROR' as any;
   readonly message = 'NEGATIVE_QUANTITY_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -275,6 +320,7 @@ export class NoChangesSpecifiedError extends ErrorResult {
   readonly errorCode = 'NO_CHANGES_SPECIFIED_ERROR' as any;
   readonly message = 'NO_CHANGES_SPECIFIED_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -285,6 +331,7 @@ export class NothingToRefundError extends ErrorResult {
   readonly errorCode = 'NOTHING_TO_REFUND_ERROR' as any;
   readonly message = 'NOTHING_TO_REFUND_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -294,10 +341,12 @@ export class OrderLimitError extends ErrorResult {
   readonly __typename = 'OrderLimitError';
   readonly errorCode = 'ORDER_LIMIT_ERROR' as any;
   readonly message = 'ORDER_LIMIT_ERROR';
+  readonly maxItems: Scalars['Int'];
   constructor(
-    public maxItems: Scalars['Int'],
+    input: { maxItems: Scalars['Int'] }
   ) {
     super();
+    this.maxItems = input.maxItems
   }
 }
 
@@ -306,6 +355,7 @@ export class OrderModificationStateError extends ErrorResult {
   readonly errorCode = 'ORDER_MODIFICATION_STATE_ERROR' as any;
   readonly message = 'ORDER_MODIFICATION_STATE_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -315,12 +365,16 @@ export class OrderStateTransitionError extends ErrorResult {
   readonly __typename = 'OrderStateTransitionError';
   readonly errorCode = 'ORDER_STATE_TRANSITION_ERROR' as any;
   readonly message = 'ORDER_STATE_TRANSITION_ERROR';
+  readonly fromState: Scalars['String'];
+  readonly toState: Scalars['String'];
+  readonly transitionError: Scalars['String'];
   constructor(
-    public transitionError: Scalars['String'],
-    public fromState: Scalars['String'],
-    public toState: Scalars['String'],
+    input: { fromState: Scalars['String'], toState: Scalars['String'], transitionError: Scalars['String'] }
   ) {
     super();
+    this.fromState = input.fromState
+    this.toState = input.toState
+    this.transitionError = input.transitionError
   }
 }
 
@@ -329,6 +383,7 @@ export class PaymentMethodMissingError extends ErrorResult {
   readonly errorCode = 'PAYMENT_METHOD_MISSING_ERROR' as any;
   readonly message = 'PAYMENT_METHOD_MISSING_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -339,6 +394,7 @@ export class PaymentOrderMismatchError extends ErrorResult {
   readonly errorCode = 'PAYMENT_ORDER_MISMATCH_ERROR' as any;
   readonly message = 'PAYMENT_ORDER_MISMATCH_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -348,12 +404,16 @@ export class PaymentStateTransitionError extends ErrorResult {
   readonly __typename = 'PaymentStateTransitionError';
   readonly errorCode = 'PAYMENT_STATE_TRANSITION_ERROR' as any;
   readonly message = 'PAYMENT_STATE_TRANSITION_ERROR';
+  readonly fromState: Scalars['String'];
+  readonly toState: Scalars['String'];
+  readonly transitionError: Scalars['String'];
   constructor(
-    public transitionError: Scalars['String'],
-    public fromState: Scalars['String'],
-    public toState: Scalars['String'],
+    input: { fromState: Scalars['String'], toState: Scalars['String'], transitionError: Scalars['String'] }
   ) {
     super();
+    this.fromState = input.fromState
+    this.toState = input.toState
+    this.transitionError = input.transitionError
   }
 }
 
@@ -361,11 +421,14 @@ export class ProductOptionInUseError extends ErrorResult {
   readonly __typename = 'ProductOptionInUseError';
   readonly errorCode = 'PRODUCT_OPTION_IN_USE_ERROR' as any;
   readonly message = 'PRODUCT_OPTION_IN_USE_ERROR';
+  readonly optionGroupCode: Scalars['String'];
+  readonly productVariantCount: Scalars['Int'];
   constructor(
-    public optionGroupCode: Scalars['String'],
-    public productVariantCount: Scalars['Int'],
+    input: { optionGroupCode: Scalars['String'], productVariantCount: Scalars['Int'] }
   ) {
     super();
+    this.optionGroupCode = input.optionGroupCode
+    this.productVariantCount = input.productVariantCount
   }
 }
 
@@ -374,6 +437,7 @@ export class QuantityTooGreatError extends ErrorResult {
   readonly errorCode = 'QUANTITY_TOO_GREAT_ERROR' as any;
   readonly message = 'QUANTITY_TOO_GREAT_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -383,10 +447,12 @@ export class RefundOrderStateError extends ErrorResult {
   readonly __typename = 'RefundOrderStateError';
   readonly errorCode = 'REFUND_ORDER_STATE_ERROR' as any;
   readonly message = 'REFUND_ORDER_STATE_ERROR';
+  readonly orderState: Scalars['String'];
   constructor(
-    public orderState: Scalars['String'],
+    input: { orderState: Scalars['String'] }
   ) {
     super();
+    this.orderState = input.orderState
   }
 }
 
@@ -395,6 +461,7 @@ export class RefundPaymentIdMissingError extends ErrorResult {
   readonly errorCode = 'REFUND_PAYMENT_ID_MISSING_ERROR' as any;
   readonly message = 'REFUND_PAYMENT_ID_MISSING_ERROR';
   constructor(
+
   ) {
     super();
   }
@@ -404,12 +471,16 @@ export class RefundStateTransitionError extends ErrorResult {
   readonly __typename = 'RefundStateTransitionError';
   readonly errorCode = 'REFUND_STATE_TRANSITION_ERROR' as any;
   readonly message = 'REFUND_STATE_TRANSITION_ERROR';
+  readonly fromState: Scalars['String'];
+  readonly toState: Scalars['String'];
+  readonly transitionError: Scalars['String'];
   constructor(
-    public transitionError: Scalars['String'],
-    public fromState: Scalars['String'],
-    public toState: Scalars['String'],
+    input: { fromState: Scalars['String'], toState: Scalars['String'], transitionError: Scalars['String'] }
   ) {
     super();
+    this.fromState = input.fromState
+    this.toState = input.toState
+    this.transitionError = input.transitionError
   }
 }
 
@@ -417,10 +488,12 @@ export class SettlePaymentError extends ErrorResult {
   readonly __typename = 'SettlePaymentError';
   readonly errorCode = 'SETTLE_PAYMENT_ERROR' as any;
   readonly message = 'SETTLE_PAYMENT_ERROR';
+  readonly paymentErrorMessage: Scalars['String'];
   constructor(
-    public paymentErrorMessage: Scalars['String'],
+    input: { paymentErrorMessage: Scalars['String'] }
   ) {
     super();
+    this.paymentErrorMessage = input.paymentErrorMessage
   }
 }
 
@@ -431,14 +504,14 @@ function isGraphQLError(input: any): input is import('@vendure/common/lib/genera
 }
 
 export const adminErrorOperationTypeResolvers = {
-  CreateAssetResult: {
+  AddFulfillmentToOrderResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Asset';
+      return isGraphQLError(value) ? (value as any).__typename : 'Fulfillment';
     },
   },
-  NativeAuthenticationResult: {
+  AddManualPaymentToOrderResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'CurrentUser';
+      return isGraphQLError(value) ? (value as any).__typename : 'Order';
     },
   },
   AuthenticationResult: {
@@ -446,47 +519,42 @@ export const adminErrorOperationTypeResolvers = {
       return isGraphQLError(value) ? (value as any).__typename : 'CurrentUser';
     },
   },
-  CreateChannelResult: {
-    __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Channel';
-    },
-  },
-  UpdateChannelResult: {
+  CancelOrderResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Channel';
+      return isGraphQLError(value) ? (value as any).__typename : 'Order';
     },
   },
-  CreateCustomerResult: {
+  CancelPaymentResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Customer';
+      return isGraphQLError(value) ? (value as any).__typename : 'Payment';
     },
   },
-  UpdateCustomerResult: {
+  CreateAssetResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Customer';
+      return isGraphQLError(value) ? (value as any).__typename : 'Asset';
     },
   },
-  UpdateGlobalSettingsResult: {
+  CreateChannelResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'GlobalSettings';
+      return isGraphQLError(value) ? (value as any).__typename : 'Channel';
     },
   },
-  SettlePaymentResult: {
+  CreateCustomerResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Payment';
+      return isGraphQLError(value) ? (value as any).__typename : 'Customer';
     },
   },
-  CancelPaymentResult: {
+  CreatePromotionResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Payment';
+      return isGraphQLError(value) ? (value as any).__typename : 'Promotion';
     },
   },
-  AddFulfillmentToOrderResult: {
+  NativeAuthenticationResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Fulfillment';
+      return isGraphQLError(value) ? (value as any).__typename : 'CurrentUser';
     },
   },
-  CancelOrderResult: {
+  ModifyOrderResult: {
     __resolveType(value: any) {
       return isGraphQLError(value) ? (value as any).__typename : 'Order';
     },
@@ -496,14 +564,19 @@ export const adminErrorOperationTypeResolvers = {
       return isGraphQLError(value) ? (value as any).__typename : 'Refund';
     },
   },
-  SettleRefundResult: {
+  RemoveOptionGroupFromProductResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Refund';
+      return isGraphQLError(value) ? (value as any).__typename : 'Product';
     },
   },
-  TransitionOrderToStateResult: {
+  SettlePaymentResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Order';
+      return isGraphQLError(value) ? (value as any).__typename : 'Payment';
+    },
+  },
+  SettleRefundResult: {
+    __resolveType(value: any) {
+      return isGraphQLError(value) ? (value as any).__typename : 'Refund';
     },
   },
   TransitionFulfillmentToStateResult: {
@@ -511,29 +584,29 @@ export const adminErrorOperationTypeResolvers = {
       return isGraphQLError(value) ? (value as any).__typename : 'Fulfillment';
     },
   },
-  TransitionPaymentToStateResult: {
+  TransitionOrderToStateResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Payment';
+      return isGraphQLError(value) ? (value as any).__typename : 'Order';
     },
   },
-  ModifyOrderResult: {
+  TransitionPaymentToStateResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Order';
+      return isGraphQLError(value) ? (value as any).__typename : 'Payment';
     },
   },
-  AddManualPaymentToOrderResult: {
+  UpdateChannelResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Order';
+      return isGraphQLError(value) ? (value as any).__typename : 'Channel';
     },
   },
-  RemoveOptionGroupFromProductResult: {
+  UpdateCustomerResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Product';
+      return isGraphQLError(value) ? (value as any).__typename : 'Customer';
     },
   },
-  CreatePromotionResult: {
+  UpdateGlobalSettingsResult: {
     __resolveType(value: any) {
-      return isGraphQLError(value) ? (value as any).__typename : 'Promotion';
+      return isGraphQLError(value) ? (value as any).__typename : 'GlobalSettings';
     },
   },
   UpdatePromotionResult: {

packages/core/src/service/services/order.service.ts

@@ -1153,7 +1153,7 @@ export class OrderService {
         const payment = await this.paymentService.cancelPayment(ctx, paymentId);
         if (!isGraphQlErrorResult(payment)) {
             if (payment.state !== 'Cancelled') {
-                return new CancelPaymentError(payment.errorMessage || '');
+                return new CancelPaymentError({ paymentErrorMessage: payment.errorMessage || '' });
             }
         }
         return payment;

packages/core/src/service/services/product-option-group.service.ts

@@ -176,7 +176,7 @@ export class ProductOptionGroupService {
 
             try {
                 await this.connection.getRepository(ctx, ProductOptionGroup).remove(optionGroup);
-            } catch (e) {
+            } catch (e: any) {
                 Logger.error(e.message, undefined, e.stack);
             }
         }

packages/create/src/create-vendure-app.ts

@@ -212,7 +212,7 @@ async function createApp(
                                 subscriber.complete();
                             })
                             .catch(err => subscriber.error(err));
-                    });
+                    }) as any;
                 },
             },
         );