@vendure/elasticsearch-plugin 1.2.2 → 1.3.0

package/lib/src/{graphql-schema-extensions.d.ts → api/api-extensions.d.ts}

@@ -1,3 +1,3 @@
 import { DocumentNode } from 'graphql';
-import { ElasticsearchOptions } from './options';
+import { ElasticsearchOptions } from '../options';
 export declare function generateSchemaExtensions(options: ElasticsearchOptions): DocumentNode;

package/lib/src/{graphql-schema-extensions.js → api/api-extensions.js}

@@ -4,83 +4,134 @@ exports.generateSchemaExtensions = void 0;
 const apollo_server_core_1 = require("apollo-server-core");
 function generateSchemaExtensions(options) {
     const customMappingTypes = generateCustomMappingTypes(options);
-    return apollo_server_core_1.gql `
-        extend type SearchResponse {
-            prices: SearchResponsePriceData!
-        }
-
-        type SearchResponsePriceData {
-            range: PriceRange!
-            rangeWithTax: PriceRange!
-            buckets: [PriceRangeBucket!]!
-            bucketsWithTax: [PriceRangeBucket!]!
-        }
-
-        type PriceRangeBucket {
-            to: Int!
-            count: Int!
-        }
-
-        extend input SearchInput {
-            priceRange: PriceRangeInput
-            priceRangeWithTax: PriceRangeInput
-        }
-
-        input PriceRangeInput {
-            min: Int!
-            max: Int!
-        }
-
-        ${customMappingTypes ? customMappingTypes : ''}
+    const inputExtensions = Object.entries(options.extendSearchInputType || {});
+    return apollo_server_core_1.gql `
+        extend type SearchResponse {
+            prices: SearchResponsePriceData!
+        }
+
+        extend type SearchResult {
+            inStock: Boolean
+        }
+
+        type SearchResponsePriceData {
+            range: PriceRange!
+            rangeWithTax: PriceRange!
+            buckets: [PriceRangeBucket!]!
+            bucketsWithTax: [PriceRangeBucket!]!
+        }
+
+        type PriceRangeBucket {
+            to: Int!
+            count: Int!
+        }
+
+        extend input SearchInput {
+            priceRange: PriceRangeInput
+            priceRangeWithTax: PriceRangeInput
+            inStock: Boolean
+            ${inputExtensions.map(([name, type]) => `${name}: ${type}`).join('\n            ')}
+        }
+
+        input PriceRangeInput {
+            min: Int!
+            max: Int!
+        }
+
+        ${customMappingTypes ? customMappingTypes : ''}
     `;
 }
 exports.generateSchemaExtensions = generateSchemaExtensions;
 function generateCustomMappingTypes(options) {
+    var _a, _b;
     const productMappings = Object.entries(options.customProductMappings || {});
     const variantMappings = Object.entries(options.customProductVariantMappings || {});
+    const searchInputTypeExtensions = Object.entries(options.extendSearchInputType || {});
+    const scriptProductFields = Object.entries(((_a = options.searchConfig) === null || _a === void 0 ? void 0 : _a.scriptFields) || {}).filter(([, scriptField]) => scriptField.context !== 'variant');
+    const scriptVariantFields = Object.entries(((_b = options.searchConfig) === null || _b === void 0 ? void 0 : _b.scriptFields) || {}).filter(([, scriptField]) => scriptField.context !== 'product');
+    let sdl = ``;
+    if (scriptProductFields.length || scriptVariantFields.length) {
+        if (scriptProductFields.length) {
+            sdl += `
+            type CustomProductScriptFields {
+                ${scriptProductFields.map(([name, def]) => `${name}: ${def.graphQlType}`)}
+            }
+            `;
+        }
+        if (scriptVariantFields.length) {
+            sdl += `
+            type CustomProductVariantScriptFields {
+                ${scriptVariantFields.map(([name, def]) => `${name}: ${def.graphQlType}`)}
+            }
+            `;
+        }
+        if (scriptProductFields.length && scriptVariantFields.length) {
+            sdl += `
+                union CustomScriptFields = CustomProductScriptFields | CustomProductVariantScriptFields
+
+                extend type SearchResult {
+                    customScriptFields: CustomScriptFields!
+                }
+            `;
+        }
+        else if (scriptProductFields.length) {
+            sdl += `
+                extend type SearchResult {
+                    customScriptFields: CustomProductScriptFields!
+                }
+            `;
+        }
+        else if (scriptVariantFields.length) {
+            sdl += `
+                extend type SearchResult {
+                    customScriptFields: CustomProductVariantScriptFields!
+                }
+            `;
+        }
+    }
     if (productMappings.length || variantMappings.length) {
-        let sdl = ``;
         if (productMappings.length) {
-            sdl += `
-            type CustomProductMappings {
-                ${productMappings.map(([name, def]) => `${name}: ${def.graphQlType}`)}
-            }
+            sdl += `
+            type CustomProductMappings {
+                ${productMappings.map(([name, def]) => `${name}: ${def.graphQlType}`)}
+            }
             `;
         }
         if (variantMappings.length) {
-            sdl += `
-            type CustomProductVariantMappings {
-                ${variantMappings.map(([name, def]) => `${name}: ${def.graphQlType}`)}
-            }
+            sdl += `
+            type CustomProductVariantMappings {
+                ${variantMappings.map(([name, def]) => `${name}: ${def.graphQlType}`)}
+            }
             `;
         }
         if (productMappings.length && variantMappings.length) {
-            sdl += `
-                union CustomMappings = CustomProductMappings | CustomProductVariantMappings
-
-                extend type SearchResult {
-                    customMappings: CustomMappings!
-                }
+            sdl += `
+                union CustomMappings = CustomProductMappings | CustomProductVariantMappings
+
+                extend type SearchResult {
+                    customMappings: CustomMappings!
+                }
             `;
         }
         else if (productMappings.length) {
-            sdl += `
-                extend type SearchResult {
-                    customMappings: CustomProductMappings!
-                }
+            sdl += `
+                extend type SearchResult {
+                    customMappings: CustomProductMappings!
+                }
             `;
         }
         else if (variantMappings.length) {
-            sdl += `
-                extend type SearchResult {
-                    customMappings: CustomProductVariantMappings!
-                }
+            sdl += `
+                extend type SearchResult {
+                    customMappings: CustomProductVariantMappings!
+                }
             `;
         }
