elasticlink 0.3.0-beta → 0.4.0-beta

package/dist/mapping.types.d.ts

@@ -3,14 +3,34 @@
  * MappingsSchema carries both runtime ES properties and a phantom type M
  * that maps field names to their ES type literals.
  */
-import type { FieldMapping, FieldTypeString } from './index-management.types.js';
-export type MappingsSchema<M extends Record<string, FieldTypeString>> = {
-    readonly _fieldTypes: M;
-    readonly properties: Record<string, FieldMapping>;
+import type { FieldMapping, FieldTypeString, SourceConfig } from './index-management.types.js';
+/**
+ * Options for `mappings()`.
+ *
+ * @param dynamic - Controls how unmapped fields are handled. Defaults to `'strict'`
+ *   to prevent unmapped fields from being silently indexed. Set to `true` to allow
+ *   dynamic mapping, or `'runtime'` for runtime fields.
+ * @param _source - Configure which fields are stored in `_source`.
+ *   Use `{ excludes: ['embedding'] }` to prune large dense_vector fields from
+ *   returned `_source` — they remain searchable via kNN but won't bloat query responses.
+ * @param _meta - Custom metadata to attach to the mapping.
+ */
+export type MappingOptions = {
+    dynamic?: boolean | 'strict' | 'runtime';
+    _source?: SourceConfig;
+    _meta?: Record<string, unknown>;
 };
+export type MappingsSchema<M extends Record<string, FieldTypeString>> = Readonly<{
+    _fieldTypes: M;
+    properties: Record<string, FieldMapping>;
+    _mappingOptions?: MappingOptions;
+}>;
 type ESTypeToTS = {
     text: string;
+    match_only_text: string;
     keyword: string;
+    constant_keyword: string;
+    wildcard: string;
     long: number;
     integer: number;
     short: number;
@@ -30,8 +50,10 @@ type ESTypeToTS = {
     geo_shape: Record<string, unknown>;
     dense_vector: number[];
     completion: string;
+    search_as_you_type: string;
     nested: unknown;
     object: unknown;
+    flattened: Record<string, unknown>;
     alias: unknown;
     percolator: unknown;
     integer_range: {
@@ -71,12 +93,13 @@ export type Infer<S> = S extends MappingsSchema<infer M> ? {
 export type FieldsOfType<M extends Record<string, FieldTypeString>, Types extends FieldTypeString> = {
     [K in keyof M]: M[K] extends Types ? K : never;
 }[keyof M];
-export type TextFields<M extends Record<string, FieldTypeString>> = FieldsOfType<M, 'text'>;
-export type KeywordFields<M extends Record<string, FieldTypeString>> = FieldsOfType<M, 'keyword'>;
+export type TextFields<M extends Record<string, FieldTypeString>> = FieldsOfType<M, 'text' | 'match_only_text' | 'search_as_you_type'>;
+export type KeywordFields<M extends Record<string, FieldTypeString>> = FieldsOfType<M, 'keyword' | 'constant_keyword' | 'wildcard'>;
 export type NumericFields<M extends Record<string, FieldTypeString>> = FieldsOfType<M, 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float' | 'half_float' | 'scaled_float'>;
 export type DateFields<M extends Record<string, FieldTypeString>> = FieldsOfType<M, 'date'>;
 export type BooleanFields<M extends Record<string, FieldTypeString>> = FieldsOfType<M, 'boolean'>;
 export type GeoPointFields<M extends Record<string, FieldTypeString>> = FieldsOfType<M, 'geo_point'>;
 export type VectorFields<M extends Record<string, FieldTypeString>> = FieldsOfType<M, 'dense_vector'>;
+export type IpFields<M extends Record<string, FieldTypeString>> = FieldsOfType<M, 'ip'>;
 export {};
 //# sourceMappingURL=mapping.types.d.ts.map

package/dist/mapping.types.d.ts.map

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

package/dist/multi-search.builder.d.ts

@@ -13,7 +13,7 @@ export declare const createMSearchBuilder: <M extends Record<string, FieldTypeSt
 /**
  * Create a new multi-search builder
  * @example
- * const ms = msearch<typeof productMappings._fieldTypes>()
+ * const ms = msearch(productMappings)
  *   .addQuery(query1.build(), { index: 'products' })
  *   .addQuery(query2.build(), { index: 'products' })
  *   .build();

package/dist/multi-search.builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multi-search.builder.d.ts","sourceRoot":"","sources":["../src/multi-search.builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzE;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC5E,WAAU,cAAc,CAAC,CAAC,CAAC,EAAO,KACjC,cAAc,CAAC,CAAC,CAwBjB,CAAC;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC/D,SAAS,cAAc,CAAC,CAAC,CAAC,sBACE,CAAC"}
+{"version":3,"file":"multi-search.builder.d.ts","sourceRoot":"","sources":["../src/multi-search.builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzE;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC5E,WAAU,cAAc,CAAC,CAAC,CAAC,EAAO,KACjC,cAAc,CAAC,CAAC,CAwBjB,CAAC;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,SAAS,cAAc,CAAC,CAAC,CAAC,sBAClE,CAAC"}

package/dist/multi-search.builder.js

@@ -13,15 +13,17 @@ export const createMSearchBuilder = (searches = []) => ({
     addQuery: (body, header = {}) => {
         return createMSearchBuilder([...searches, { header, body }]);
     },
+    // eslint-disable-next-line functional/functional-parameters
     build: () => {
-        return (searches
+        return `${searches
             .map(({ header, body }) => {
             const headerLine = JSON.stringify(header || {});
             const bodyLine = JSON.stringify(body);
             return `${headerLine}\n${bodyLine}`;
         })
-            .join('\n') + '\n');
+            .join('\n')}\n`;
     },
+    // eslint-disable-next-line functional/functional-parameters
     buildArray: () => {
         return searches.flatMap(({ header, body }) => [header || {}, body]);
     }
@@ -29,7 +31,7 @@ export const createMSearchBuilder = (searches = []) => ({
 /**
  * Create a new multi-search builder
  * @example
- * const ms = msearch<typeof productMappings._fieldTypes>()
+ * const ms = msearch(productMappings)
  *   .addQuery(query1.build(), { index: 'products' })
  *   .addQuery(query2.build(), { index: 'products' })
  *   .build();

package/dist/query.builder.d.ts

@@ -1,7 +1,3 @@
-/**
- * Query builder implementation
- * Builds type-safe Elasticsearch queries with a fluent API
- */
 import type { FieldTypeString } from './index-management.types.js';
 import type { QueryState, QueryBuilder } from './query.types.js';
 export declare const createQueryBuilder: <M extends Record<string, FieldTypeString>>(state?: QueryState<M>) => QueryBuilder<M>;

package/dist/query.builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.builder.d.ts","sourceRoot":"","sources":["../src/query.builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAiB,MAAM,kBAAkB,CAAC;AAuEhF,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC1E,QAAO,UAAU,CAAC,CAAC,CAAM,KACxB,YAAY,CAAC,CAAC,CA4Sf,CAAC"}
+{"version":3,"file":"query.builder.d.ts","sourceRoot":"","sources":["../src/query.builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAiB,MAAM,kBAAkB,CAAC;AA6EhF,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC1E,QAAO,UAAU,CAAC,CAAC,CAAM,KACxB,YAAY,CAAC,CAAC,CAyMf,CAAC"}

package/dist/query.builder.js

@@ -1,81 +1,73 @@
-/**
- * Query builder implementation
- * Builds type-safe Elasticsearch queries with a fluent API
- */
 import { createAggregationBuilder } from './aggregation.builder.js';
 import { createSuggesterBuilder } from './suggester.builder.js';
-const createClauseBuilder = () => ({
-    matchAll: () => ({ match_all: {} }),
-    match: (field, value, options) => {
-        if (!options || Object.keys(options).length === 0) {
-            return { match: { [field]: value } };
-        }
-        return { match: { [field]: { query: value, ...options } } };
-    },
-    multiMatch: (fields, query, options) => {
-        if (!options || Object.keys(options).length === 0) {
-            return { multi_match: { fields, query } };
-        }
-        return { multi_match: { fields, query, ...options } };
-    },
-    matchPhrase: (field, query) => ({ match_phrase: { [field]: query } }),
-    matchPhrasePrefix: (field, value, options) => {
-        if (!options || Object.keys(options).length === 0) {
-            return { match_phrase_prefix: { [field]: value } };
-        }
-        return { match_phrase_prefix: { [field]: { query: value, ...options } } };
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const createClauseMethods = (wrap) => ({
+    // eslint-disable-next-line functional/functional-parameters
+    matchAll: () => wrap({ match_all: {} }),
+    match: (field, value, options) => wrap({ match: { [field]: options ? { query: value, ...options } : value } }),
+    multiMatch: (fields, query, options) => wrap({ multi_match: { fields, query, ...(options && options) } }),
+    matchPhrase: (field, query) => wrap({ match_phrase: { [field]: query } }),
+    matchPhrasePrefix: (field, value, options) => wrap({ match_phrase_prefix: { [field]: options ? { query: value, ...options } : value } }),
+    term: (field, value) => wrap({ term: { [field]: value } }),
+    terms: (field, value) => wrap({ terms: { [field]: value } }),
+    range: (field, conditions) => wrap({ range: { [field]: conditions } }),
+    exists: (field) => wrap({ exists: { field } }),
+    prefix: (field, value) => wrap({ prefix: { [field]: value } }),
+    wildcard: (field, value) => wrap({ wildcard: { [field]: value } }),
+    fuzzy: (field, value, options) => wrap({ fuzzy: { [field]: options ? { value, ...options } : { value } } }),
+    ids: (values) => wrap({ ids: { values } }),
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    script: (options) => {
+        const { source, lang = 'painless', params, boost } = options;
+        return wrap({
+            script: {
+                script: { source, lang, ...(params !== undefined && { params }) },
+                ...(boost !== undefined && { boost })
+            }
+        });
     },
-    term: (field, value) => ({ term: { [field]: value } }),
-    terms: (field, value) => ({ terms: { [field]: value } }),
-    range: (field, conditions) => ({ range: { [field]: conditions } }),
-    exists: (field) => ({ exists: { field } }),
-    prefix: (field, value) => ({ prefix: { [field]: value } }),
-    wildcard: (field, value) => ({ wildcard: { [field]: value } }),
-    fuzzy: (field, value, options) => {
-        if (!options || Object.keys(options).length === 0) {
-            return { fuzzy: { [field]: { value } } };
+    combinedFields: (fields, query, options) => wrap({ combined_fields: { fields, query, ...(options && options) } }),
+    queryString: (query, options) => wrap({ query_string: { query, ...(options && options) } }),
+    simpleQueryString: (query, options) => wrap({ simple_query_string: { query, ...(options && options) } }),
+    moreLikeThis: (fields, like, options) => wrap({
+        more_like_this: {
+            fields,
+            like: Array.isArray(like) ? like : [like],
+            ...(options && options)
         }
-        return { fuzzy: { [field]: { value, ...options } } };
-    },
-    ids: (values) => ({ ids: { values } }),
+    }),
+    matchBoolPrefix: (field, value, options) => wrap({ match_bool_prefix: { [field]: options ? { query: value, ...options } : value } })
+});
+// eslint-disable-next-line functional/functional-parameters
+const createClauseBuilder = () => ({
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ...createClauseMethods((dsl) => dsl),
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     knn: (field, queryVector, options) => {
-        const { k, num_candidates, filter, boost, similarity } = options;
+        const { k, num_candidates, ...restOptions } = options;
         return {
             knn: {
-                field: String(field),
+                field,
                 query_vector: queryVector,
                 k,
                 num_candidates,
-                ...(filter ? { filter } : {}),
-                ...(boost ? { boost } : {}),
-                ...(similarity !== undefined ? { similarity } : {})
+                ...(restOptions && restOptions)
             }
         };
     },
-    script: (options) => {
-        const { source, lang = 'painless', params, boost } = options;
-        return {
-            script: {
-                script: { source, lang, ...(params ? { params } : {}) },
-                ...(boost ? { boost } : {})
-            }
-        };
-    },
-    when: (condition, thenFn, elseFn) => {
-        if (condition) {
-            return thenFn(createClauseBuilder());
-        }
-        return elseFn ? elseFn(createClauseBuilder()) : undefined;
-    }
+    when: (condition, thenFn, elseFn) => condition ? thenFn(createClauseBuilder()) : elseFn ? elseFn(createClauseBuilder()) : undefined
 });
 export const createQueryBuilder = (state = {}) => ({
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ...createClauseMethods((dsl) => createQueryBuilder({ ...state, query: dsl })),
+    // eslint-disable-next-line functional/functional-parameters
     bool: () => createQueryBuilder({ ...state, query: { bool: {} } }),
     must: (builderFn) => {
         const clause = builderFn(createClauseBuilder());
         const existing = state.query?.bool?.must || [];
         return createQueryBuilder({
             ...state,
-            query: { bool: { ...state.query.bool, must: [...existing, clause] } }
+            query: { bool: { ...state.query.bool, must: [...existing, clause].filter((c) => c !== undefined) } }
         });
     },
     mustNot: (builderFn) => {
@@ -83,7 +75,7 @@ export const createQueryBuilder = (state = {}) => ({
         const existing = state.query?.bool?.must_not || [];
         return createQueryBuilder({
             ...state,
-            query: { bool: { ...state.query.bool, must_not: [...existing, clause] } }
+            query: { bool: { ...state.query.bool, must_not: [...existing, clause].filter((c) => c !== undefined) } }
         });
     },
     should: (builderFn) => {
@@ -91,7 +83,7 @@ export const createQueryBuilder = (state = {}) => ({
         const existing = state.query?.bool?.should || [];
         return createQueryBuilder({
             ...state,
-            query: { bool: { ...state.query.bool, should: [...existing, clause] } }
+            query: { bool: { ...state.query.bool, should: [...existing, clause].filter((c) => c !== undefined) } }
         });
     },
     filter: (builderFn) => {
@@ -99,116 +91,36 @@ export const createQueryBuilder = (state = {}) => ({
         const existing = state.query?.bool?.filter || [];
         return createQueryBuilder({
             ...state,
-            query: { bool: { ...state.query.bool, filter: [...existing, clause] } }
+            query: { bool: { ...state.query.bool, filter: [...existing, clause].filter((c) => c !== undefined) } }
         });
     },
     minimumShouldMatch: (value) => createQueryBuilder({
         ...state,
         query: { bool: { ...state.query.bool, minimum_should_match: value } }
     }),
-    matchAll: () => createQueryBuilder({ ...state, query: { match_all: {} } }),
-    match: (field, value, options) => {
-        if (!options || Object.keys(options).length === 0) {
-            return createQueryBuilder({
-                ...state,
-                query: { match: { [field]: value } }
-            });
-        }
-        return createQueryBuilder({
-            ...state,
-            query: { match: { [field]: { query: value, ...options } } }
-        });
-    },
-    multiMatch: (fields, query, options) => {
-        if (!options || Object.keys(options).length === 0) {
-            return createQueryBuilder({
-                ...state,
-                query: { multi_match: { fields, query } }
-            });
-        }
-        return createQueryBuilder({
-            ...state,
-            query: { multi_match: { fields, query, ...options } }
-        });
-    },
-    matchPhrase: (field, value) => createQueryBuilder({
-        ...state,
-        query: { match_phrase: { [field]: value } }
-    }),
-    matchPhrasePrefix: (field, value, options) => {
-        if (!options || Object.keys(options).length === 0) {
-            return createQueryBuilder({
-                ...state,
-                query: { match_phrase_prefix: { [field]: value } }
-            });
-        }
-        return createQueryBuilder({
-            ...state,
-            query: { match_phrase_prefix: { [field]: { query: value, ...options } } }
-        });
-    },
-    term: (field, value) => createQueryBuilder({ ...state, query: { term: { [field]: value } } }),
-    terms: (field, values) => createQueryBuilder({ ...state, query: { terms: { [field]: values } } }),
-    range: (field, conditions) => createQueryBuilder({
-        ...state,
-        query: { range: { [field]: conditions } }
-    }),
-    exists: (field) => createQueryBuilder({ ...state, query: { exists: { field } } }),
-    prefix: (field, value) => createQueryBuilder({ ...state, query: { prefix: { [field]: value } } }),
-    wildcard: (field, value) => createQueryBuilder({
-        ...state,
-        query: { wildcard: { [field]: value } }
-    }),
-    fuzzy: (field, value, options) => {
-        if (!options || Object.keys(options).length === 0) {
-            return createQueryBuilder({
-                ...state,
-                query: { fuzzy: { [field]: { value } } }
-            });
-        }
-        return createQueryBuilder({
-            ...state,
-            query: { fuzzy: { [field]: { value, ...options } } }
-        });
-    },
-    ids: (values) => createQueryBuilder({ ...state, query: { ids: { values } } }),
-    nested: (path, fn, options) => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const nestedQuery = fn(createClauseBuilder());
-        return createQueryBuilder({
-            ...state,
-            query: {
-                nested: {
-                    path,
-                    query: nestedQuery,
-                    ...(options && Object.keys(options).length > 0 ? options : {})
-                }
-            }
-        });
-    },
     knn: (field, queryVector, options) => {
-        const { k, num_candidates, filter, boost, similarity } = options;
+        const { k, num_candidates, ...restOptions } = options;
         return createQueryBuilder({
             ...state,
             knn: {
-                field: String(field),
+                field,
                 query_vector: queryVector,
                 k,
                 num_candidates,
-                ...(filter ? { filter } : {}),
-                ...(boost ? { boost } : {}),
-                ...(similarity !== undefined ? { similarity } : {})
+                ...(restOptions && restOptions)
             }
         });
     },
-    script: (options) => {
-        const { source, lang = 'painless', params, boost } = options;
+    nested: (path, fn, options) => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const nestedQuery = fn(createClauseBuilder());
         return createQueryBuilder({
             ...state,
             query: {
-                script: {
-                    script: { source, lang, ...(params ? { params } : {}) },
-                    ...(boost ? { boost } : {})
+                nested: {
+                    path,
+                    query: nestedQuery,
+                    ...(options && options)
                 }
             }
         });
@@ -221,22 +133,15 @@ export const createQueryBuilder = (state = {}) => ({
             query: {
                 script_score: {
                     query: innerQuery,
-                    script: { source, lang, ...(params ? { params } : {}) },
-                    ...(options?.min_score !== undefined
-                        ? { min_score: options.min_score }
-                        : {}),
-                    ...(options?.boost ? { boost: options.boost } : {})
+                    script: { source, lang, ...(params !== undefined && { params }) },
+                    ...(options?.min_score !== undefined && { min_score: options.min_score }),
+                    ...(options?.boost !== undefined && { boost: options.boost })
                 }
             }
         });
     },
     percolate: (options) => createQueryBuilder({ ...state, query: { percolate: { ...options } } }),
-    when: (condition, thenFn, elseFn) => {
-        if (condition) {
-            return thenFn(createQueryBuilder(state));
-        }
-        return elseFn ? elseFn(createQueryBuilder(state)) : undefined;
-    },
+    when: (condition, thenFn, elseFn) => condition ? thenFn(createQueryBuilder(state)) : elseFn ? elseFn(createQueryBuilder(state)) : undefined,
     sort: (field, direction = 'asc') => {
         const existing = state.sort || [];
         return createQueryBuilder({
@@ -255,13 +160,10 @@ export const createQueryBuilder = (state = {}) => ({
     seqNoPrimaryTerm: (seq_no_primary_term) => createQueryBuilder({ ...state, seq_no_primary_term }),
     trackTotalHits: (track_total_hits = true) => createQueryBuilder({ ...state, track_total_hits }),
     highlight: (fields, options) => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const highlightFields = {};
         const { pre_tags, post_tags, ...fieldOptions } = options || {};
-        for (const field of fields) {
-            highlightFields[field] =
-                Object.keys(fieldOptions).length > 0 ? fieldOptions : {};
-        }
+        const fieldValue = Object.keys(fieldOptions).length > 0 ? fieldOptions : {};
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const highlightFields = Object.fromEntries(fields.map((field) => [field, fieldValue]));
         return createQueryBuilder({
             ...state,
             highlight: {
@@ -273,28 +175,20 @@ export const createQueryBuilder = (state = {}) => ({
     },
     geoDistance: (field, center, options) => createQueryBuilder({
         ...state,
-        query: { geo_distance: { [String(field)]: center, ...options } }
+        query: { geo_distance: { [field]: center, ...options } }
     }),
     geoBoundingBox: (field, options) => createQueryBuilder({
         ...state,
-        query: { geo_bounding_box: { [String(field)]: options } }
+        query: { geo_bounding_box: { [field]: options } }
     }),
     geoPolygon: (field, options) => createQueryBuilder({
         ...state,
-        query: { geo_polygon: { [String(field)]: options } }
+        query: { geo_polygon: { [field]: options } }
+    }),
+    regexp: (field, value, options) => createQueryBuilder({
+        ...state,
+        query: { regexp: { [field]: options ? { value, ...options } : value } }
     }),
-    regexp: (field, value, options) => {
-        if (!options || Object.keys(options).length === 0) {
-            return createQueryBuilder({
-                ...state,
-                query: { regexp: { [String(field)]: value } }
-            });
-        }
-        return createQueryBuilder({
-            ...state,
-            query: { regexp: { [String(field)]: { value, ...options } } }
-        });
-    },
     constantScore: (fn, options) => {
         const clause = fn(createClauseBuilder());
         return createQueryBuilder({
@@ -302,11 +196,36 @@ export const createQueryBuilder = (state = {}) => ({
             query: {
                 constant_score: {
                     filter: clause,
-                    ...(options && Object.keys(options).length > 0 ? options : {})
+                    ...(options && options)
+                }
+            }
+        });
+    },
+    searchAfter: (values) => createQueryBuilder({ ...state, search_after: values }),
+    preference: (value) => createQueryBuilder({ ...state, preference: value }),
+    collapse: (field, options) => createQueryBuilder({
+        ...state,
+        collapse: {
+            field,
+            ...(options && options)
+        }
+    }),
+    rescore: (queryFn, windowSize, options) => {
+        const rescoreQuery = queryFn(createClauseBuilder());
+        return createQueryBuilder({
+            ...state,
+            rescore: {
+                window_size: windowSize,
+                query: {
+                    rescore_query: rescoreQuery,
+                    ...(options && options)
                 }
             }
         });
     },
+    storedFields: (fields) => createQueryBuilder({ ...state, stored_fields: fields }),
+    terminateAfter: (count) => createQueryBuilder({ ...state, terminate_after: count }),
+    indicesBoost: (boosts) => createQueryBuilder({ ...state, indices_boost: boosts }),
     aggs: (fn) => {
         const aggBuilder = createAggregationBuilder();
         const builtAggs = fn(aggBuilder).build();
@@ -320,8 +239,10 @@ export const createQueryBuilder = (state = {}) => ({
             suggest: builtSuggestions.suggest
         });
     },
+    // eslint-disable-next-line functional/functional-parameters
     build: () => {
         const { _includeQuery, ...rest } = state;
+        // eslint-disable-next-line functional/no-conditional-statements
         if (_includeQuery === false) {
             const { query: _q, ...noQuery } = rest;
             return noQuery;