refactor(elasticsearch-plugin): Reorganize files

packages/elasticsearch-plugin/e2e/e2e-helpers.ts

@@ -5,7 +5,7 @@ import { SimpleGraphQLClient } from '@vendure/testing';
 import { SearchGetPrices, SearchInput } from '../../core/e2e/graphql/generated-e2e-admin-types';
 import { LogicalOperator, SearchProductsShop } from '../../core/e2e/graphql/generated-e2e-shop-types';
 import { SEARCH_PRODUCTS_SHOP } from '../../core/e2e/graphql/shop-definitions';
-import { deleteIndices } from '../src/indexing-utils';
+import { deleteIndices } from '../src/indexing/indexing-utils';
 
 import { SEARCH_GET_PRICES, SEARCH_PRODUCTS } from './elasticsearch-plugin.e2e-spec';
 import { SearchProductsAdmin } from './graphql/generated-e2e-elasticsearch-plugin-types';

packages/elasticsearch-plugin/src/graphql-schema-extensions.ts → packages/elasticsearch-plugin/src/api/api-extensions.ts

@@ -1,7 +1,7 @@
 import { gql } from 'apollo-server-core';
 import { DocumentNode } from 'graphql';
 
-import { ElasticsearchOptions } from './options';
+import { ElasticsearchOptions } from '../options';
 
 export function generateSchemaExtensions(options: ElasticsearchOptions): DocumentNode {
     const customMappingTypes = generateCustomMappingTypes(options);

packages/elasticsearch-plugin/src/custom-mappings.resolver.ts → packages/elasticsearch-plugin/src/api/custom-mappings.resolver.ts

@@ -2,8 +2,8 @@ import { Inject } from '@nestjs/common';
 import { ResolveField, Resolver } from '@nestjs/graphql';
 import { DeepRequired } from '@vendure/common/lib/shared-types';
 
-import { ELASTIC_SEARCH_OPTIONS } from './constants';
-import { ElasticsearchOptions } from './options';
+import { ELASTIC_SEARCH_OPTIONS } from '../constants';
+import { ElasticsearchOptions } from '../options';
 
 /**
  * This resolver is only required if both customProductMappings and customProductVariantMappings are

packages/elasticsearch-plugin/src/custom-script-fields.resolver.ts → packages/elasticsearch-plugin/src/api/custom-script-fields.resolver.ts

@@ -2,8 +2,8 @@ import { Inject } from '@nestjs/common';
 import { ResolveField, Resolver } from '@nestjs/graphql';
 import { DeepRequired } from '@vendure/common/lib/shared-types';
 
-import { ELASTIC_SEARCH_OPTIONS } from './constants';
-import { ElasticsearchOptions } from './options';
+import { ELASTIC_SEARCH_OPTIONS } from '../constants';
+import { ElasticsearchOptions } from '../options';
 
 /**
  * This resolver is only required if scriptFields are defined for both products and product variants.

packages/elasticsearch-plugin/src/elasticsearch-resolver.ts → packages/elasticsearch-plugin/src/api/elasticsearch-resolver.ts

@@ -16,8 +16,8 @@ import {
     SearchResolver,
 } from '@vendure/core';
 
-import { ElasticsearchService } from './elasticsearch.service';
-import { ElasticSearchInput, SearchPriceData } from './types';
+import { ElasticsearchService } from '../elasticsearch.service';
+import { ElasticSearchInput, SearchPriceData } from '../types';
 
 @Resolver('SearchResponse')
 export class ShopElasticSearchResolver implements Pick<SearchResolver, 'search'> {

packages/elasticsearch-plugin/src/elasticsearch.service.ts

@@ -18,8 +18,8 @@ import equal from 'fast-deep-equal/es6';
 
 import { buildElasticBody } from './build-elastic-body';
 import { ELASTIC_SEARCH_OPTIONS, loggerCtx, VARIANT_INDEX_NAME } from './constants';
-import { ElasticsearchIndexService } from './elasticsearch-index.service';
-import { createIndices, getClient } from './indexing-utils';
+import { ElasticsearchIndexService } from './indexing/elasticsearch-index.service';
+import { createIndices, getClient } from './indexing/indexing-utils';
 import { ElasticsearchOptions } from './options';
 import {
     CustomMapping,

packages/elasticsearch-plugin/src/elasticsearch-index.service.ts → packages/elasticsearch-plugin/src/indexing/elasticsearch-index.service.ts

@@ -13,8 +13,9 @@ import {
 } from '@vendure/core';
 import { Observable } from 'rxjs';
 
+import { UpdateIndexQueueJobData } from '../types';
+
 import { ElasticsearchIndexerController, ReindexMessageResponse } from './indexer.controller';
-import { UpdateIndexQueueJobData } from './types';
 
 @Injectable()
 export class ElasticsearchIndexService implements OnApplicationBootstrap {

packages/elasticsearch-plugin/src/indexer.controller.ts → packages/elasticsearch-plugin/src/indexing/indexer.controller.ts

@@ -25,9 +25,8 @@ import {
 } from '@vendure/core';
 import { Observable } from 'rxjs';
 
-import { ELASTIC_SEARCH_OPTIONS, loggerCtx, VARIANT_INDEX_NAME } from './constants';
-import { createIndices, getClient, getIndexNameByAlias } from './indexing-utils';
-import { ElasticsearchOptions } from './options';
+import { ELASTIC_SEARCH_OPTIONS, loggerCtx, VARIANT_INDEX_NAME } from '../constants';
+import { ElasticsearchOptions } from '../options';
 import {
     BulkOperation,
     BulkOperationDoc,
@@ -41,7 +40,9 @@ import {
     UpdateVariantsByIdMessageData,
     VariantChannelMessageData,
     VariantIndexItem,
-} from './types';
+} from '../types';
+
+import { createIndices, getClient, getIndexNameByAlias } from './indexing-utils';
 
 export const defaultProductRelations: Array<EntityRelationPaths<Product>> = [
     'variants',

packages/elasticsearch-plugin/src/indexing-utils.ts → packages/elasticsearch-plugin/src/indexing/indexing-utils.ts

@@ -1,9 +1,9 @@
 import { Client } from '@elastic/elasticsearch';
 import { DeepRequired, ID, Logger } from '@vendure/core';
 
-import { loggerCtx, VARIANT_INDEX_NAME } from './constants';
-import { ElasticsearchOptions } from './options';
-import { VariantIndexItem } from './types';
+import { loggerCtx, VARIANT_INDEX_NAME } from '../constants';
+import { ElasticsearchOptions } from '../options';
+import { VariantIndexItem } from '../types';
 
 export async function createIndices(
     client: Client,

packages/elasticsearch-plugin/src/plugin.ts

@@ -21,19 +21,19 @@ import {
 } from '@vendure/core';
 import { buffer, debounceTime, delay, filter, map } from 'rxjs/operators';
 
-import { ELASTIC_SEARCH_OPTIONS, loggerCtx } from './constants';
-import { CustomMappingsResolver } from './custom-mappings.resolver';
-import { CustomScriptFieldsResolver } from './custom-script-fields.resolver';
-import { ElasticsearchIndexService } from './elasticsearch-index.service';
+import { generateSchemaExtensions } from './api/api-extensions';
+import { CustomMappingsResolver } from './api/custom-mappings.resolver';
+import { CustomScriptFieldsResolver } from './api/custom-script-fields.resolver';
 import {
     AdminElasticSearchResolver,
     EntityElasticSearchResolver,
     ShopElasticSearchResolver,
-} from './elasticsearch-resolver';
+} from './api/elasticsearch-resolver';
+import { ELASTIC_SEARCH_OPTIONS, loggerCtx } from './constants';
 import { ElasticsearchHealthIndicator } from './elasticsearch.health';
 import { ElasticsearchService } from './elasticsearch.service';
-import { generateSchemaExtensions } from './graphql-schema-extensions';
-import { ElasticsearchIndexerController } from './indexer.controller';
+import { ElasticsearchIndexService } from './indexing/elasticsearch-index.service';
+import { ElasticsearchIndexerController } from './indexing/indexer.controller';
 import { ElasticsearchOptions, ElasticsearchRuntimeOptions, mergeWithDefaults } from './options';
 
 /**