-        return apollo_server_core_1.gql `
-            ${sdl}
-        `;
     }
-    return;
+    return sdl.length
+        ? apollo_server_core_1.gql `
+              ${sdl}
+          `
+        : undefined;
 }
-//# sourceMappingURL=graphql-schema-extensions.js.map
+//# sourceMappingURL=api-extensions.js.map

package/lib/src/api/api-extensions.js.map

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

package/lib/src/{custom-mappings.resolver.d.ts → api/custom-mappings.resolver.d.ts}

@@ -1,5 +1,5 @@
 import { DeepRequired } from '@vendure/common/lib/shared-types';
-import { ElasticsearchOptions } from './options';
+import { ElasticsearchOptions } from '../options';
 /**
  * This resolver is only required if both customProductMappings and customProductVariantMappings are
  * defined, since this particular configuration will result in a union type for the

package/lib/src/{custom-mappings.resolver.js → api/custom-mappings.resolver.js}

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomMappingsResolver = void 0;
 const common_1 = require("@nestjs/common");
 const graphql_1 = require("@nestjs/graphql");
-const constants_1 = require("./constants");
+const constants_1 = require("../constants");
 /**
  * This resolver is only required if both customProductMappings and customProductVariantMappings are
  * defined, since this particular configuration will result in a union type for the

package/lib/src/api/custom-mappings.resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-mappings.resolver.js","sourceRoot":"","sources":["../../../src/api/custom-mappings.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwC;AACxC,6CAAyD;AAGzD,4CAAsD;AAGtD;;;;GAIG;AAEH,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAC/B,YAAoD,OAA2C;QAA3C,YAAO,GAAP,OAAO,CAAoC;IAAG,CAAC;IAGnG,aAAa,CAAC,KAAU;QACpB,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAC7E,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAClE,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,8BAA8B,CAAC;IACzC,CAAC;CACJ,CAAA;AANG;IADC,sBAAY,EAAE;;;;2DAMd;AATQ,sBAAsB;IADlC,kBAAQ,CAAC,gBAAgB,CAAC;IAEV,WAAA,eAAM,CAAC,kCAAsB,CAAC,CAAA;;GADlC,sBAAsB,CAUlC;AAVY,wDAAsB"}

package/lib/src/api/custom-script-fields.resolver.d.ts

@@ -0,0 +1,12 @@
+import { DeepRequired } from '@vendure/common/lib/shared-types';
+import { ElasticsearchOptions } from '../options';
+/**
+ * This resolver is only required if scriptFields are defined for both products and product variants.
+ * This particular configuration will result in a union type for the
+ * `SearchResult.customScriptFields` GraphQL field.
+ */
+export declare class CustomScriptFieldsResolver {
+    private options;
+    constructor(options: DeepRequired<ElasticsearchOptions>);
+    __resolveType(value: any): string;
+}

