chore: Fix merge issues

docs/data/build.json

@@ -1,4 +1,4 @@
 {
-  "version": "1.2.0",
-  "commit": "765479402"
-}
+  "version": "1.5.2",
+  "commit": "c4811d42e"
+}

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

@@ -8,29 +8,29 @@
       const result: PossibleTypesResultData = {
   "possibleTypes": {
     "AddFulfillmentToOrderResult": [
-      "Fulfillment",
+      "CreateFulfillmentError",
       "EmptyOrderLineSelectionError",
-      "ItemsAlreadyFulfilledError",
+      "Fulfillment",
+      "FulfillmentStateTransitionError",
       "InsufficientStockOnHandError",
       "InvalidFulfillmentHandlerError",
-      "FulfillmentStateTransitionError",
-      "CreateFulfillmentError"
+      "ItemsAlreadyFulfilledError"
     ],
     "AddManualPaymentToOrderResult": [
-      "Order",
-      "ManualPaymentStateError"
+      "ManualPaymentStateError",
+      "Order"
     ],
     "AuthenticationResult": [
       "CurrentUser",
       "InvalidCredentialsError"
     ],
     "CancelOrderResult": [
-      "Order",
+      "CancelActiveOrderError",
       "EmptyOrderLineSelectionError",
-      "QuantityTooGreatError",
       "MultipleOrderError",
-      "CancelActiveOrderError",
-      "OrderStateTransitionError"
+      "Order",
+      "OrderStateTransitionError",
+      "QuantityTooGreatError"
     ],
     "CreateAssetResult": [
       "Asset",
@@ -45,8 +45,8 @@
       "EmailAddressConflictError"
     ],
     "CreatePromotionResult": [
-      "Promotion",
-      "MissingConditionsError"
+      "MissingConditionsError",
+      "Promotion"
     ],
     "CustomField": [
       "BooleanCustomFieldConfig",
@@ -59,13 +59,13 @@
       "TextCustomFieldConfig"
     ],
     "CustomFieldConfig": [
-      "StringCustomFieldConfig",
-      "LocaleStringCustomFieldConfig",
-      "IntCustomFieldConfig",
-      "FloatCustomFieldConfig",
       "BooleanCustomFieldConfig",
       "DateTimeCustomFieldConfig",
+      "FloatCustomFieldConfig",
+      "IntCustomFieldConfig",
+      "LocaleStringCustomFieldConfig",
       "RelationCustomFieldConfig",
+      "StringCustomFieldConfig",
       "TextCustomFieldConfig"
     ],
     "ErrorResult": [
@@ -107,17 +107,17 @@
       "SettlePaymentError"
     ],
     "ModifyOrderResult": [
-      "Order",
+      "CouponCodeExpiredError",
+      "CouponCodeInvalidError",
+      "CouponCodeLimitError",
+      "InsufficientStockError",
+      "NegativeQuantityError",
       "NoChangesSpecifiedError",
+      "Order",
+      "OrderLimitError",
       "OrderModificationStateError",
       "PaymentMethodMissingError",
-      "RefundPaymentIdMissingError",
-      "OrderLimitError",
-      "NegativeQuantityError",
-      "InsufficientStockError",
-      "CouponCodeExpiredError",
-      "CouponCodeInvalidError",
-      "CouponCodeLimitError"
+      "RefundPaymentIdMissingError"
     ],
     "NativeAuthenticationResult": [
       "CurrentUser",
@@ -187,14 +187,14 @@
       "TaxRateList"
     ],
     "RefundOrderResult": [
-      "Refund",
-      "QuantityTooGreatError",
+      "AlreadyRefundedError",
+      "MultipleOrderError",
       "NothingToRefundError",
       "OrderStateTransitionError",
-      "MultipleOrderError",
       "PaymentOrderMismatchError",
+      "QuantityTooGreatError",
+      "Refund",
       "RefundOrderStateError",
-      "AlreadyRefundedError",
       "RefundStateTransitionError"
     ],
     "RemoveOptionGroupFromProductResult": [
@@ -206,10 +206,10 @@
       "SinglePrice"
     ],
     "SettlePaymentResult": [
+      "OrderStateTransitionError",
       "Payment",
-      "SettlePaymentError",
       "PaymentStateTransitionError",
-      "OrderStateTransitionError"
+      "SettlePaymentError"
     ],
     "SettleRefundResult": [
       "Refund",
@@ -224,12 +224,12 @@
       "StockAdjustment"
     ],
     "StockMovementItem": [
-      "StockAdjustment",
       "Allocation",
-      "Sale",
       "Cancellation",
+      "Release",
       "Return",
-      "Release"
+      "Sale",
+      "StockAdjustment"
     ],
     "TransitionFulfillmentToStateResult": [
       "Fulfillment",
@@ -252,12 +252,12 @@
       "EmailAddressConflictError"
     ],
     "UpdateGlobalSettingsResult": [
-      "GlobalSettings",
-      "ChannelDefaultLanguageError"
+      "ChannelDefaultLanguageError",
+      "GlobalSettings"
     ],
     "UpdatePromotionResult": [
-      "Promotion",
-      "MissingConditionsError"
+      "MissingConditionsError",
+      "Promotion"
     ]
   }
 };

