xlucene-translator 1.9.4 → 1.10.0

package/dist/src/translator/utils.d.ts

@@ -1,12 +1,12 @@
-import * as p from 'xlucene-parser';
-import * as i from '@terascope/types';
+import { type Parser, type TermLikeNode } from 'xlucene-parser';
+import type { ElasticsearchDSLResult, AnyQuery, BoolQuery, BoolQueryTypes } from '@terascope/types';
 import { UtilsTranslateQueryOptions } from './interfaces.js';
-export declare function translateQuery(parser: p.Parser, options: UtilsTranslateQueryOptions): i.ElasticsearchDSLResult;
-export declare function isMultiMatch(node: p.TermLikeNode): boolean;
-export declare function getTermField(node: p.TermLikeNode): string;
-export declare function flattenQuery(query: i.AnyQuery | undefined, flattenTo: i.BoolQueryTypes): i.AnyQuery[];
+export declare function translateQuery(parser: Parser, options: UtilsTranslateQueryOptions): ElasticsearchDSLResult;
+export declare function isMultiMatch(node: TermLikeNode): boolean;
+export declare function getTermField(node: TermLikeNode): string;
+export declare function flattenQuery(query: AnyQuery | undefined, flattenTo: BoolQueryTypes): AnyQuery[];
 /** This prevents double nested queries that do the same thing */
-export declare function canFlattenBoolQuery(query: i.BoolQuery, flattenTo: i.BoolQueryTypes): boolean;
-export declare function isBoolQuery(query: unknown): query is i.BoolQuery;
-export declare function compactFinalQuery(query?: i.AnyQuery): i.AnyQuery | i.AnyQuery[];
+export declare function canFlattenBoolQuery(query: BoolQuery, flattenTo: BoolQueryTypes): boolean;
+export declare function isBoolQuery(query: unknown): query is BoolQuery;
+export declare function compactFinalQuery(query?: AnyQuery): AnyQuery | AnyQuery[];
 //# sourceMappingURL=utils.d.ts.map

package/dist/src/translator/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/translator/utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,KAAK,CAAC,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAkB7D,wBAAgB,cAAc,CAC1B,MAAM,EAAE,CAAC,CAAC,MAAM,EAChB,OAAO,EAAE,0BAA0B,GACpC,CAAC,CAAC,sBAAsB,CA4U1B;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,YAAY,GAAG,OAAO,CAE1D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,YAAY,GAAG,MAAM,CAEzD;AAED,wBAAgB,YAAY,CACxB,KAAK,EAAE,CAAC,CAAC,QAAQ,GAAG,SAAS,EAC7B,SAAS,EAAE,CAAC,CAAC,cAAc,GAC5B,CAAC,CAAC,QAAQ,EAAE,CAMd;AAED,iEAAiE;AACjE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,cAAc,GAAG,OAAO,CAI5F;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,SAAS,CAGhE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,EAAE,CAW/E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/translator/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAMH,KAAK,MAAM,EAAE,KAAK,YAAY,EAIjC,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAGkB,sBAAsB,EAEhD,QAAQ,EAAE,SAAS,EACnB,cAAc,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAwB7D,wBAAgB,cAAc,CAC1B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,0BAA0B,GACpC,sBAAsB,CAsFxB;AAsWD,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAExD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAEvD;AAED,wBAAgB,YAAY,CACxB,KAAK,EAAE,QAAQ,GAAG,SAAS,EAC3B,SAAS,EAAE,cAAc,GAC1B,QAAQ,EAAE,CAMZ;AAED,iEAAiE;AACjE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,GAAG,OAAO,CAIxF;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAG9D;AAED,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAWzE"}

package/dist/src/translator/utils.js

@@ -1,285 +1,360 @@
 import { TSError, isString, isArray, isEmpty, matchWildcard } from '@terascope/utils';