package/lib/src/api/custom-script-fields.resolver.js

@@ -0,0 +1,50 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomScriptFieldsResolver = void 0;
+const common_1 = require("@nestjs/common");
+const graphql_1 = require("@nestjs/graphql");
+const constants_1 = require("../constants");
+/**
+ * This resolver is only required if scriptFields are defined for both products and product variants.
+ * This particular configuration will result in a union type for the
+ * `SearchResult.customScriptFields` GraphQL field.
+ */
+let CustomScriptFieldsResolver = class CustomScriptFieldsResolver {
+    constructor(options) {
+        this.options = options;
+    }
+    __resolveType(value) {
+        var _a;
+        const productScriptFields = Object.entries(((_a = this.options.searchConfig) === null || _a === void 0 ? void 0 : _a.scriptFields) || {})
+            .filter(([, scriptField]) => scriptField.context !== 'variant')
+            .map(([k]) => k);
+        return Object.keys(value).every(k => productScriptFields.includes(k))
+            ? 'CustomProductScriptFields'
+            : 'CustomProductVariantScriptFields';
+    }
+};
+__decorate([
+    graphql_1.ResolveField(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", String)
+], CustomScriptFieldsResolver.prototype, "__resolveType", null);
+CustomScriptFieldsResolver = __decorate([
+    graphql_1.Resolver('CustomScriptFields'),
+    __param(0, common_1.Inject(constants_1.ELASTIC_SEARCH_OPTIONS)),
+    __metadata("design:paramtypes", [Object])
+], CustomScriptFieldsResolver);
+exports.CustomScriptFieldsResolver = CustomScriptFieldsResolver;
+//# sourceMappingURL=custom-script-fields.resolver.js.map

package/lib/src/api/custom-script-fields.resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-script-fields.resolver.js","sourceRoot":"","sources":["../../../src/api/custom-script-fields.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwC;AACxC,6CAAyD;AAGzD,4CAAsD;AAGtD;;;;GAIG;AAEH,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IACnC,YAAoD,OAA2C;QAA3C,YAAO,GAAP,OAAO,CAAoC;IAAG,CAAC;IAGnG,aAAa,CAAC,KAAU;;QACpB,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,CAAC,YAAY,0CAAE,YAAY,KAAI,EAAE,CAAC;aACpF,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC;aAC9D,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QACrB,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACjE,CAAC,CAAC,2BAA2B;YAC7B,CAAC,CAAC,kCAAkC,CAAC;IAC7C,CAAC;CACJ,CAAA;AARG;IADC,sBAAY,EAAE;;;;+DAQd;AAXQ,0BAA0B;IADtC,kBAAQ,CAAC,oBAAoB,CAAC;IAEd,WAAA,eAAM,CAAC,kCAAsB,CAAC,CAAA;;GADlC,0BAA0B,CAYtC;AAZY,gEAA0B"}

package/lib/src/{elasticsearch-resolver.d.ts → api/elasticsearch-resolver.d.ts}

@@ -1,9 +1,9 @@
 import { Job as GraphQLJob, QuerySearchArgs, SearchResponse } from '@vendure/common/lib/generated-types';
 import { Omit } from '@vendure/common/lib/omit';
-import { Collection, FacetValue, RequestContext, SearchResolver } from '@vendure/core';
-import { ElasticsearchService } from './elasticsearch.service';
-import { ElasticSearchInput, SearchPriceData } from './types';
-export declare class ShopElasticSearchResolver implements Omit<SearchResolver, 'facetValues' | 'collections' | 'reindex'> {
+import { Collection, FacetValue, RequestContext, SearchJobBufferService, SearchResolver } from '@vendure/core';
+import { ElasticsearchService } from '../elasticsearch.service';
+import { ElasticSearchInput, SearchPriceData } from '../types';
+export declare class ShopElasticSearchResolver implements Pick<SearchResolver, 'search'> {
     private elasticsearchService;
     constructor(elasticsearchService: ElasticsearchService);
     search(ctx: RequestContext, args: QuerySearchArgs): Promise<Omit<SearchResponse, 'facetValues' | 'collections'>>;
@@ -11,11 +11,14 @@ export declare class ShopElasticSearchResolver implements Omit<SearchResolver, '
         input: ElasticSearchInput;
     }): Promise<SearchPriceData>;
 }
