chore(core): Refactor imports to avoid barrel files

Trying to reduce the risk of circular dependency issues

packages/core/src/api/common/user-has-permissions-on-custom-field.ts

@@ -1,6 +1,6 @@
 import { Permission } from '@vendure/common/lib/generated-types';
 
-import { CustomFieldConfig } from '../../config/index';
+import { CustomFieldConfig } from '../../config/custom-field/custom-field-types';
 
 import { RequestContext } from './request-context';
 
@@ -11,4 +11,4 @@ export function userHasPermissionsOnCustomField(ctx: RequestContext, fieldDef: C
         return true;
     }
     return ctx.userHasPermissions(permissionsArray);
-}
+}

packages/core/src/api/config/generate-resolvers.ts

@@ -4,12 +4,12 @@ import { GraphQLSchema } from 'graphql';
 import { GraphQLDateTime, GraphQLJSON } from 'graphql-scalars';
 
 import { REQUEST_CONTEXT_KEY } from '../../common/constants';
+import { InternalServerError } from '../../common/error/errors';
 import {
     adminErrorOperationTypeResolvers,
     ErrorResult,
 } from '../../common/error/generated-graphql-admin-errors';
 import { shopErrorOperationTypeResolvers } from '../../common/error/generated-graphql-shop-errors';
-import { InternalServerError } from '../../common/index';
 import { Translatable } from '../../common/types/locale-types';
 import { ConfigService } from '../../config/config.service';
 import { CustomFieldConfig, RelationCustomFieldConfig } from '../../config/custom-field/custom-field-types';

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

@@ -5,7 +5,9 @@ import { getNamedType, GraphQLResolveInfo, GraphQLSchema, isObjectType } from 'g
 import { getMetadataArgsStorage } from 'typeorm';
 
 import { CalculatedColumnDefinition, CALCULATED_PROPERTIES } from '../../common/calculated-decorator';
-import { EntityRelationPaths, InternalServerError, TtlCache } from '../../common/index';
+import { InternalServerError } from '../../common/error/errors';
+import { TtlCache } from '../../common/ttl-cache';
+import { EntityRelationPaths } from '../../common/types/entity-relation-paths';
 import { VendureEntity } from '../../entity/base/base.entity';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires

packages/core/src/api/resolvers/admin/customer.resolver.ts

@@ -23,7 +23,7 @@ import { PaginatedList } from '@vendure/common/lib/shared-types';
 import { ErrorResultUnion } from '../../../common/error/error-result';
 import { Address } from '../../../entity/address/address.entity';
 import { Customer } from '../../../entity/customer/customer.entity';
-import { CustomerGroupService } from '../../../service/index';
+import { CustomerGroupService } from '../../../service/services/customer-group.service';
 import { CustomerService } from '../../../service/services/customer.service';
 import { OrderService } from '../../../service/services/order.service';
 import { RequestContext } from '../../common/request-context';

packages/core/src/api/resolvers/admin/draft-order.resolver.ts

@@ -21,15 +21,16 @@ import {
     MutationSetDraftOrderShippingMethodArgs,
     Permission,
     QueryEligibleShippingMethodsForDraftOrderArgs,
-    SetCustomerForDraftOrderResult,
     ShippingMethodQuote,
 } from '@vendure/common/lib/generated-types';
 
-import { ErrorResultUnion, isGraphQlErrorResult, UserInputError } from '../../../common/index';
+import { ErrorResultUnion, isGraphQlErrorResult } from '../../../common/error/error-result';
+import { UserInputError } from '../../../common/error/errors';
 import { TransactionalConnection } from '../../../connection/index';
 import { Customer } from '../../../entity/customer/customer.entity';
 import { Order } from '../../../entity/order/order.entity';
-import { CustomerService, OrderService } from '../../../service/index';
+import { CustomerService } from '../../../service/services/customer.service';
+import { OrderService } from '../../../service/services/order.service';
 import { RequestContext } from '../../common/request-context';
 import { Allow } from '../../decorators/allow.decorator';
 import { Ctx } from '../../decorators/request-context.decorator';

packages/core/src/api/resolvers/admin/duplicate-entity.resolver.ts

@@ -5,7 +5,7 @@ import {
     Permission,
 } from '@vendure/common/lib/generated-types';
 
-import { EntityDuplicatorService } from '../../../service/index';
+import { EntityDuplicatorService } from '../../../service/helpers/entity-duplicator/entity-duplicator.service';
 import { RequestContext } from '../../common/request-context';
 import { Allow } from '../../decorators/allow.decorator';
 import { Ctx } from '../../decorators/request-context.decorator';

packages/core/src/api/resolvers/admin/facet.resolver.ts