-import * as p from 'xlucene-parser';
+import { isEmptyNode, isWildcardField, isTerm, parseRange, isRange, isRegexp, isWildcard, isFunctionNode, initFunction, getFieldValue, isGroupLike, isNegation, isExists, isTermType, isConjunction, } from 'xlucene-parser';
 export function translateQuery(parser, options) {
-    const { logger, type_config: typeConfig, variables } = options;
-    let sort;
-    function buildAnyQuery(node) {
-        // if no field and is wildcard
-        if (p.isWildcard(node)
-            && !node.field
-            && p.getFieldValue(node.value, variables) === '*') {
-            return {
-                bool: {
-                    filter: [],
-                },
-            };
-        }
-        if (p.isGroupLike(node)) {
-            return buildBoolQuery(node);
-        }
-        if (p.isNegation(node)) {
-            return buildNegationQuery(node);
-        }
-        if (p.isExists(node)) {
-            return buildExistsQuery(node);
-        }
-        if (p.isTermType(node)) {
-            const query = buildTermLevelQuery(node);
-            if (query)
-                return query;
-        }
-        const error = new TSError(`Unexpected problem when translating xlucene query ${parser.query}`, {
-            context: {
-                node,
-                ast: parser.ast,
-            },
-        });
-        logger.error(error);
+    const context = {
+        ...options
+    };
+    // TODO: this should probably reference the search type from opensearch, maybe not
+    let topLevelQuery;
+    if (isEmptyNode(parser.ast)) {
+        topLevelQuery = {
+            match_all: {},
+        };
     }
-    function buildTermLevelQuery(node) {
-        if (p.isWildcardField(node)) {
-            if (isEmpty(typeConfig)) {
-                throw new Error(`Configuration for type_config needs to be provided with fields related to ${node.field}`);
+    else {
+        let hasKNN = false;
+        let allANDConjunctions = true;
+        parser.walkAST((node) => {
+            if (isFunctionNode(node) && node.name === 'knn') {
+                hasKNN = true;
+                return;
             }
-            const should = Object.keys(typeConfig)
-                .filter((field) => matchWildcard(node.field, field))
-                .map((field) => Object.assign({}, node, { field }))
-                .map((newNode) => buildTermLevelQuery(newNode));
-            return {
-                bool: {
-                    should
+            if (isConjunction(node)) {
+                if (node.nodes.length === 1) {
+                    allANDConjunctions = false;
+                    return;
                 }
-            };
+            }
+        });
+        let anyQuery = null;
+        if (hasKNN && allANDConjunctions) {
+            anyQuery = buildKNNQuery(parser, context);
         }
-        if (p.isTerm(node)) {
-            return buildTermQuery(node);
+        else {
+            anyQuery = buildAnyQuery(parser.ast, context);
         }
-        if (p.isRegexp(node)) {
-            return buildRegExprQuery(node);
+        if (anyQuery == null) {
+            const error = new TSError(`Unexpected problem when translating xlucene query ${parser.query}`, {
+                context: {
+                    ast: parser.ast,
+                },
+            });
+            options.logger.error(error);
         }
-        if (p.isWildcard(node)) {
-            return buildWildcardQuery(node);
+        const filter = compactFinalQuery(anyQuery);
+        if (isArray(filter) && !filter.length) {
+            // match_none because an empty filter can
+            // throw a parsing exception
+            topLevelQuery = {
+                match_none: {}
+            };
         }
-        if (p.isRange(node)) {
-            return buildRangeQuery(node);
+        else if (hasKNN && allANDConjunctions) {
+            // @ts-expect-error
+            topLevelQuery = {
+                ...anyQuery
+            };
         }
-        if (p.isFunctionNode(node)) {
-            const instance = p.initFunction({ node, variables, type_config: typeConfig });
-            const { query, sort: sortQuery } = instance.toElasticsearchQuery(getTermField(node), options);
-            // TODO: review how sort works in this module
-            if (sortQuery != null) {
-                if (!sort) {
-                    sort = sortQuery;
-                }
-                else if (Array.isArray(sort)) {
-                    sort.push(sortQuery);
-                }
-                else {
-                    sort = [sort, sortQuery];
+        else {
+            topLevelQuery = {
+                constant_score: {
+                    filter
                 }
-            }
-            return query;
+            };
         }
     }
-    function buildMultiMatchQuery(node, query) {
-        const multiMatchQuery = {
-            multi_match: {
-                query,
-            },
+    let { sort } = context;
+    if (!sort && options.default_geo_field && options.geo_sort_point) {
+        sort = {
+            _geo_distance: {
+                order: options.geo_sort_order,
+                unit: options.geo_sort_unit,
+                [options.default_geo_field]: options.geo_sort_point,
+            }
         };
-        logger.trace('built multi-match query', { node, multiMatchQuery });
-        return multiMatchQuery;
     }
-    function buildRangeQuery(node) {
-        if (isMultiMatch(node)) {
-            if (!node.right) {
-                return;
-            }
-            const leftValue = p.getFieldValue(node.left.value, variables);
-            const query = `${node.left.operator}${leftValue}`;
-            return buildMultiMatchQuery(node, query);
+    return {
+        query: topLevelQuery,
+        // avoid setting it to undefined
+        ...(sort && { sort })
+    };
+}
+function buildTermLevelQuery(node, context) {
+    if (isWildcardField(node)) {
+        if (isEmpty(context.type_config)) {
+            throw new Error(`Configuration for type_config needs to be provided with fields related to ${node.field}`);
         }
-        const field = getTermField(node);
-        const rangeQuery = {
-            range: {
-                [field]: p.parseRange(node, variables, true),
-            },
+        const should = Object.keys(context.type_config)
+            .filter((field) => matchWildcard(node.field, field))
+            .map((field) => Object.assign({}, node, { field }))
+            .map((newNode) => buildTermLevelQuery(newNode, context));
+        return {
+            bool: {
+                should
+            }
         };
-        logger.trace('built range query', { node, rangeQuery });
-        return rangeQuery;
     }
-    function buildTermQuery(node) {
-        const value = p.getFieldValue(node.value, variables, true);
-        if (value == null)
+    if (isTerm(node)) {
+        return buildTermQuery(node, context);
+    }
+    if (isRegexp(node)) {
+        return buildRegExprQuery(node, context);
+    }
+    if (isWildcard(node)) {
+        return buildWildcardQuery(node, context);
+    }
+    if (isRange(node)) {
+        return buildRangeQuery(node, context);
+    }
+    if (isFunctionNode(node)) {
+        const { variables, type_config } = context;
+        const instance = initFunction({ node, variables, type_config });
+        const { query, sort: sortQuery } = instance.toElasticsearchQuery(getTermField(node), context);
+        // TODO: review how sort works in this module
+        if (sortQuery != null) {
+            if (!context.sort) {
+                context.sort = sortQuery;
+            }
+            else if (Array.isArray(context.sort)) {
+                context.sort.push(sortQuery);
+            }
+            else {
+                context.sort = [context.sort, sortQuery];
+            }
+        }
+        return query;
+    }
+}
+function buildExistsQuery(node) {
+    const existsQuery = {
+        exists: {
+            field: node.field,
+        },
+    };
+    return existsQuery;
+}
+function buildBoolQuery(node, context) {
+    const should = [];
+    for (const conj of node.flow) {
+        const query = buildConjunctionQuery(conj, context);
+        should.push(...flattenQuery(query, 'should'));
+    }
+    if (!should.length)
+        return;
+    const boolQuery = {
+        bool: {
+            should,
+        },
+    };
+    return boolQuery;
+}
+function buildConjunctionQuery(conj, context) {
+    const filter = [];
+    for (const node of conj.nodes) {
+        const query = buildAnyQuery(node, context);
+        filter.push(...flattenQuery(query, 'filter'));
+    }
+    // should match if AND statement
+    if (!filter.length || conj.nodes.length !== filter.length)
+        return;
+    return {
+        bool: {
+            filter,
+        },
+    };
+}
+function buildNegationQuery(node, context) {
+    const query = buildAnyQuery(node.node, context);
+    if (!query)
+        return;
+    const mustNot = flattenQuery(query, 'must_not');
+    return {
+        bool: {
+            must_not: mustNot,
+        },
+    };
+}
+function buildMultiMatchQuery(node, query) {
+    const multiMatchQuery = {
+        multi_match: {
+            query,
+        },
+    };
+    return multiMatchQuery;
+}
+function buildRangeQuery(node, context) {
+    if (isMultiMatch(node)) {
+        if (!node.right) {
             return;
-        if (isMultiMatch(node)) {
-            const query = `${value}`;
-            return buildMultiMatchQuery(node, query);
         }
-        const field = getTermField(node);
-        if (isString(value) || node.analyzed) {
-            const matchQuery = {
-                match: {
-                    [field]: {
-                        operator: 'and',
-                        query: value,
-                    },
+        const leftValue = getFieldValue(node.left.value, context.variables);
+        const query = `${node.left.operator}${leftValue}`;
+        return buildMultiMatchQuery(node, query);
+    }
+    const field = getTermField(node);
+    const rangeQuery = {
+        range: {
+            [field]: parseRange(node, context.variables, true),
+        },
+    };
+    return rangeQuery;
+}
+function buildTermQuery(node, context) {
+    const value = getFieldValue(node.value, context.variables, true);
+    if (value == null)
+        return;
+    if (isMultiMatch(node)) {
+        const query = `${value}`;
+        return buildMultiMatchQuery(node, query);
+    }
+    const field = getTermField(node);
+    if (isString(value) || node.analyzed) {
+        const matchQuery = {
+            match: {
+                [field]: {
+                    operator: 'and',
+                    query: value,
                 },
-            };
-            logger.trace('built match query', { node, matchQuery });
-            return matchQuery;
-        }
-        const termQuery = {
-            term: {
-                [field]: value,
             },
         };
-        logger.trace('built term query', { node, termQuery });
-        return termQuery;
+        return matchQuery;
     }
-    function buildWildcardQuery(node) {
-        const value = p.getFieldValue(node.value, variables, true);
-        if (value == null)
-            return;
-        if (isMultiMatch(node)) {
-            const query = `${value}`;
-            return buildMultiMatchQuery(node, query);
-        }
-        const field = getTermField(node);
-        if (node.analyzed) {
-            return {
-                query_string: {
-                    fields: [field],
-                    query: value
-                }
-            };
-        }
-        const wildcardQuery = {
-            wildcard: {
-                [field]: value,
-            },
+    const termQuery = {
+        term: {
+            [field]: value,
+        },
+    };
+    return termQuery;
+}
+function buildWildcardQuery(node, context) {
+    const value = getFieldValue(node.value, context.variables, true);
+    if (value == null)
+        return;
+    if (isMultiMatch(node)) {
+        const query = `${value}`;
+        return buildMultiMatchQuery(node, query);
+    }
+    const field = getTermField(node);
+    if (node.analyzed) {
+        return {
+            query_string: {
+                fields: [field],
+                query: value
+            }
         };
-        logger.trace('built wildcard query', { node, wildcardQuery });
-        return wildcardQuery;
     }
-    function buildRegExprQuery(node) {
-        const value = p.getFieldValue(node.value, variables, true);
-        if (value == null)
-            return;
-        if (isMultiMatch(node)) {
-            const query = `${value}`;
-            return buildMultiMatchQuery(node, query);
+    const wildcardQuery = {
+        wildcard: {
+            [field]: value,
+        },
+    };
+    return wildcardQuery;
+}
+function buildRegExprQuery(node, context) {
+    const value = getFieldValue(node.value, context.variables, true);
+    if (value == null)
+        return;
+    if (isMultiMatch(node)) {
+        const query = `${value}`;
+        return buildMultiMatchQuery(node, query);
+    }
+    const field = getTermField(node);
+    if (node.analyzed) {
+        return {
+            query_string: {
+                fields: [field],
+                query: `/${value}/`
+            }
+        };
+    }
+    const regexQuery = {
+        regexp: {
+            [field]: {
+                value,
+                flags: 'COMPLEMENT|EMPTY|INTERSECTION|INTERVAL'
+            }
+        },
+    };
+    return regexQuery;
+}
+function buildKNNQuery(parser, context) {
+    let knnQuery;
+    const must = [];
+    parser.walkAST((node) => {
+        if (isFunctionNode(node) && node.name === 'knn') {
+            const { variables, type_config } = context;
+            const instance = initFunction({ node, variables, type_config });
+            const { query } = instance.toElasticsearchQuery(getTermField(node), context);
+            knnQuery = query;
+        }
+        else if (isTermType(node)) {
+            const query = buildTermLevelQuery(node, context);
+            if (query)
+                must.push(query);
+        }
+        else if (isNegation(node)) {
+            const query = buildNegationQuery(node, context);
+            if (query)
+                must.push(query);
+        }
+        else if (isExists(node)) {
+            must.push(buildExistsQuery(node));
         }
-        const field = getTermField(node);
-        if (node.analyzed) {
-            return {
-                query_string: {
-                    fields: [field],
-                    query: `/${value}/`
+    });
+    const finalQuery = { knn: {} };
+    if (knnQuery && must.length) {
+        for (const [field, config] of Object.entries(knnQuery.knn)) {
+            const knnConjunction = {
+                ...config,
+                filter: {
+                    bool: {
+                        should: [
+                            {
+                                bool: {
+                                    filter: [
+                                        ...must
+                                    ]
+                                }
+                            }
+                        ]
+                    }
                 }
             };
+            finalQuery.knn[field] = knnConjunction;
         }
-        const regexQuery = {
-            regexp: {
-                [field]: {
-                    value,
-                    flags: 'COMPLEMENT|EMPTY|INTERSECTION|INTERVAL'
-                }
-            },
-        };
-        logger.trace('built regexp query', { node, regexQuery });
-        return regexQuery;
-    }
-    function buildExistsQuery(node) {
-        const existsQuery = {
-            exists: {
-                field: node.field,
-            },
-        };
-        logger.trace('built exists query', { node, existsQuery });
-        return existsQuery;
     }
-    function buildBoolQuery(node) {
-        const should = [];
-        for (const conj of node.flow) {
-            const query = buildConjunctionQuery(conj);
-            should.push(...flattenQuery(query, 'should'));
+    else if (knnQuery) {
+        for (const [field, config] of Object.entries(knnQuery.knn)) {
+            finalQuery.knn[field] = config;
         }
-        if (!should.length)
-            return;
-        const boolQuery = {
-            bool: {
-                should,
-            },
-        };
-        logger.trace('built bool query', { node, boolQuery });
-        return boolQuery;
     }
-    function buildConjunctionQuery(conj) {
-        const filter = [];
-        for (const node of conj.nodes) {
-            const query = buildAnyQuery(node);
-            filter.push(...flattenQuery(query, 'filter'));
-        }
-        // should match if AND statement
-        if (!filter.length || conj.nodes.length !== filter.length)
-            return;
+    return finalQuery;
+}
+function buildAnyQuery(node, context) {
+    // if no field and is wildcard
+    if (isWildcard(node)
+        && !node.field
+        && getFieldValue(node.value, context.variables) === '*') {
         return {
             bool: {
-                filter,
+                filter: [],
             },
         };
     }
-    function buildNegationQuery(node) {
-        const query = buildAnyQuery(node.node);
-        if (!query)
-            return;
-        const mustNot = flattenQuery(query, 'must_not');
-        logger.trace('built negation query', mustNot, node);
-        return {
-            bool: {
-                must_not: mustNot,
-            },
-        };
+    if (isGroupLike(node)) {
+        return buildBoolQuery(node, context);
     }
-    let topLevelQuery;
-    if (p.isEmptyNode(parser.ast)) {
-        topLevelQuery = {
-            match_all: {},
-        };
+    if (isNegation(node)) {
+        return buildNegationQuery(node, context);
     }
-    else {
-        const anyQuery = buildAnyQuery(parser.ast);
-        const filter = compactFinalQuery(anyQuery);
-        if (isArray(filter) && !filter.length) {
-            // match_none because an empty filter can
-            // throw a parsing exception
-            topLevelQuery = {
-                match_none: {}
-            };
-        }
-        else {
-            topLevelQuery = {
-                constant_score: {
-                    filter
-                }
-            };
-        }
+    if (isExists(node)) {
+        return buildExistsQuery(node);
     }
-    if (!sort && options.default_geo_field && options.geo_sort_point) {
-        sort = {
-            _geo_distance: {
-                order: options.geo_sort_order,
-                unit: options.geo_sort_unit,
-                [options.default_geo_field]: options.geo_sort_point,
-            }
-        };
+    if (isTermType(node)) {
+        const query = buildTermLevelQuery(node, context);
+        if (query)
+            return query;
     }
-    return {
-        query: topLevelQuery,
-        // avoid setting it to undefined
-        ...(sort && { sort })
-    };
 }
 export function isMultiMatch(node) {
     return !node.field || node.field === '*';

package/dist/src/translator/utils.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "xlucene-translator",
   "displayName": "xLucene Translator",
-  "version": "1.9.4",
+  "version": "1.10.0",
   "description": "Translate xlucene query to database queries",
   "homepage": "https://github.com/terascope/teraslice/tree/master/packages/xlucene-translator#readme",
   "repository": {
@@ -24,18 +24,21 @@
   "scripts": {
     "build": "tsc --build",
     "build:watch": "yarn build --watch",
-    "test": "TEST_OPENSEARCH='true' node ../scripts/bin/ts-scripts test ../xlucene-translator --",
-    "test:debug": "TEST_OPENSEARCH='true' node ../scripts/bin/ts-scripts test --debug ../xlucene-translator --",
-    "test:watch": "TEST_OPENSEARCH='true' node ../scripts/bin/ts-scripts test --watch ../xlucene-translator --"
+    "test": "TEST_OPENSEARCH='true' OPENSEARCH_VERSION=2.15.0 node ../scripts/bin/ts-scripts test ../xlucene-translator --",
+    "test:debug": "TEST_OPENSEARCH='true' OPENSEARCH_VERSION=2.15.0 node ../scripts/bin/ts-scripts test --debug ../xlucene-translator --",
+    "test:opensearch2": "TEST_OPENSEARCH='true' OPENSEARCH_VERSION=2.15.0 node ../scripts/bin/ts-scripts test ../xlucene-translator --",
+    "test:opensearch3": "TEST_OPENSEARCH='true' OPENSEARCH_VERSION=3.1.0 node ../scripts/bin/ts-scripts test ../xlucene-translator --",
+    "test:watch": "TEST_OPENSEARCH='true' OPENSEARCH_VERSION=2.15.0 node ../scripts/bin/ts-scripts test --watch ../xlucene-translator --"
   },
   "dependencies": {
     "@terascope/types": "~1.4.3",
-    "@terascope/utils": "~1.9.4",
+    "@terascope/utils": "~1.10.0",
     "@types/elasticsearch": "~5.0.43",
-    "xlucene-parser": "~1.9.4"
+    "xlucene-parser": "~1.10.0"
   },
   "devDependencies": {
-    "@terascope/opensearch-client": "~1.0.1",
+    "@terascope/data-types": "~1.11.0",
+    "@terascope/opensearch-client": "~1.1.0",
     "elasticsearch": "~15.4.1"
   },
   "engines": {