-export declare class AdminElasticSearchResolver implements Omit<SearchResolver, 'facetValues' | 'collections'> {
+export declare class AdminElasticSearchResolver implements Pick<SearchResolver, 'search' | 'reindex'> {
     private elasticsearchService;
-    constructor(elasticsearchService: ElasticsearchService);
+    private searchJobBufferService;
+    constructor(elasticsearchService: ElasticsearchService, searchJobBufferService: SearchJobBufferService);
     search(ctx: RequestContext, args: QuerySearchArgs): Promise<Omit<SearchResponse, 'facetValues' | 'collections'>>;
     reindex(ctx: RequestContext): Promise<GraphQLJob>;
+    pendingSearchIndexUpdates(...args: any[]): Promise<any>;
+    runPendingSearchIndexUpdates(...args: any[]): Promise<any>;
 }
 export declare class EntityElasticSearchResolver implements Pick<SearchResolver, 'facetValues' | 'collections'> {
     private elasticsearchService;

package/lib/src/{elasticsearch-resolver.js → api/elasticsearch-resolver.js}

@@ -16,7 +16,7 @@ exports.EntityElasticSearchResolver = exports.AdminElasticSearchResolver = expor
 const graphql_1 = require("@nestjs/graphql");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
 const core_1 = require("@vendure/core");
-const elasticsearch_service_1 = require("./elasticsearch.service");
+const elasticsearch_service_1 = require("../elasticsearch.service");
 let ShopElasticSearchResolver = class ShopElasticSearchResolver {
     constructor(elasticsearchService) {
         this.elasticsearchService = elasticsearchService;
@@ -54,8 +54,9 @@ ShopElasticSearchResolver = __decorate([
 ], ShopElasticSearchResolver);
 exports.ShopElasticSearchResolver = ShopElasticSearchResolver;
 let AdminElasticSearchResolver = class AdminElasticSearchResolver {
-    constructor(elasticsearchService) {
+    constructor(elasticsearchService, searchJobBufferService) {
         this.elasticsearchService = elasticsearchService;
+        this.searchJobBufferService = searchJobBufferService;
     }
     async search(ctx, args) {
         const result = await this.elasticsearchService.search(ctx, args.input, false);
@@ -66,6 +67,14 @@ let AdminElasticSearchResolver = class AdminElasticSearchResolver {
     async reindex(ctx) {
         return this.elasticsearchService.reindex(ctx);
     }
+    async pendingSearchIndexUpdates(...args) {
+        return this.searchJobBufferService.getPendingSearchUpdates();
+    }
+    async runPendingSearchIndexUpdates(...args) {
+        // Intentionally not awaiting this method call
+        this.searchJobBufferService.runPendingSearchUpdates();
+        return { success: true };
+    }
 };
 __decorate([
     graphql_1.Query(),
@@ -84,9 +93,24 @@ __decorate([
     __metadata("design:paramtypes", [core_1.RequestContext]),
     __metadata("design:returntype", Promise)
 ], AdminElasticSearchResolver.prototype, "reindex", null);
+__decorate([
+    graphql_1.Query(),
+    core_1.Allow(generated_types_1.Permission.UpdateCatalog, generated_types_1.Permission.UpdateProduct),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], AdminElasticSearchResolver.prototype, "pendingSearchIndexUpdates", null);
+__decorate([
+    graphql_1.Mutation(),
+    core_1.Allow(generated_types_1.Permission.UpdateCatalog, generated_types_1.Permission.UpdateProduct),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], AdminElasticSearchResolver.prototype, "runPendingSearchIndexUpdates", null);
 AdminElasticSearchResolver = __decorate([
     graphql_1.Resolver('SearchResponse'),
-    __metadata("design:paramtypes", [elasticsearch_service_1.ElasticsearchService])
+    __metadata("design:paramtypes", [elasticsearch_service_1.ElasticsearchService,
+        core_1.SearchJobBufferService])
 ], AdminElasticSearchResolver);
 exports.AdminElasticSearchResolver = AdminElasticSearchResolver;
 let EntityElasticSearchResolver = class EntityElasticSearchResolver {

package/lib/src/api/elasticsearch-resolver.js.map

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

package/lib/src/build-elastic-body.js

@@ -7,7 +7,7 @@ const core_1 = require("@vendure/core");
  * Given a SearchInput object, returns the corresponding Elasticsearch body.
  */
 function buildElasticBody(input, searchConfig, channelId, languageCode, enabledOnly = false) {
-    const { term, facetValueIds, facetValueOperator, collectionId, collectionSlug, groupByProduct, skip, take, sort, priceRangeWithTax, priceRange, facetValueFilters, } = input;
+    const { term, facetValueIds, facetValueOperator, collectionId, collectionSlug, groupByProduct, skip, take, sort, priceRangeWithTax, priceRange, facetValueFilters, inStock, } = input;
     const query = {
         bool: {},
     };
@@ -69,11 +69,20 @@ function buildElasticBody(input, searchConfig, channelId, languageCode, enabledO
     }
     if (priceRange) {
         ensureBoolFilterExists(query);
-        query.bool.filter = query.bool.filter.concat(createPriceFilters(priceRange, false, !!groupByProduct));
+        query.bool.filter = query.bool.filter.concat(createPriceFilters(priceRange, false));
     }
     if (priceRangeWithTax) {
         ensureBoolFilterExists(query);
-        query.bool.filter = query.bool.filter.concat(createPriceFilters(priceRangeWithTax, true, !!groupByProduct));
+        query.bool.filter = query.bool.filter.concat(createPriceFilters(priceRangeWithTax, true));
+    }
+    if (inStock !== undefined) {
+        ensureBoolFilterExists(query);
+        if (groupByProduct) {
+            query.bool.filter.push({ term: { productInStock: inStock } });
+        }
+        else {
+            query.bool.filter.push({ term: { inStock } });
+        }
     }
     const sortArray = [];
     if (sort) {
@@ -83,19 +92,23 @@ function buildElasticBody(input, searchConfig, channelId, languageCode, enabledO
             });
         }
         if (sort.price) {
-            const priceField = groupByProduct ? 'priceMin' : 'price';
+            const priceField = 'price';
             sortArray.push({ [priceField]: { order: sort.price === generated_types_1.SortOrder.ASC ? 'asc' : 'desc' } });
         }
     }
-    return {
-        query: searchConfig.mapQuery
+    const scriptFields = createScriptFields(searchConfig.scriptFields, input, groupByProduct);
+    const body = Object.assign({ query: searchConfig.mapQuery
             ? searchConfig.mapQuery(query, input, searchConfig, channelId, enabledOnly)
-            : query,
-        sort: sortArray,
-        from: skip || 0,
-        size: take || 10,
-        track_total_hits: searchConfig.totalItemsMaxSize,
-    };
+            : query, sort: sortArray, from: skip || 0, size: take || 10, track_total_hits: searchConfig.totalItemsMaxSize }, (scriptFields !== undefined
+        ? {
+            _source: true,
+            script_fields: scriptFields,
+        }
+        : undefined));
+    if (groupByProduct) {
+        body.collapse = { field: `productId` };
+    }
+    return body;
 }
 exports.buildElasticBody = buildElasticBody;
 function ensureBoolFilterExists(query) {
@@ -103,37 +116,39 @@ function ensureBoolFilterExists(query) {
         query.bool.filter = [];
     }
 }
-function createPriceFilters(range, withTax, groupByProduct) {
-    const withTaxFix = withTax ? 'WithTax' : '';
-    if (groupByProduct) {
-        return [
-            {
-                range: {
-                    [`price${withTaxFix}Min`]: {
-                        gte: range.min,
-                    },
-                },
-            },
-            {
-                range: {
-                    [`price${withTaxFix}Max`]: {
-                        lte: range.max,
-                    },
-                },
-            },
-        ];
+function createScriptFields(scriptFields, input, groupByProduct) {
+    if (scriptFields) {
+        const fields = Object.keys(scriptFields);
+        if (fields.length) {
+            const result = {};
+            for (const name of fields) {
+                const scriptField = scriptFields[name];
+                if (scriptField.context === 'product' && groupByProduct === true) {
+                    result[name] = scriptField.scriptFn(input);
+                }
+                if (scriptField.context === 'variant' && groupByProduct === false) {
+                    result[name] = scriptField.scriptFn(input);
+                }
+                if (scriptField.context === 'both' || scriptField.context === undefined) {
+                    result[name] = scriptField.scriptFn(input);
+                }
+            }
+            return result;
+        }
     }
-    else {
-        return [
-            {
-                range: {
-                    ['price' + withTaxFix]: {
-                        gte: range.min,
-                        lte: range.max,
-                    },
+    return undefined;
+}
+function createPriceFilters(range, withTax) {
+    const withTaxFix = withTax ? 'WithTax' : '';
+    return [
+        {
+            range: {
+                ['price' + withTaxFix]: {
+                    gte: range.min,
+                    lte: range.max,
                 },
             },
-        ];
-    }
+        },
+    ];
 }
 //# sourceMappingURL=build-elastic-body.js.map

package/lib/src/build-elastic-body.js.map

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

package/lib/src/constants.d.ts

@@ -1,4 +1,3 @@
 export declare const ELASTIC_SEARCH_OPTIONS: unique symbol;
 export declare const VARIANT_INDEX_NAME = "variants";
-export declare const PRODUCT_INDEX_NAME = "products";
 export declare const loggerCtx = "ElasticsearchPlugin";

package/lib/src/constants.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loggerCtx = exports.PRODUCT_INDEX_NAME = exports.VARIANT_INDEX_NAME = exports.ELASTIC_SEARCH_OPTIONS = void 0;
+exports.loggerCtx = exports.VARIANT_INDEX_NAME = exports.ELASTIC_SEARCH_OPTIONS = void 0;
 exports.ELASTIC_SEARCH_OPTIONS = Symbol('ELASTIC_SEARCH_OPTIONS');
 exports.VARIANT_INDEX_NAME = 'variants';
-exports.PRODUCT_INDEX_NAME = 'products';
 exports.loggerCtx = 'ElasticsearchPlugin';
 //# sourceMappingURL=constants.js.map

package/lib/src/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAC1D,QAAA,kBAAkB,GAAG,UAAU,CAAC;AAChC,QAAA,kBAAkB,GAAG,UAAU,CAAC;AAChC,QAAA,SAAS,GAAG,qBAAqB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAC1D,QAAA,kBAAkB,GAAG,UAAU,CAAC;AAChC,QAAA,SAAS,GAAG,qBAAqB,CAAC"}

package/lib/src/elasticsearch.service.d.ts

@@ -1,6 +1,6 @@
 import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { Collection, CollectionService, ConfigService, DeepRequired, FacetValue, FacetValueService, Job, RequestContext, SearchService } from '@vendure/core';
-import { ElasticsearchIndexService } from './elasticsearch-index.service';
+import { ElasticsearchIndexService } from './indexing/elasticsearch-index.service';
 import { ElasticsearchOptions } from './options';
 import { ElasticSearchInput, ElasticSearchResponse, SearchPriceData } from './types';
 export declare class ElasticsearchService implements OnModuleInit, OnModuleDestroy {
@@ -20,6 +20,7 @@ export declare class ElasticsearchService implements OnModuleInit, OnModuleDestr
      * Perform a fulltext search according to the provided input arguments.
      */
     search(ctx: RequestContext, input: ElasticSearchInput, enabledOnly?: boolean): Promise<Omit<ElasticSearchResponse, 'facetValues' | 'collections' | 'priceRange'>>;
+    totalHits(ctx: RequestContext, input: ElasticSearchInput, enabledOnly?: boolean): Promise<number>;
     /**
      * Return a list of all FacetValues which appear in the result set.
      */
@@ -34,6 +35,13 @@ export declare class ElasticsearchService implements OnModuleInit, OnModuleDestr
         collection: Collection;
         count: number;
     }>>;
+    getDistinctBucketsOfField(ctx: RequestContext, input: ElasticSearchInput, enabledOnly: boolean | undefined, field: string, aggregation_max_size: number): Promise<Array<{
+        key: string;
+        doc_count: number;
+        total: {
+            value: number;
+        };
+    }>>;
     priceRange(ctx: RequestContext, input: ElasticSearchInput): Promise<SearchPriceData>;
     /**
      * Rebuilds the full search index.
@@ -42,5 +50,6 @@ export declare class ElasticsearchService implements OnModuleInit, OnModuleDestr
     private mapVariantToSearchResult;
     private mapProductToSearchResult;
     private getSearchResultAssets;
-    private addCustomMappings;
+    private static addCustomMappings;
+    private static addScriptMappings;
 }