@@ -19,7 +19,7 @@ import {
 import { PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { EntityNotFoundError } from '../../../common/error/errors';
-import { ErrorResultUnion } from '../../../common/index';
+import { ErrorResultUnion } from '../../../common/error/error-result';
 import { Translated } from '../../../common/types/locale-types';
 import { ConfigService } from '../../../config/config.service';
 import { Facet } from '../../../entity/facet/facet.entity';

packages/core/src/api/resolvers/admin/payment-method.resolver.ts

@@ -13,8 +13,8 @@ import {
     QueryPaymentMethodsArgs,
 } from '@vendure/common/lib/generated-types';
 import { PaginatedList } from '@vendure/common/lib/shared-types';
-import { Translated } from '../../../common/index';
 
+import { Translated } from '../../../common/types/locale-types';
 import { PaymentMethod } from '../../../entity/payment-method/payment-method.entity';
 import { PaymentMethodService } from '../../../service/services/payment-method.service';
 import { RequestContext } from '../../common/request-context';

packages/core/src/api/resolvers/admin/seller.resolver.ts

@@ -12,7 +12,7 @@ import {
 } from '@vendure/common/lib/generated-types';
 
 import { Seller } from '../../../entity/seller/seller.entity';
-import { SellerService } from '../../../service/index';
+import { SellerService } from '../../../service/services/seller.service';
 import { RequestContext } from '../../common/request-context';
 import { Allow } from '../../decorators/allow.decorator';
 import { Ctx } from '../../decorators/request-context.decorator';

packages/core/src/api/resolvers/admin/shipping-method.resolver.ts

@@ -16,7 +16,7 @@ import {
 } from '@vendure/common/lib/generated-types';
 import { PaginatedList } from '@vendure/common/lib/shared-types';
 
-import { Translated } from '../../../common/index';
+import { Translated } from '../../../common/types/locale-types';
 import { ShippingMethod } from '../../../entity/shipping-method/shipping-method.entity';
 import { OrderTestingService } from '../../../service/services/order-testing.service';
 import { ShippingMethodService } from '../../../service/services/shipping-method.service';

packages/core/src/api/resolvers/entity/administrator-entity.resolver.ts

@@ -1,6 +1,6 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 
-import { TransactionalConnection } from '../../../connection/index';
+import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { Administrator } from '../../../entity/administrator/administrator.entity';
 import { User } from '../../../entity/user/user.entity';
 import { RequestContext } from '../../common/request-context';

packages/core/src/api/resolvers/entity/channel-entity.resolver.ts

@@ -2,7 +2,7 @@ import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 
 import { Channel } from '../../../entity/channel/channel.entity';
 import { Seller } from '../../../entity/seller/seller.entity';
-import { SellerService } from '../../../service/index';
+import { SellerService } from '../../../service/services/seller.service';
 import { RequestContext } from '../../common/request-context';
 import { Ctx } from '../../decorators/request-context.decorator';
 

packages/core/src/api/resolvers/entity/fulfillment-entity.resolver.ts

@@ -1,6 +1,6 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 
-import { RequestContextCacheService } from '../../../cache/index';
+import { RequestContextCacheService } from '../../../cache/request-context-cache.service';
 import { Fulfillment } from '../../../entity/fulfillment/fulfillment.entity';
 import { FulfillmentService } from '../../../service/services/fulfillment.service';
 import { RequestContext } from '../../common/request-context';

packages/core/src/api/resolvers/entity/fulfillment-line-entity.resolver.ts

@@ -1,6 +1,6 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 
-import { TransactionalConnection } from '../../../connection/index';
+import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { Fulfillment } from '../../../entity/fulfillment/fulfillment.entity';
 import { OrderLine } from '../../../entity/order-line/order-line.entity';
 import { FulfillmentLine } from '../../../entity/order-line-reference/fulfillment-line.entity';

packages/core/src/api/resolvers/entity/order-entity.resolver.ts

@@ -3,8 +3,7 @@ import { HistoryEntryListOptions, OrderHistoryArgs, SortOrder } from '@vendure/c
 
 import { assertFound, idsAreEqual } from '../../../common/utils';
 import { Order } from '../../../entity/order/order.entity';
-import { ProductOptionGroup } from '../../../entity/product-option-group/product-option-group.entity';
-import { TranslatorService } from '../../../service/index';
+import { TranslatorService } from '../../../service/helpers/translator/translator.service';
 import { HistoryService } from '../../../service/services/history.service';
 import { OrderService } from '../../../service/services/order.service';
 import { ShippingMethodService } from '../../../service/services/shipping-method.service';

packages/core/src/api/resolvers/entity/payment-entity.resolver.ts

@@ -1,7 +1,7 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 import { pick } from '@vendure/common/lib/pick';
 
-import { RequestContextCacheService } from '../../../cache/index';
+import { RequestContextCacheService } from '../../../cache/request-context-cache.service';
 import { PaymentMetadata } from '../../../common/types/common-types';
 import { Payment } from '../../../entity/payment/payment.entity';
 import { Refund } from '../../../entity/refund/refund.entity';

packages/core/src/api/resolvers/entity/product-variant-entity.resolver.ts

@@ -14,7 +14,7 @@ import { Asset, Channel, FacetValue, Product, ProductOption, StockLevel, TaxRate
 import { ProductVariant } from '../../../entity/product-variant/product-variant.entity';
 import { StockMovement } from '../../../entity/stock-movement/stock-movement.entity';
 import { LocaleStringHydrator } from '../../../service/helpers/locale-string-hydrator/locale-string-hydrator';
-import { StockLevelService } from '../../../service/index';
+import { StockLevelService } from '../../../service/services/stock-level.service';
 import { AssetService } from '../../../service/services/asset.service';
 import { ProductVariantService } from '../../../service/services/product-variant.service';
 import { StockMovementService } from '../../../service/services/stock-movement.service';

packages/core/src/api/resolvers/entity/refund-entity.resolver.ts

@@ -1,8 +1,8 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 
-import { idsAreEqual } from '../../../common/index';
+import { idsAreEqual } from '../../../common/utils';
 import { Refund } from '../../../entity/refund/refund.entity';
-import { PaymentService } from '../../../service/index';
+import { PaymentService } from '../../../service/services/payment.service';
 import { RequestContext } from '../../common/request-context';
 import { Ctx } from '../../decorators/request-context.decorator';
 

packages/core/src/api/resolvers/entity/refund-line-entity.resolver.ts

@@ -1,6 +1,6 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 
-import { TransactionalConnection } from '../../../connection/index';
+import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { OrderLine } from '../../../entity/order-line/order-line.entity';
 import { RefundLine } from '../../../entity/order-line-reference/refund-line.entity';
 import { Refund } from '../../../entity/refund/refund.entity';

packages/core/src/common/utils.ts

@@ -3,7 +3,7 @@ import { ID } from '@vendure/common/lib/shared-types';
 import { lastValueFrom, Observable, Observer } from 'rxjs';
 import { FindOptionsRelations } from 'typeorm/find-options/FindOptionsRelations';
 
-import { RelationPaths } from '../api/index';
+import { RelationPaths } from '../api/decorators/relations.decorator';
 import { VendureEntity } from '../entity/base/base.entity';
 
 /**

packages/core/src/config/asset-import-strategy/default-asset-import-strategy.ts

@@ -7,7 +7,7 @@ import { delay, retryWhen, take, tap } from 'rxjs/operators';
 import { Readable } from 'stream';
 import { URL } from 'url';
 
-import { Injector } from '../../common/index';
+import { Injector } from '../../common/injector';
 import { ConfigService } from '../config.service';
 import { Logger } from '../logger/vendure-logger';
 

packages/core/src/config/auth/default-password-validation-strategy.ts

@@ -1,4 +1,4 @@
-import { RequestContext } from '../../api/index';
+import { RequestContext } from '../../api/common/request-context';
 
 import { PasswordValidationStrategy } from './password-validation-strategy';
 

packages/core/src/config/auth/password-validation-strategy.ts

@@ -1,4 +1,4 @@
-import { RequestContext } from '../../api/index';
+import { RequestContext } from '../../api/common/request-context';
 import { InjectableStrategy } from '../../common/types/injectable-strategy';
 
 /**

packages/core/src/config/catalog/default-product-variant-price-calculation-strategy.spec.ts

@@ -1,7 +1,7 @@
 import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
 import { roundMoney } from '../../common/round-money';
-import { ProductVariant } from '../../entity/index';
+import { ProductVariant } from '../../entity/product-variant/product-variant.entity';
 import {
     createRequestContext,
     MockTaxRateService,

packages/core/src/config/catalog/default-stock-location-strategy.ts

@@ -1,8 +1,9 @@
 import { ID } from '@vendure/common/lib/shared-types';
 
-import { RequestContext } from '../../api/index';
-import { idsAreEqual, Injector } from '../../common/index';
-import { TransactionalConnection } from '../../connection/index';
+import { RequestContext } from '../../api/common/request-context';
+import { Injector } from '../../common/injector';
+import { idsAreEqual } from '../../common/utils';
+import { TransactionalConnection } from '../../connection/transactional-connection';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { StockLevel } from '../../entity/stock-level/stock-level.entity';
 import { StockLocation } from '../../entity/stock-location/stock-location.entity';

packages/core/src/config/custom-field/custom-field-types.ts

@@ -20,7 +20,7 @@ import {
     UiComponentConfig,
 } from '@vendure/common/lib/shared-types';
 
-import { RequestContext } from '../../api/index';
+import { RequestContext } from '../../api/common/request-context';
 import { Injector } from '../../common/injector';
 import { VendureEntity } from '../../entity/base/base.entity';
 

packages/core/src/config/entity/entity-duplicator.ts

@@ -1,14 +1,14 @@
 import { ConfigArg, Permission } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 
-import { RequestContext } from '../../api/index';
+import { RequestContext } from '../../api/common/request-context';
 import {
     ConfigArgs,
     ConfigArgValues,
     ConfigurableOperationDef,
     ConfigurableOperationDefOptions,
 } from '../../common/configurable-operation';
-import { VendureEntity } from '../../entity/index';
+import { VendureEntity } from '../../entity/base/base.entity';
 
 /**
  * @description

packages/core/src/config/entity/entity-duplicators/collection-duplicator.ts

@@ -5,10 +5,10 @@ import {
     Permission,
 } from '@vendure/common/lib/generated-types';
 
-import { Injector } from '../../../common/index';
-import { TransactionalConnection } from '../../../connection/index';
-import { Collection } from '../../../entity/index';
-import { CollectionService } from '../../../service/index';
+import { Injector } from '../../../common/injector';
+import { TransactionalConnection } from '../../../connection/transactional-connection';
+import { Collection } from '../../../entity/collection/collection.entity';
+import { CollectionService } from '../../../service/services/collection.service';
 import { EntityDuplicator } from '../entity-duplicator';
 
 let connection: TransactionalConnection;

packages/core/src/config/entity/entity-duplicators/facet-duplicator.ts

@@ -5,10 +5,11 @@ import {
     Permission,
 } from '@vendure/common/lib/generated-types';
 
-import { Injector } from '../../../common/index';
-import { TransactionalConnection } from '../../../connection/index';
-import { Facet } from '../../../entity/index';
-import { FacetService, FacetValueService } from '../../../service/index';
+import { Injector } from '../../../common/injector';
+import { TransactionalConnection } from '../../../connection/transactional-connection';
+import { Facet } from '../../../entity/facet/facet.entity';
+import { FacetValueService } from '../../../service/services/facet-value.service';
+import { FacetService } from '../../../service/services/facet.service';
 import { EntityDuplicator } from '../entity-duplicator';
 
 let connection: TransactionalConnection;

packages/core/src/config/entity/entity-duplicators/product-duplicator.ts

@@ -8,15 +8,16 @@ import {
 } from '@vendure/common/lib/generated-types';
 import { IsNull } from 'typeorm';
 
-import { Injector, InternalServerError } from '../../../common/index';
-import { TransactionalConnection } from '../../../connection/index';
-import { Product, ProductOptionGroup, ProductVariant } from '../../../entity/index';
-import {
-    ProductOptionGroupService,
-    ProductOptionService,
-    ProductService,
-    ProductVariantService,
-} from '../../../service/index';
+import { InternalServerError } from '../../../common/error/errors';
+import { Injector } from '../../../common/injector';
+import { TransactionalConnection } from '../../../connection/transactional-connection';
+import { Product } from '../../../entity/product/product.entity';
+import { ProductOptionGroup } from '../../../entity/product-option-group/product-option-group.entity';
+import { ProductVariant } from '../../../entity/product-variant/product-variant.entity';
+import { ProductOptionGroupService } from '../../../service/services/product-option-group.service';
+import { ProductOptionService } from '../../../service/services/product-option.service';
+import { ProductVariantService } from '../../../service/services/product-variant.service';
+import { ProductService } from '../../../service/services/product.service';
 import { EntityDuplicator } from '../entity-duplicator';
 
 let connection: TransactionalConnection;

packages/core/src/config/entity/entity-duplicators/promotion-duplicator.ts

@@ -1,16 +1,15 @@
 import {
-    CreateFacetInput,
     CreatePromotionInput,
-    FacetTranslationInput,
     LanguageCode,
     Permission,
     PromotionTranslationInput,
 } from '@vendure/common/lib/generated-types';
 
-import { Injector, isGraphQlErrorResult } from '../../../common/index';
-import { TransactionalConnection } from '../../../connection/index';
-import { Facet, Promotion } from '../../../entity/index';
-import { FacetService, FacetValueService, PromotionService } from '../../../service/index';
+import { isGraphQlErrorResult } from '../../../common/error/error-result';
+import { Injector } from '../../../common/injector';
+import { TransactionalConnection } from '../../../connection/transactional-connection';
+import { Promotion } from '../../../entity/promotion/promotion.entity';
+import { PromotionService } from '../../../service/services/promotion.service';
 import { EntityDuplicator } from '../entity-duplicator';
 
 let connection: TransactionalConnection;

packages/core/src/config/fulfillment/default-fulfillment-process.ts

@@ -2,11 +2,14 @@ import { HistoryEntryType } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../../api/common/request-context';
-import { awaitPromiseOrObservable, InternalServerError, isGraphQlErrorResult } from '../../common/index';
+import { isGraphQlErrorResult } from '../../common/error/error-result';
+import { InternalServerError } from '../../common/error/errors';
+import { awaitPromiseOrObservable } from '../../common/utils';
 import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
 import { Order } from '../../entity/order/order.entity';
+import { FulfillmentState } from '../../service/helpers/fulfillment-state-machine/fulfillment-state';
+import { OrderState } from '../../service/helpers/order-state-machine/order-state';
 import { orderItemsAreDelivered, orderItemsAreShipped } from '../../service/helpers/utils/order-utils';
-import { FulfillmentState, OrderState } from '../../service/index';
 
 import { FulfillmentProcess } from './fulfillment-process';
 

packages/core/src/config/order/active-order-strategy.ts

@@ -1,7 +1,7 @@
 import { DocumentNode } from 'graphql';
 
-import { RequestContext } from '../../api/index';
-import { InjectableStrategy } from '../../common/index';
+import { RequestContext } from '../../api/common/request-context';
+import { InjectableStrategy } from '../../common/types/injectable-strategy';
 import { Order } from '../../entity/order/order.entity';
 
 export const ACTIVE_ORDER_INPUT_FIELD_NAME = 'activeOrderInput';

packages/core/src/config/order/default-guest-checkout-strategy.ts

@@ -1,9 +1,9 @@
 import { CreateCustomerInput, SetCustomerForOrderResult } from '@vendure/common/lib/generated-shop-types';
 
 import { RequestContext } from '../../api/common/request-context';
+import { ErrorResultUnion } from '../../common/error/error-result';
 import { AlreadyLoggedInError, GuestCheckoutError } from '../../common/error/generated-graphql-shop-errors';
-import { ErrorResultUnion, Injector } from '../../common/index';
-import { InjectableStrategy } from '../../common/types/injectable-strategy';
+import { Injector } from '../../common/injector';
 import { Customer, Order } from '../../entity/index';
 import { CustomerService } from '../../service/services/customer.service';
 

packages/core/src/config/order/default-order-process.ts

@@ -2,7 +2,7 @@ import { HistoryEntryType } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 import { unique } from '@vendure/common/lib/unique';
 
-import { RequestContext } from '../../api/index';
+import { RequestContext } from '../../api/common/request-context';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { Order } from '../../entity/order/order.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
@@ -414,13 +414,12 @@ export function configureDefaultOrderProcess(options: DefaultOrderProcessOptions
                     order.orderPlacedAt = new Date();
                     await Promise.all(
                         order.lines.map(line => {
-                            line.orderPlacedQuantity = line.quantity
+                            line.orderPlacedQuantity = line.quantity;
                             connection
                                 .getRepository(ctx, OrderLine)
-                                .update(line.id, { orderPlacedQuantity: line.quantity })
-                            return line
-                        }
-                        ),
+                                .update(line.id, { orderPlacedQuantity: line.quantity });
+                            return line;
+                        }),
                     );
                     eventBus.publish(new OrderPlacedEvent(fromState, toState, ctx, order));
                     await orderSplitter.createSellerOrders(ctx, order);

packages/core/src/config/order/guest-checkout-strategy.ts

@@ -1,9 +1,10 @@
 import { CreateCustomerInput, SetCustomerForOrderResult } from '@vendure/common/lib/generated-shop-types';
 
 import { RequestContext } from '../../api/common/request-context';
-import { ErrorResultUnion } from '../../common/index';
+import { ErrorResultUnion } from '../../common/error/error-result';
 import { InjectableStrategy } from '../../common/types/injectable-strategy';
-import { Customer, Order } from '../../entity/index';
+import { Customer } from '../../entity/customer/customer.entity';
+import { Order } from '../../entity/order/order.entity';
 
 /**
  * @description

packages/core/src/config/order/order-seller-strategy.ts

@@ -1,14 +1,12 @@
 import { ID } from '@vendure/common/lib/shared-types';
 
-import { RequestContext } from '../../api/index';
-import { InjectableStrategy } from '../../common/index';
+import { RequestContext } from '../../api/common/request-context';
+import { InjectableStrategy } from '../../common/types/injectable-strategy';
 import { Channel } from '../../entity/channel/channel.entity';
 import { Order } from '../../entity/order/order.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
-import { Payment } from '../../entity/payment/payment.entity';
 import { ShippingLine } from '../../entity/shipping-line/shipping-line.entity';
-import { Surcharge } from '../../entity/surcharge/surcharge.entity';
-import { OrderState } from '../../service/index';
+import { OrderState } from '../../service/helpers/order-state-machine/order-state';
 
 /**
  * @description

packages/core/src/config/payment/default-payment-process.ts

@@ -1,7 +1,7 @@
 import { HistoryEntryType } from '@vendure/common/lib/generated-types';
 
+import { PaymentState } from '../../service/helpers/payment-state-machine/payment-state';
 import { orderTotalIsCovered } from '../../service/helpers/utils/order-utils';
-import { PaymentState } from '../../service/index';
 
 import { PaymentProcess } from './payment-process';
 

packages/core/src/config/promotion/conditions/customer-group-condition.ts

@@ -5,7 +5,7 @@ import { Subscription } from 'rxjs';
 import { TtlCache } from '../../../common/ttl-cache';
 import { idsAreEqual } from '../../../common/utils';
 import { EventBus } from '../../../event-bus/event-bus';
-import { CustomerGroupChangeEvent } from '../../../event-bus/index';
+import { CustomerGroupChangeEvent } from '../../../event-bus/events/customer-group-change-event';
 import { PromotionCondition } from '../promotion-condition';
 
 let customerService: import('../../../service/services/customer.service').CustomerService;

packages/core/src/config/shipping-method/default-shipping-line-assignment-strategy.ts

@@ -1,4 +1,4 @@
-import { RequestContext } from '../../api/index';
+import { RequestContext } from '../../api/common/request-context';
 import { Order } from '../../entity/order/order.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { ShippingLine } from '../../entity/shipping-line/shipping-line.entity';

packages/core/src/config/shipping-method/shipping-line-assignment-strategy.ts

@@ -1,5 +1,5 @@
-import { RequestContext } from '../../api/index';
-import { InjectableStrategy } from '../../common/index';
+import { RequestContext } from '../../api/common/request-context';
+import { InjectableStrategy } from '../../common/types/injectable-strategy';
 import { Order } from '../../entity/order/order.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { ShippingLine } from '../../entity/shipping-line/shipping-line.entity';

packages/core/src/config/system/error-handler-strategy.ts

@@ -1,6 +1,6 @@
 import { ArgumentsHost } from '@nestjs/common';
 
-import { InjectableStrategy } from '../../common/index';
+import { InjectableStrategy } from '../../common/types/injectable-strategy';
 import { Job } from '../../job-queue/job';
 
 /**

packages/core/src/data-import/providers/asset-importer/asset-importer.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import path from 'path';
 
-import { RequestContext } from '../../../api/index';
+import { RequestContext } from '../../../api/common/request-context';
 import { isGraphQlErrorResult } from '../../../common/index';
 import { ConfigService } from '../../../config/config.service';
 import { Asset } from '../../../entity/asset/asset.entity';

packages/core/src/data-import/providers/importer/fast-importer.service.ts

@@ -23,9 +23,10 @@ import { ProductVariantAsset } from '../../../entity/product-variant/product-var
 import { ProductVariantPrice } from '../../../entity/product-variant/product-variant-price.entity';
 import { ProductVariantTranslation } from '../../../entity/product-variant/product-variant-translation.entity';
 import { ProductVariant } from '../../../entity/product-variant/product-variant.entity';
+import { RequestContextService } from '../../../service/helpers/request-context/request-context.service';
 import { TranslatableSaver } from '../../../service/helpers/translatable-saver/translatable-saver';
-import { RequestContextService, StockMovementService } from '../../../service/index';
 import { ChannelService } from '../../../service/services/channel.service';
+import { StockMovementService } from '../../../service/services/stock-movement.service';
 
 /**
  * @description

packages/core/src/data-import/providers/populator/populator.ts

@@ -11,7 +11,7 @@ import {
     Logger,
 } from '../../../config';
 import { manualFulfillmentHandler } from '../../../config/fulfillment/manual-fulfillment-handler';
-import { TransactionalConnection } from '../../../connection/index';
+import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { Channel, Collection, FacetValue, TaxCategory, User } from '../../../entity';
 import {
     CollectionService,

packages/core/src/entity/payment-method/payment-method.entity.ts

@@ -2,8 +2,8 @@ import { ConfigurableOperation } from '@vendure/common/lib/generated-types';
 import { DeepPartial } from '@vendure/common/lib/shared-types';
 import { Column, Entity, JoinTable, ManyToMany, OneToMany } from 'typeorm';
 
-import { LocaleString, Translatable, Translation } from '../../common/index';
 import { ChannelAware } from '../../common/types/common-types';
+import { LocaleString, Translatable, Translation } from '../../common/types/locale-types';
 import { HasCustomFields } from '../../config/custom-field/custom-field-types';
 import { VendureEntity } from '../base/base.entity';
 import { Channel } from '../channel/channel.entity';

packages/core/src/entity/stock-location/stock-location.entity.ts

@@ -1,8 +1,8 @@
 import { DeepPartial } from '@vendure/common/lib/shared-types';
 import { Column, Entity, JoinTable, ManyToMany } from 'typeorm';
 
-import { ChannelAware } from '../../common/index';
-import { HasCustomFields } from '../../config/index';
+import { ChannelAware } from '../../common/types/common-types';
+import { HasCustomFields } from '../../config/custom-field/custom-field-types';
 import { VendureEntity } from '../base/base.entity';
 import { Channel } from '../channel/channel.entity';
 import { CustomStockLocationFields } from '../custom-entity-fields';

packages/core/src/health-check/http-health-check-strategy.ts

@@ -3,7 +3,7 @@ import { HealthCheckError, HealthIndicatorFunction, HealthIndicatorResult } from
 import { HealthIndicator } from '@nestjs/terminus/dist/health-indicator/index';
 import fetch from 'node-fetch';
 
-import { Injector } from '../common/index';
+import { Injector } from '../common/injector';
 import { HealthCheckStrategy } from '../config/system/health-check-strategy';
 
 export interface HttpHealthCheckOptions {

packages/core/src/health-check/typeorm-health-check-strategy.ts

@@ -1,6 +1,6 @@
 import { HealthIndicatorFunction, TypeOrmHealthIndicator } from '@nestjs/terminus';
 
-import { Injector } from '../common/index';
+import { Injector } from '../common/injector';
 import { HealthCheckStrategy } from '../config/system/health-check-strategy';
 
 let indicator: TypeOrmHealthIndicator;

packages/core/src/plugin/default-search-plugin/indexer/indexer.controller.ts

@@ -14,9 +14,9 @@ import { ConfigService } from '../../../config/config.service';
 import { Logger } from '../../../config/logger/vendure-logger';
 import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { FacetValue } from '../../../entity/facet-value/facet-value.entity';
-import { ProductVariant } from '../../../entity/product-variant/product-variant.entity';
 import { Product } from '../../../entity/product/product.entity';
-import { Job } from '../../../job-queue/index';
+import { ProductVariant } from '../../../entity/product-variant/product-variant.entity';
+import { Job } from '../../../job-queue/job';
 import { ProductPriceApplicator } from '../../../service/helpers/product-price-applicator/product-price-applicator';
 import { ProductVariantService } from '../../../service/services/product-variant.service';
 import { PLUGIN_INIT_OPTIONS } from '../constants';

packages/core/src/plugin/default-search-plugin/search-job-buffer/collection-job-buffer.ts

@@ -1,7 +1,8 @@
 import { ID } from '@vendure/common/lib/shared-types';
 import { unique } from '@vendure/common/lib/unique';
 
-import { Job, JobBuffer } from '../../../job-queue/index';
+import { Job } from '../../../job-queue/job';
+import { JobBuffer } from '../../../job-queue/job-buffer/job-buffer';
 import { ApplyCollectionFiltersJobData } from '../../../service/services/collection.service';
 
 export class CollectionJobBuffer implements JobBuffer<ApplyCollectionFiltersJobData> {

packages/core/src/plugin/default-search-plugin/search-job-buffer/search-index-job-buffer.ts

@@ -1,7 +1,8 @@
 import { ID } from '@vendure/common/lib/shared-types';
 import { unique } from '@vendure/common/lib/unique';
 
-import { Job, JobBuffer } from '../../../job-queue/index';
+import { Job } from '../../../job-queue/job';
+import { JobBuffer } from '../../../job-queue/job-buffer/job-buffer';
 import {
     UpdateIndexQueueJobData,
     UpdateProductJobData,

packages/core/src/service/helpers/entity-duplicator/entity-duplicator.service.ts

@@ -3,13 +3,13 @@ import {
     DuplicateEntityInput,
     DuplicateEntityResult,
     EntityDuplicatorDefinition,
-    Permission,
 } from '@vendure/common/lib/generated-types';
 
-import { RequestContext } from '../../../api/index';
-import { DuplicateEntityError } from '../../../common/index';
-import { ConfigService, Logger } from '../../../config/index';
-import { TransactionalConnection } from '../../../connection/index';
+import { RequestContext } from '../../../api/common/request-context';
+import { DuplicateEntityError } from '../../../common/error/generated-graphql-admin-errors';
+import { ConfigService } from '../../../config/config.service';
+import { Logger } from '../../../config/logger/vendure-logger';
+import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { ConfigArgService } from '../config-arg/config-arg.service';
 
 /**
@@ -37,7 +37,7 @@ export class EntityDuplicatorService {
             ...x.toGraphQlType(ctx),
             __typename: 'EntityDuplicatorDefinition',
             forEntities: x.forEntities,
-            requiresPermission: x.requiresPermission as Permission[],
+            requiresPermission: x.requiresPermission,
         }));
     }
 

packages/core/src/service/helpers/list-query-builder/connection-utils.ts

@@ -1,15 +1,15 @@
 import { Type } from '@vendure/common/lib/shared-types';
-import { Connection } from 'typeorm';
+import { DataSource } from 'typeorm';
 import { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata';
 
-import { Translation } from '../../../common/index';
+import { Translation } from '../../../common/types/locale-types';
 import { VendureEntity } from '../../../entity/base/base.entity';
 
 /**
  * @description
  * Returns TypeORM ColumnMetadata for the given entity type.
  */
-export function getColumnMetadata<T>(connection: Connection, entity: Type<T>) {
+export function getColumnMetadata<T>(connection: DataSource, entity: Type<T>) {
     const metadata = connection.getMetadata(entity);
     const columns = metadata.columns;
     let translationColumns: ColumnMetadata[] = [];
@@ -34,7 +34,7 @@ export function getColumnMetadata<T>(connection: Connection, entity: Type<T>) {
     return { columns, translationColumns, alias };
 }
 
-export function getEntityAlias<T>(connection: Connection, entity: Type<T>): string {
+export function getEntityAlias<T>(connection: DataSource, entity: Type<T>): string {
     return connection.getMetadata(entity).name.toLowerCase();
 }
 
@@ -42,6 +42,6 @@ export function getEntityAlias<T>(connection: Connection, entity: Type<T>): stri
  * @description
  * Escapes identifiers in an expression according to the current database driver.
  */
-export function escapeCalculatedColumnExpression(connection: Connection, expression: string): string {
+export function escapeCalculatedColumnExpression(connection: DataSource, expression: string): string {
     return expression.replace(/\b([a-z]+[A-Z]\w+)\b/g, substring => connection.driver.escape(substring));
 }

packages/core/src/service/helpers/order-modifier/order-modifier.ts

@@ -51,7 +51,7 @@ import { Release } from '../../../entity/stock-movement/release.entity';
 import { Sale } from '../../../entity/stock-movement/sale.entity';
 import { Surcharge } from '../../../entity/surcharge/surcharge.entity';
 import { EventBus } from '../../../event-bus/event-bus';
-import { OrderLineEvent } from '../../../event-bus/index';
+import { OrderLineEvent } from '../../../event-bus/events/order-line-event';
 import { CountryService } from '../../services/country.service';
 import { HistoryService } from '../../services/history.service';
 import { PaymentService } from '../../services/payment.service';

packages/core/src/service/helpers/request-context/request-context.service.ts

@@ -7,7 +7,7 @@ import ms from 'ms';
 
 import { ApiType, getApiType } from '../../../api/common/get-api-type';
 import { RequestContext } from '../../../api/common/request-context';
-import { UserInputError } from '../../../common/index';
+import { UserInputError } from '../../../common/error/errors';
 import { idsAreEqual } from '../../../common/utils';
 import { ConfigService } from '../../../config/config.service';
 import { CachedSession, CachedSessionUser } from '../../../config/session-cache/session-cache-strategy';

packages/core/src/service/helpers/utils/order-utils.ts

@@ -4,9 +4,10 @@ import { summate } from '@vendure/common/lib/shared-utils';
 import { unique } from '@vendure/common/lib/unique';
 import { In } from 'typeorm';
 
-import { RequestContext } from '../../../api/index';
-import { EntityNotFoundError, idsAreEqual } from '../../../common/index';
-import { TransactionalConnection } from '../../../connection/index';
+import { RequestContext } from '../../../api/common/request-context';
+import { EntityNotFoundError } from '../../../common/error/errors';
+import { idsAreEqual } from '../../../common/utils';
+import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { Order } from '../../../entity/order/order.entity';
 import { OrderLine } from '../../../entity/order-line/order-line.entity';
 import { FulfillmentLine } from '../../../entity/order-line-reference/fulfillment-line.entity';

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

@@ -8,10 +8,10 @@ import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { In, IsNull } from 'typeorm';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { EntityNotFoundError, InternalServerError, UserInputError } from '../../common/error/errors';
-import { assertFound, idsAreEqual, normalizeEmailAddress } from '../../common/index';
 import { ListQueryOptions } from '../../common/types/common-types';
+import { assertFound, idsAreEqual, normalizeEmailAddress } from '../../common/utils';
 import { ConfigService } from '../../config';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { Administrator } from '../../entity/administrator/administrator.entity';

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

@@ -26,7 +26,7 @@ import { FindOneOptions } from 'typeorm/find-options/FindOneOptions';
 import { camelCase } from 'typeorm/util/StringUtils';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { isGraphQlErrorResult } from '../../common/error/error-result';
 import { ForbiddenError, InternalServerError } from '../../common/error/errors';
 import { MimeTypeError } from '../../common/error/generated-graphql-admin-errors';

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

@@ -22,7 +22,7 @@ import { debounceTime } from 'rxjs/operators';
 import { In, IsNull } from 'typeorm';
 
 import { RequestContext, SerializedRequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { ForbiddenError, IllegalOperationError, UserInputError } from '../../common/error/errors';
 import { ListQueryOptions } from '../../common/types/common-types';
 import { Translated } from '../../common/types/locale-types';

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

@@ -8,7 +8,7 @@ import {
 import { ID, PaginatedList, Type } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { UserInputError } from '../../common/error/errors';
 import { ListQueryOptions } from '../../common/types/common-types';
 import { Translated } from '../../common/types/locale-types';

packages/core/src/service/services/customer-group.service.ts

@@ -13,7 +13,7 @@ import {
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { UserInputError } from '../../common/error/errors';
 import { assertFound, idsAreEqual } from '../../common/utils';
 import { TransactionalConnection } from '../../connection/transactional-connection';

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

@@ -25,7 +25,7 @@ import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { IsNull } from 'typeorm';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { ErrorResultUnion, isGraphQlErrorResult } from '../../common/error/error-result';
 import { EntityNotFoundError, InternalServerError } from '../../common/error/errors';
 import { EmailAddressConflictError as EmailAddressConflictAdminError } from '../../common/error/generated-graphql-admin-errors';

packages/core/src/service/services/facet-value.service.ts

@@ -10,16 +10,16 @@ import {
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
-import { ListQueryOptions } from '../../common/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
+import { ListQueryOptions } from '../../common/types/common-types';
 import { Translated } from '../../common/types/locale-types';
 import { assertFound } from '../../common/utils';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';
-import { Asset, Product, ProductVariant } from '../../entity';
-import { Facet } from '../../entity/facet/facet.entity';
+import { Product, ProductVariant } from '../../entity';
 import { FacetValueTranslation } from '../../entity/facet-value/facet-value-translation.entity';
 import { FacetValue } from '../../entity/facet-value/facet-value.entity';
+import { Facet } from '../../entity/facet/facet.entity';
 import { EventBus } from '../../event-bus';
 import { FacetValueEvent } from '../../event-bus/events/facet-value-event';
 import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';

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

@@ -14,7 +14,7 @@ import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { In } from 'typeorm';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { ErrorResultUnion, FacetInUseError, ForbiddenError, UserInputError } from '../../common';
 import { ListQueryOptions } from '../../common/types/common-types';
 import { Translated } from '../../common/types/locale-types';

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

@@ -6,7 +6,7 @@ import { unique } from '@vendure/common/lib/unique';
 import { In, Not } from 'typeorm';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import {
     CreateFulfillmentError,
     FulfillmentStateTransitionError,

packages/core/src/service/services/global-settings.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { UpdateGlobalSettingsInput } from '@vendure/common/lib/generated-types';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RequestContextCacheService } from '../../cache/index';
+import { RequestContextCacheService } from '../../cache/request-context-cache.service';
 import { InternalServerError } from '../../common/error/errors';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';

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

@@ -80,10 +80,10 @@ import { Channel } from '../../entity/channel/channel.entity';
 import { Customer } from '../../entity/customer/customer.entity';
 import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
 import { HistoryEntry } from '../../entity/history-entry/history-entry.entity';
-import { FulfillmentLine } from '../../entity/order-line-reference/fulfillment-line.entity';
+import { Order } from '../../entity/order/order.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
+import { FulfillmentLine } from '../../entity/order-line-reference/fulfillment-line.entity';
 import { OrderModification } from '../../entity/order-modification/order-modification.entity';
-import { Order } from '../../entity/order/order.entity';
 import { Payment } from '../../entity/payment/payment.entity';
 import { ProductVariant } from '../../entity/product-variant/product-variant.entity';
 import { Promotion } from '../../entity/promotion/promotion.entity';
@@ -93,13 +93,11 @@ import { ShippingLine } from '../../entity/shipping-line/shipping-line.entity';
 import { Surcharge } from '../../entity/surcharge/surcharge.entity';
 import { User } from '../../entity/user/user.entity';
 import { EventBus } from '../../event-bus/event-bus';
-import {
-    CouponCodeEvent,
-    OrderEvent,
-    OrderLineEvent,
-    OrderStateTransitionEvent,
-    RefundStateTransitionEvent,
-} from '../../event-bus/index';
+import { CouponCodeEvent } from '../../event-bus/events/coupon-code-event';
+import { OrderEvent } from '../../event-bus/events/order-event';
+import { OrderLineEvent } from '../../event-bus/events/order-line-event';
+import { OrderStateTransitionEvent } from '../../event-bus/events/order-state-transition-event';
+import { RefundStateTransitionEvent } from '../../event-bus/events/refund-state-transition-event';
 import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
 import { FulfillmentState } from '../helpers/fulfillment-state-machine/fulfillment-state';
 import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';

packages/core/src/service/services/payment-method.service.ts

@@ -10,15 +10,14 @@ import {
     RemovePaymentMethodsFromChannelInput,
     UpdatePaymentMethodInput,
 } from '@vendure/common/lib/generated-types';
-import { omit } from '@vendure/common/lib/omit';
 import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { ForbiddenError, UserInputError } from '../../common/error/errors';
-import { Translated } from '../../common/index';
 import { ListQueryOptions } from '../../common/types/common-types';
+import { Translated } from '../../common/types/locale-types';
 import { assertFound, idsAreEqual } from '../../common/utils';
 import { ConfigService } from '../../config/config.service';
 import { PaymentMethodEligibilityChecker } from '../../config/payment/payment-method-eligibility-checker';
@@ -34,7 +33,6 @@ import { CustomFieldRelationService } from '../helpers/custom-field-relation/cus
 import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
 import { TranslatableSaver } from '../helpers/translatable-saver/translatable-saver';
 import { TranslatorService } from '../helpers/translator/translator.service';
-import { patchEntity } from '../helpers/utils/patch-entity';
 
 import { ChannelService } from './channel.service';
 import { RoleService } from './role.service';

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

@@ -8,7 +8,7 @@ import { ID } from '@vendure/common/lib/shared-types';
 import { FindManyOptions, Like } from 'typeorm';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { Translated } from '../../common/types/locale-types';
 import { assertFound, idsAreEqual } from '../../common/utils';
 import { Logger } from '../../config/logger/vendure-logger';

packages/core/src/service/services/product-variant.service.ts

@@ -23,8 +23,8 @@ import { roundMoney } from '../../common/round-money';
 import { ListQueryOptions } from '../../common/types/common-types';
 import { Translated } from '../../common/types/locale-types';
 import { idsAreEqual } from '../../common/utils';
+import { UpdatedProductVariantPrice } from '../../config/catalog/product-variant-price-update-strategy';
 import { ConfigService } from '../../config/config.service';
-import { UpdatedProductVariantPrice } from '../../config/index';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import {
     Channel,

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

@@ -18,7 +18,7 @@ import { unique } from '@vendure/common/lib/unique';
 import { In, IsNull } from 'typeorm';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { ErrorResultUnion, JustErrorResults } from '../../common/error/error-result';
 import { IllegalOperationError, UserInputError } from '../../common/error/errors';
 import { MissingConditionsError } from '../../common/error/generated-graphql-admin-errors';

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

@@ -8,7 +8,7 @@ import {
 import { ID, PaginatedList, Type } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { ListQueryOptions } from '../../common/types/common-types';
 import { Translated } from '../../common/types/locale-types';
 import { assertFound } from '../../common/utils';

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

@@ -16,7 +16,7 @@ import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { unique } from '@vendure/common/lib/unique';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { getAllPermissionsMetadata } from '../../common/constants';
 import {
     EntityNotFoundError,

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

@@ -8,8 +8,8 @@ import {
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../../api/common/request-context';
-import { assertFound } from '../../common/index';
 import { ListQueryOptions } from '../../common/types/common-types';
+import { assertFound } from '../../common/utils';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { Seller } from '../../entity/seller/seller.entity';
 import { EventBus, SellerEvent } from '../../event-bus/index';

packages/core/src/service/services/shipping-method.service.ts

@@ -14,10 +14,10 @@ import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { IsNull } from 'typeorm';
 
 import { RequestContext } from '../../api/common/request-context';
-import { RelationPaths } from '../../api/index';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
 import { EntityNotFoundError, ForbiddenError, UserInputError } from '../../common/error/errors';
-import { Translated } from '../../common/index';
 import { ListQueryOptions } from '../../common/types/common-types';
+import { Translated } from '../../common/types/locale-types';
 import { assertFound, idsAreEqual } from '../../common/utils';
 import { ConfigService } from '../../config/config.service';
 import { Logger } from '../../config/logger/vendure-logger';

packages/core/src/service/services/stock-level.service.ts

@@ -1,10 +1,12 @@
 import { Injectable } from '@nestjs/common';
 import { ID } from '@vendure/common/lib/shared-types';
 
-import { RequestContext } from '../../api/index';
-import { AvailableStock, ConfigService } from '../../config/index';
-import { TransactionalConnection } from '../../connection/index';
-import { ProductVariant, StockLevel } from '../../entity/index';
+import { RequestContext } from '../../api/common/request-context';
+import { AvailableStock } from '../../config/catalog/stock-location-strategy';
+import { ConfigService } from '../../config/config.service';
+import { TransactionalConnection } from '../../connection/transactional-connection';
+import { ProductVariant } from '../../entity/product-variant/product-variant.entity';
+import { StockLevel } from '../../entity/stock-level/stock-level.entity';
 
 import { StockLocationService } from './stock-location.service';
 

packages/core/src/service/services/stock-location.service.ts

@@ -11,18 +11,20 @@ import {
 } from '@vendure/common/lib/generated-types';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 
-import { RelationPaths, RequestContext } from '../../api/index';
-import { RequestContextCacheService } from '../../cache/index';
+import { RequestContext } from '../../api/common/request-context';
+import { RelationPaths } from '../../api/decorators/relations.decorator';
+import { RequestContextCacheService } from '../../cache/request-context-cache.service';
 import {
     EntityNotFoundError,
     ForbiddenError,
-    idsAreEqual,
-    ListQueryOptions,
     UserInputError,
-} from '../../common/index';
-import { ConfigService } from '../../config/index';
-import { TransactionalConnection } from '../../connection/index';
-import { OrderLine, StockLevel } from '../../entity/index';
+} from '../../common/error/errors';
+import { ListQueryOptions } from '../../common/types/common-types';
+import { idsAreEqual } from '../../common/utils';
+import { ConfigService } from '../../config/config.service';
+import { TransactionalConnection } from '../../connection/transactional-connection';
+import { OrderLine } from '../../entity/order-line/order-line.entity';
+import { StockLevel } from '../../entity/stock-level/stock-level.entity';
 import { StockLocation } from '../../entity/stock-location/stock-location.entity';
 import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
 import { RequestContextService } from '../helpers/request-context/request-context.service';

packages/core/src/service/services/stock-movement.service.ts

@@ -9,15 +9,13 @@ import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { In } from 'typeorm';
 
 import { RequestContext } from '../../api/common/request-context';
-import { InternalServerError } from '../../common/error/errors';
-import { idsAreEqual } from '../../common/index';
-import { ConfigService } from '../../config/index';
+import { idsAreEqual } from '../../common/utils';
+import { ConfigService } from '../../config/config.service';
 import { ShippingCalculator } from '../../config/shipping-method/shipping-calculator';
 import { ShippingEligibilityChecker } from '../../config/shipping-method/shipping-eligibility-checker';
 import { TransactionalConnection } from '../../connection/transactional-connection';
-import { StockLevel, StockLocation } from '../../entity/index';
-import { Order } from '../../entity/order/order.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
+import { Order } from '../../entity/order/order.entity';
 import { ProductVariant } from '../../entity/product-variant/product-variant.entity';
 import { ShippingMethod } from '../../entity/shipping-method/shipping-method.entity';
 import { Allocation } from '../../entity/stock-movement/allocation.entity';

packages/core/src/service/services/tax-category.service.ts

@@ -9,10 +9,9 @@ import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../../api/common/request-context';
 import { EntityNotFoundError } from '../../common/error/errors';
-import { ListQueryOptions } from '../../common/index';
+import { ListQueryOptions } from '../../common/types/common-types';
 import { assertFound } from '../../common/utils';
 import { TransactionalConnection } from '../../connection/transactional-connection';
-import { Tag } from '../../entity/index';
 import { TaxCategory } from '../../entity/tax-category/tax-category.entity';
 import { TaxRate } from '../../entity/tax-rate/tax-rate.entity';
 import { EventBus } from '../../event-bus';

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

@@ -18,7 +18,7 @@ import {
     VerificationTokenExpiredError,
     VerificationTokenInvalidError,
 } from '../../common/error/generated-graphql-shop-errors';
-import { isEmailAddressLike, normalizeEmailAddress } from '../../common/index';
+import { isEmailAddressLike, normalizeEmailAddress } from '../../common/utils';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { NativeAuthenticationMethod } from '../../entity/authentication-method/native-authentication-method.entity';

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

@@ -12,8 +12,8 @@ import { unique } from '@vendure/common/lib/unique';
 import { In } from 'typeorm';
 
 import { RequestContext } from '../../api/common/request-context';
-import { ListQueryOptions } from '../../common/index';
 import { createSelfRefreshingCache, SelfRefreshingCache } from '../../common/self-refreshing-cache';
+import { ListQueryOptions } from '../../common/types/common-types';
 import { assertFound } from '../../common/utils';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';