packages/core/package.json

@@ -61,6 +61,7 @@
     "express": "^4.17.1",
     "fs-extra": "^10.0.0",
     "graphql": "16.3.0",
+    "graphql-fields": "^2.0.3",
     "graphql-scalars": "^1.10.0",
     "graphql-tag": "^2.12.4",
     "graphql-upload": "^12.0.0",

packages/core/src/api/decorators/relations.decorator.ts

@@ -2,13 +2,15 @@ import { createParamDecorator, ExecutionContext } from '@nestjs/common';
 import { Type } from '@vendure/common/lib/shared-types';
 import { unique } from '@vendure/common/lib/unique';
 import { getNamedType, GraphQLResolveInfo, GraphQLSchema, isObjectType } from 'graphql';
-import graphqlFields from 'graphql-fields';
 import { getMetadataArgsStorage } from 'typeorm';
 
 import { CalculatedColumnDefinition, CALCULATED_PROPERTIES } from '../../common/calculated-decorator';
 import { EntityRelationPaths, InternalServerError, TtlCache } from '../../common/index';
 import { VendureEntity } from '../../entity/index';
 
+// tslint:disable-next-line:no-var-requires
+const graphqlFields = require('graphql-fields');
+
 export type RelationPaths<T extends VendureEntity> = Array<EntityRelationPaths<T>>;
 
 export type FieldsDecoratorConfig =

packages/core/src/common/types/entity-relation-paths.ts

@@ -50,7 +50,7 @@ export type PathsToStringProps2<T extends VendureEntity> = T extends string
           [K in EntityRelationKeys<T>]: T[K] extends VendureEntity[]
               ? [K, PathsToStringProps1<T[K][number]>]
               : T[K] extends VendureEntity | undefined
-              ? [K, PathsToStringProps1<T[K]>]
+              ? [K, PathsToStringProps1<NonNullable<T[K]>>]
               : never;
       }[Extract<EntityRelationKeys<T>, string>];
 

yarn.lock

@@ -3880,13 +3880,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/graphql-fields@^1.3.4":
-  version "1.3.4"
-  resolved "https://registry.npmjs.org/@types/graphql-fields/-/graphql-fields-1.3.4.tgz#868ffe444ba8027ea1eccb0909f9c331d1bd620a"
-  integrity sha512-McLJaAaqY7lk9d9y7E61iQrj0AwcEjSb8uHlPh7KgYV+XX1MSLlSt/alhd5k2BPRE8gy/f4lnkLGb5ke3iG66Q==
-  dependencies:
-    graphql "^15.3.0"
-
 "@types/graphql-upload@^8.0.4":
   version "8.0.11"
   resolved "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.11.tgz#0fef061be3dfc1f370d86cbc28bcb6a968c6b003"