xlucene-translator 0.45.0 → 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/src/index.d.ts +2 -2
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +2 -18
- package/dist/src/index.js.map +1 -1
- package/dist/src/query-access/cached-query-access.d.ts +2 -2
- package/dist/src/query-access/cached-query-access.d.ts.map +1 -1
- package/dist/src/query-access/cached-query-access.js +3 -7
- package/dist/src/query-access/cached-query-access.js.map +1 -1
- package/dist/src/query-access/index.d.ts +3 -3
- package/dist/src/query-access/index.d.ts.map +1 -1
- package/dist/src/query-access/index.js +3 -19
- package/dist/src/query-access/index.js.map +1 -1
- package/dist/src/query-access/interfaces.js +1 -2
- package/dist/src/query-access/query-access.d.ts +1 -1
- package/dist/src/query-access/query-access.d.ts.map +1 -1
- package/dist/src/query-access/query-access.js +30 -46
- package/dist/src/query-access/query-access.js.map +1 -1
- package/dist/src/translator/cached-translator.d.ts +2 -2
- package/dist/src/translator/cached-translator.d.ts.map +1 -1
- package/dist/src/translator/cached-translator.js +5 -9
- package/dist/src/translator/cached-translator.js.map +1 -1
- package/dist/src/translator/index.d.ts +3 -3
- package/dist/src/translator/index.d.ts.map +1 -1
- package/dist/src/translator/index.js +3 -19
- package/dist/src/translator/index.js.map +1 -1
- package/dist/src/translator/interfaces.d.ts +2 -2
- package/dist/src/translator/interfaces.d.ts.map +1 -1
- package/dist/src/translator/interfaces.js +1 -2
- package/dist/src/translator/translator.d.ts +2 -2
- package/dist/src/translator/translator.d.ts.map +1 -1
- package/dist/src/translator/translator.js +22 -45
- package/dist/src/translator/translator.js.map +1 -1
- package/dist/src/translator/utils.d.ts +1 -1
- package/dist/src/translator/utils.d.ts.map +1 -1
- package/dist/src/translator/utils.js +13 -46
- package/dist/src/translator/utils.js.map +1 -1
- package/package.json +6 -5
package/README.md
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
> Translate xlucene query to database queries
|
|
6
6
|
|
|
7
|
-
This a package within the [Teraslice](https://github.com/terascope/teraslice) monorepo. See our [documentation](https://terascope.github.io/teraslice/docs/packages/xlucene-translator/overview) for more information or the [issues](https://github.com/terascope/teraslice/issues?q=is%3Aopen+is%3Aissue+label%3Apkg%2Fxlucene-translator) associated with this package
|
|
7
|
+
This is a package within the [Teraslice](https://github.com/terascope/teraslice) monorepo. See our [documentation](https://terascope.github.io/teraslice/docs/packages/xlucene-translator/overview) for more information or the [issues](https://github.com/terascope/teraslice/issues?q=is%3Aopen+is%3Aissue+label%3Apkg%2Fxlucene-translator) associated with this package
|
|
8
8
|
|
|
9
9
|
## Contributing
|
|
10
10
|
|
package/dist/src/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from './query-access';
|
|
2
|
-
export * from './translator';
|
|
1
|
+
export * from './query-access/index.js';
|
|
2
|
+
export * from './translator/index.js';
|
|
3
3
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC"}
|
package/dist/src/index.js
CHANGED
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./query-access"), exports);
|
|
18
|
-
__exportStar(require("./translator"), exports);
|
|
1
|
+
export * from './query-access/index.js';
|
|
2
|
+
export * from './translator/index.js';
|
|
19
3
|
//# sourceMappingURL=index.js.map
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { QueryAccess } from './query-access';
|
|
2
|
-
import { QueryAccessConfig, QueryAccessOptions } from './interfaces';
|
|
1
|
+
import { QueryAccess } from './query-access.js';
|
|
2
|
+
import { QueryAccessConfig, QueryAccessOptions } from './interfaces.js';
|
|
3
3
|
export declare class CachedQueryAccess {
|
|
4
4
|
constructor();
|
|
5
5
|
make<T extends Record<string, any>>(config: QueryAccessConfig<T>, options?: QueryAccessOptions): QueryAccess<T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached-query-access.d.ts","sourceRoot":"","sources":["../../../src/query-access/cached-query-access.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"cached-query-access.d.ts","sourceRoot":"","sources":["../../../src/query-access/cached-query-access.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAKxE,qBAAa,iBAAiB;;IAK1B,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC5B,OAAO,CAAC,EAAE,kBAAkB,GAC7B,WAAW,CAAC,CAAC,CAAC;IAIjB,KAAK,IAAI,IAAI;IAOb,cAAc,IAAI,IAAI;CAKzB"}
|
|
@@ -1,14 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CachedQueryAccess = void 0;
|
|
4
|
-
const query_access_1 = require("./query-access");
|
|
1
|
+
import { QueryAccess } from './query-access.js';
|
|
5
2
|
const _cache = new WeakMap();
|
|
6
|
-
class CachedQueryAccess {
|
|
3
|
+
export class CachedQueryAccess {
|
|
7
4
|
constructor() {
|
|
8
5
|
_cache.set(this, {});
|
|
9
6
|
}
|
|
10
7
|
make(config, options) {
|
|
11
|
-
return new
|
|
8
|
+
return new QueryAccess(config, options);
|
|
12
9
|
}
|
|
13
10
|
reset() {
|
|
14
11
|
this.resetInstances();
|
|
@@ -21,5 +18,4 @@ class CachedQueryAccess {
|
|
|
21
18
|
.forEach((instance) => instance.clearCache());
|
|
22
19
|
}
|
|
23
20
|
}
|
|
24
|
-
exports.CachedQueryAccess = CachedQueryAccess;
|
|
25
21
|
//# sourceMappingURL=cached-query-access.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached-query-access.js","sourceRoot":"","sources":["../../../src/query-access/cached-query-access.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cached-query-access.js","sourceRoot":"","sources":["../../../src/query-access/cached-query-access.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,MAAM,MAAM,GAAG,IAAI,OAAO,EAA6B,CAAC;AAExD,MAAM,OAAO,iBAAiB;IAC1B;QACI,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,CACA,MAA4B,EAC5B,OAA4B;QAE5B,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK;QACD,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,cAAc;QACV,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;aAChB,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;IACtD,CAAC;CACJ"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export * from './cached-query-access';
|
|
2
|
-
export * from './query-access';
|
|
3
|
-
export * from './interfaces';
|
|
1
|
+
export * from './cached-query-access.js';
|
|
2
|
+
export * from './query-access.js';
|
|
3
|
+
export * from './interfaces.js';
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/query-access/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/query-access/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC"}
|
|
@@ -1,20 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./cached-query-access"), exports);
|
|
18
|
-
__exportStar(require("./query-access"), exports);
|
|
19
|
-
__exportStar(require("./interfaces"), exports);
|
|
1
|
+
export * from './cached-query-access.js';
|
|
2
|
+
export * from './query-access.js';
|
|
3
|
+
export * from './interfaces.js';
|
|
20
4
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/query-access/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/query-access/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as ts from '@terascope/utils';
|
|
2
2
|
import * as p from 'xlucene-parser';
|
|
3
3
|
import { SortOrder, GeoDistanceUnit, xLuceneVariables, xLuceneTypeConfig, ClientParams } from '@terascope/types';
|
|
4
|
-
import * as i from './interfaces';
|
|
4
|
+
import * as i from './interfaces.js';
|
|
5
5
|
export declare class QueryAccess<T extends ts.AnyObject = ts.AnyObject> {
|
|
6
6
|
readonly excludes: (keyof T)[];
|
|
7
7
|
readonly includes: (keyof T)[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-access.d.ts","sourceRoot":"","sources":["../../../src/query-access/query-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EACH,SAAS,EACT,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EAGjB,YAAY,EACf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"query-access.d.ts","sourceRoot":"","sources":["../../../src/query-access/query-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EACH,SAAS,EACT,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EAGjB,YAAY,EACf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAErC,qBAAa,WAAW,CAAC,CAAC,SAAS,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS;IAC1D,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;IAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,SAAS,CAAC;IACzC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,eAAe,GAAC,MAAM,CAAC;IACrD,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAC7C,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACrC,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IAErC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwC;IAChE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA4C;gBAE5D,MAAM,GAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAM,EAAE,OAAO,GAAE,CAAC,CAAC,kBAAuB;IA4BnF,UAAU,IAAI,IAAI;IAKlB;;;;OAIG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAI3B;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAgGjB,OAAO,CAAC,mBAAmB;IAwB3B;;;;OAIG;IACG,mBAAmB,CACrB,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,CAAC,CAAC,0BAA0B,EACnC,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,GAC9B,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;IAwErC;;;;OAIG;IACH,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG;QAClE,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAC,SAAS,CAAC;QAChC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAC,SAAS,CAAC;KACnC;IAkBD,OAAO,CAAC,gBAAgB;IA4BxB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,eAAe;CAQ1B"}
|
|
@@ -1,45 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.QueryAccess = void 0;
|
|
27
|
-
const ts = __importStar(require("@terascope/utils"));
|
|
28
|
-
const p = __importStar(require("xlucene-parser"));
|
|
29
|
-
const types_1 = require("@terascope/types");
|
|
30
|
-
const translator_1 = require("../translator");
|
|
31
|
-
class QueryAccess {
|
|
1
|
+
import * as ts from '@terascope/utils';
|
|
2
|
+
import * as p from 'xlucene-parser';
|
|
3
|
+
import { xLuceneFieldType, ElasticsearchDistribution } from '@terascope/types';
|
|
4
|
+
import { CachedTranslator } from '../translator/index.js';
|
|
5
|
+
export class QueryAccess {
|
|
6
|
+
excludes;
|
|
7
|
+
includes;
|
|
8
|
+
constraints;
|
|
9
|
+
preventPrefixWildcard;
|
|
10
|
+
allowImplicitQueries;
|
|
11
|
+
defaultGeoField;
|
|
12
|
+
defaultGeoSortOrder;
|
|
13
|
+
defaultGeoSortUnit;
|
|
14
|
+
allowEmpty;
|
|
15
|
+
typeConfig;
|
|
16
|
+
parsedTypeConfig;
|
|
17
|
+
variables;
|
|
18
|
+
filterNilVariables;
|
|
19
|
+
_parser = new p.CachedParser();
|
|
20
|
+
_translator = new CachedTranslator();
|
|
32
21
|
constructor(config = {}, options = {}) {
|
|
33
|
-
this._parser = new p.CachedParser();
|
|
34
|
-
this._translator = new translator_1.CachedTranslator();
|
|
35
22
|
const { excludes = [], includes = [], constraint, allow_empty_queries: allowEmpty = true, } = config;
|
|
36
23
|
const typeConfig = config.type_config || options.type_config || {};
|
|
37
24
|
const variables = options.variables || {};
|
|
38
25
|
if (ts.isEmpty(typeConfig))
|
|
39
26
|
throw new Error('Configuration for type_config must be provided');
|
|
40
27
|
this.typeConfig = { ...typeConfig };
|
|
41
|
-
this.excludes = excludes
|
|
42
|
-
this.includes = includes
|
|
28
|
+
this.excludes = excludes?.slice();
|
|
29
|
+
this.includes = includes?.slice();
|
|
43
30
|
this.constraints = ts.castArray(constraint).filter(Boolean);
|
|
44
31
|
this.allowEmpty = Boolean(allowEmpty);
|
|
45
32
|
this.preventPrefixWildcard = Boolean(config.prevent_prefix_wildcard);
|
|
@@ -174,8 +161,7 @@ class QueryAccess {
|
|
|
174
161
|
* @returns a restricted elasticsearch search query
|
|
175
162
|
*/
|
|
176
163
|
async restrictSearchQuery(query, opts, _overrideParsedQuery) {
|
|
177
|
-
|
|
178
|
-
const { params: _params = {}, majorVersion = 6, minorVersion = 8, distribution = types_1.ElasticsearchDistribution.elasticsearch, version = '6.8.6', ...options } = opts !== null && opts !== void 0 ? opts : {};
|
|
164
|
+
const { params: _params = {}, majorVersion = 6, minorVersion = 8, distribution = ElasticsearchDistribution.elasticsearch, version = '6.8.6', ...options } = opts ?? {};
|
|
179
165
|
const translateOptions = {
|
|
180
166
|
...options,
|
|
181
167
|
distribution,
|
|
@@ -183,7 +169,7 @@ class QueryAccess {
|
|
|
183
169
|
minorVersion,
|
|
184
170
|
version
|
|
185
171
|
};
|
|
186
|
-
const variables = Object.assign({}, this.variables,
|
|
172
|
+
const variables = Object.assign({}, this.variables, opts?.variables ?? {});
|
|
187
173
|
if (_params._source) {
|
|
188
174
|
throw new Error('Cannot include _source in params, use _sourceInclude or _sourceExclude');
|
|
189
175
|
}
|
|
@@ -201,8 +187,8 @@ class QueryAccess {
|
|
|
201
187
|
const translated = translator.toElasticsearchDSL(translateOptions);
|
|
202
188
|
// keep _sourceInclude && _sourceExclude for backward compatibility
|
|
203
189
|
const { _sourceInclude, _source_includes, _sourceExclude, _source_excludes, ...parsedParams } = params;
|
|
204
|
-
const sourceIncludes = _sourceInclude
|
|
205
|
-
const sourceExcludes = _sourceExclude
|
|
190
|
+
const sourceIncludes = _sourceInclude ?? _source_includes;
|
|
191
|
+
const sourceExcludes = _sourceExclude ?? _source_excludes;
|
|
206
192
|
const { includes, excludes } = this.restrictSourceFields(sourceIncludes, sourceExcludes);
|
|
207
193
|
// we can remove this logic when we can get rid of legacy client
|
|
208
194
|
const isLegacy = version === '6.5';
|
|
@@ -232,7 +218,7 @@ class QueryAccess {
|
|
|
232
218
|
// if there's restricted includes fields (or if not but user requested included fields)
|
|
233
219
|
// then _includes should have length, if not we'd override original restrictions if we
|
|
234
220
|
// sent [] and expose all fields, so just exclude all since requested fields not found.
|
|
235
|
-
const invalid = (this.includes.length ||
|
|
221
|
+
const invalid = (this.includes.length || includes?.length) ? !_includes?.length : false;
|
|
236
222
|
return {
|
|
237
223
|
includes: _includes,
|
|
238
224
|
excludes: invalid ? ['*'] : _excludes,
|
|
@@ -258,12 +244,12 @@ class QueryAccess {
|
|
|
258
244
|
}
|
|
259
245
|
_isFieldRestricted(field) {
|
|
260
246
|
return !Object.entries(this.parsedTypeConfig).some(([typeField, fieldType]) => {
|
|
261
|
-
if (fieldType ===
|
|
247
|
+
if (fieldType === xLuceneFieldType.Object)
|
|
262
248
|
return false;
|
|
263
249
|
const parts = typeField.split('.');
|
|
264
250
|
if (parts.length > 1) {
|
|
265
251
|
const firstPart = parts.slice(0, -1).join('.');
|
|
266
|
-
if (this.typeConfig[firstPart] ===
|
|
252
|
+
if (this.typeConfig[firstPart] === xLuceneFieldType.Object) {
|
|
267
253
|
return matchFieldObject(typeField, field);
|
|
268
254
|
}
|
|
269
255
|
}
|
|
@@ -271,8 +257,7 @@ class QueryAccess {
|
|
|
271
257
|
});
|
|
272
258
|
}
|
|
273
259
|
_addConstraints(parser, options) {
|
|
274
|
-
|
|
275
|
-
if ((_a = this.constraints) === null || _a === void 0 ? void 0 : _a.length) {
|
|
260
|
+
if (this.constraints?.length) {
|
|
276
261
|
const queries = ts.concat(this.constraints, [parser.query]).filter(Boolean);
|
|
277
262
|
if (queries.length === 1)
|
|
278
263
|
return this._parser.make(queries[0], options);
|
|
@@ -281,7 +266,6 @@ class QueryAccess {
|
|
|
281
266
|
return parser;
|
|
282
267
|
}
|
|
283
268
|
}
|
|
284
|
-
exports.QueryAccess = QueryAccess;
|
|
285
269
|
function matchFieldObject(typeField, field) {
|
|
286
270
|
let s = '';
|
|
287
271
|
for (const part of typeField.split('.')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-access.js","sourceRoot":"","sources":["../../../src/query-access/query-access.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"query-access.js","sourceRoot":"","sources":["../../../src/query-access/query-access.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Parser } from 'xlucene-parser';
|
|
2
|
-
import { TranslatorOptions } from './interfaces';
|
|
3
|
-
import { Translator } from './translator';
|
|
2
|
+
import { TranslatorOptions } from './interfaces.js';
|
|
3
|
+
import { Translator } from './translator.js';
|
|
4
4
|
export declare class CachedTranslator {
|
|
5
5
|
constructor();
|
|
6
6
|
make(input: string | Parser, options?: TranslatorOptions): Translator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached-translator.d.ts","sourceRoot":"","sources":["../../../src/translator/cached-translator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"cached-translator.d.ts","sourceRoot":"","sources":["../../../src/translator/cached-translator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C,qBAAa,gBAAgB;;IAKzB,IAAI,CAAC,KAAK,EAAE,MAAM,GAAC,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,UAAU;IAKnE,KAAK,IAAI,IAAI;CAIhB"}
|
|
@@ -1,21 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.CachedTranslator = void 0;
|
|
4
|
-
const utils_1 = require("@terascope/utils");
|
|
5
|
-
const translator_1 = require("./translator");
|
|
1
|
+
import { isString } from '@terascope/utils';
|
|
2
|
+
import { Translator } from './translator.js';
|
|
6
3
|
const _cache = new WeakMap();
|
|
7
|
-
class CachedTranslator {
|
|
4
|
+
export class CachedTranslator {
|
|
8
5
|
constructor() {
|
|
9
6
|
_cache.set(this, {});
|
|
10
7
|
}
|
|
11
8
|
make(input, options) {
|
|
12
|
-
const query =
|
|
13
|
-
return new
|
|
9
|
+
const query = isString(input) ? input : input.query;
|
|
10
|
+
return new Translator(query, options);
|
|
14
11
|
}
|
|
15
12
|
reset() {
|
|
16
13
|
_cache.delete(this);
|
|
17
14
|
_cache.set(this, {});
|
|
18
15
|
}
|
|
19
16
|
}
|
|
20
|
-
exports.CachedTranslator = CachedTranslator;
|
|
21
17
|
//# sourceMappingURL=cached-translator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached-translator.js","sourceRoot":"","sources":["../../../src/translator/cached-translator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cached-translator.js","sourceRoot":"","sources":["../../../src/translator/cached-translator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,MAAM,MAAM,GAAG,IAAI,OAAO,EAA4B,CAAC;AAEvD,MAAM,OAAO,gBAAgB;IACzB;QACI,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,KAAoB,EAAE,OAA2B;QAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QACpD,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK;QACD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACzB,CAAC;CACJ"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export * from './interfaces';
|
|
2
|
-
export * from './cached-translator';
|
|
3
|
-
export * from './translator';
|
|
1
|
+
export * from './interfaces.js';
|
|
2
|
+
export * from './cached-translator.js';
|
|
3
|
+
export * from './translator.js';
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/translator/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/translator/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}
|
|
@@ -1,20 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./interfaces"), exports);
|
|
18
|
-
__exportStar(require("./cached-translator"), exports);
|
|
19
|
-
__exportStar(require("./translator"), exports);
|
|
1
|
+
export * from './interfaces.js';
|
|
2
|
+
export * from './cached-translator.js';
|
|
3
|
+
export * from './translator.js';
|
|
20
4
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/translator/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/translator/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Logger } from '@terascope/utils';
|
|
1
|
+
import type { Logger } from '@terascope/utils';
|
|
2
2
|
import { SortOrder, xLuceneTypeConfig, xLuceneVariables, GeoDistanceUnit, GeoPoint, ClientMetadata } from '@terascope/types';
|
|
3
|
-
import { ParserOptions } from '
|
|
3
|
+
import { ParserOptions } from 'xlucene-parser';
|
|
4
4
|
export interface TranslatorOptions extends ParserOptions {
|
|
5
5
|
logger?: Logger;
|
|
6
6
|
default_geo_field?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/translator/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/translator/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACH,SAAS,EAAE,iBAAiB,EAAE,gBAAgB,EAC9C,eAAe,EAAE,QAAQ,EAAE,cAAc,EAC5C,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,SAAS,CAAC;IACnC,qBAAqB,CAAC,EAAE,eAAe,GAAC,MAAM,CAAC;CAClD;AAED;;EAEE;AACF,MAAM,WAAW,0BAA2B,SAAQ,OAAO,CAAC,cAAc,CAAC;IACvE,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;IAC/B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,cAAc,EAAE,SAAS,CAAC;IAC1B,aAAa,EAAE,eAAe,CAAC;CAClC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { xLuceneVariables, xLuceneTypeConfig, ElasticsearchDSLOptions, ElasticsearchDSLResult } from '@terascope/types';
|
|
2
2
|
import { Parser } from 'xlucene-parser';
|
|
3
|
-
import
|
|
3
|
+
import { TranslatorOptions } from './interfaces.js';
|
|
4
4
|
export declare class Translator {
|
|
5
5
|
readonly query: string;
|
|
6
6
|
readonly typeConfig: xLuceneTypeConfig;
|
|
@@ -9,7 +9,7 @@ export declare class Translator {
|
|
|
9
9
|
private _defaultGeoField?;
|
|
10
10
|
private _defaultGeoSortOrder;
|
|
11
11
|
private _defaultGeoSortUnit;
|
|
12
|
-
constructor(input: string | Parser, options?:
|
|
12
|
+
constructor(input: string | Parser, options?: TranslatorOptions);
|
|
13
13
|
toElasticsearchDSL(opts?: ElasticsearchDSLOptions): ElasticsearchDSLResult;
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=translator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translator.d.ts","sourceRoot":"","sources":["../../../src/translator/translator.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,gBAAgB,
|
|
1
|
+
{"version":3,"file":"translator.d.ts","sourceRoot":"","sources":["../../../src/translator/translator.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,gBAAgB,EAAE,iBAAiB,EACnC,uBAAuB,EAAE,sBAAsB,EAElD,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAKpD,qBAAa,UAAU;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,mBAAmB,CAA6B;gBAE5C,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,GAAE,iBAAsB;IA+BnE,kBAAkB,CAAC,IAAI,GAAE,uBAA4B,GAAG,sBAAsB;CAsBjF"}
|
|
@@ -1,42 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.Translator = void 0;
|
|
27
|
-
const utils_1 = require("@terascope/utils");
|
|
28
|
-
const types_1 = require("@terascope/types");
|
|
29
|
-
const xlucene_parser_1 = require("xlucene-parser");
|
|
30
|
-
const utils = __importStar(require("./utils"));
|
|
31
|
-
const logger = (0, utils_1.debugLogger)('xlucene-translator');
|
|
32
|
-
class Translator {
|
|
1
|
+
import { debugLogger, isString, parseGeoDistanceUnit } from '@terascope/utils';
|
|
2
|
+
import { ElasticsearchDistribution } from '@terascope/types';
|
|
3
|
+
import { Parser } from 'xlucene-parser';
|
|
4
|
+
import { translateQuery } from './utils.js';
|
|
5
|
+
const logger = debugLogger('xlucene-translator');
|
|
6
|
+
export class Translator {
|
|
7
|
+
query;
|
|
8
|
+
typeConfig;
|
|
9
|
+
variables;
|
|
10
|
+
_parser;
|
|
11
|
+
_defaultGeoField;
|
|
12
|
+
_defaultGeoSortOrder = 'asc';
|
|
13
|
+
_defaultGeoSortUnit = 'meters';
|
|
33
14
|
constructor(input, options = {}) {
|
|
34
|
-
this._defaultGeoSortOrder = 'asc';
|
|
35
|
-
this._defaultGeoSortUnit = 'meters';
|
|
36
15
|
this.variables = options.variables;
|
|
37
16
|
this.typeConfig = options.type_config || {};
|
|
38
|
-
if (
|
|
39
|
-
this._parser = new
|
|
17
|
+
if (isString(input)) {
|
|
18
|
+
this._parser = new Parser(input, {
|
|
40
19
|
type_config: this.typeConfig,
|
|
41
20
|
variables: options.variables,
|
|
42
21
|
filterNilVariables: options.filterNilVariables
|
|
@@ -55,21 +34,20 @@ class Translator {
|
|
|
55
34
|
this._defaultGeoSortOrder = options.default_geo_sort_order;
|
|
56
35
|
}
|
|
57
36
|
if (options.default_geo_sort_unit) {
|
|
58
|
-
this._defaultGeoSortUnit =
|
|
37
|
+
this._defaultGeoSortUnit = parseGeoDistanceUnit(options.default_geo_sort_unit);
|
|
59
38
|
}
|
|
60
39
|
this.query = this._parser.query;
|
|
61
40
|
}
|
|
62
41
|
toElasticsearchDSL(opts = {}) {
|
|
63
|
-
|
|
64
|
-
const result = utils.translateQuery(this._parser, {
|
|
42
|
+
const result = translateQuery(this._parser, {
|
|
65
43
|
logger,
|
|
66
|
-
majorVersion:
|
|
67
|
-
minorVersion:
|
|
68
|
-
version:
|
|
69
|
-
distribution:
|
|
44
|
+
majorVersion: opts.majorVersion ?? 6,
|
|
45
|
+
minorVersion: opts.minorVersion ?? 8,
|
|
46
|
+
version: opts.version ?? '6.8.6',
|
|
47
|
+
distribution: opts.distribution ?? ElasticsearchDistribution.elasticsearch,
|
|
70
48
|
type_config: this.typeConfig,
|
|
71
49
|
default_geo_field: this._defaultGeoField,
|
|
72
|
-
variables:
|
|
50
|
+
variables: this.variables ?? {},
|
|
73
51
|
geo_sort_point: opts.geo_sort_point,
|
|
74
52
|
geo_sort_order: opts.geo_sort_order || this._defaultGeoSortOrder,
|
|
75
53
|
geo_sort_unit: opts.geo_sort_unit || this._defaultGeoSortUnit,
|
|
@@ -81,5 +59,4 @@ class Translator {
|
|
|
81
59
|
return result;
|
|
82
60
|
}
|
|
83
61
|
}
|
|
84
|
-
exports.Translator = Translator;
|
|
85
62
|
//# sourceMappingURL=translator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translator.js","sourceRoot":"","sources":["../../../src/translator/translator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"translator.js","sourceRoot":"","sources":["../../../src/translator/translator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as p from 'xlucene-parser';
|
|
2
2
|
import * as i from '@terascope/types';
|
|
3
|
-
import { UtilsTranslateQueryOptions } from './interfaces';
|
|
3
|
+
import { UtilsTranslateQueryOptions } from './interfaces.js';
|
|
4
4
|
export declare function translateQuery(parser: p.Parser, options: UtilsTranslateQueryOptions): i.ElasticsearchDSLResult;
|
|
5
5
|
export declare function isMultiMatch(node: p.TermLikeNode): boolean;
|
|
6
6
|
export declare function getTermField(node: p.TermLikeNode): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/translator/utils.ts"],"names":[],"mappings":"
|
|
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,CAiU1B;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"}
|
|
@@ -1,32 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.compactFinalQuery = exports.isBoolQuery = exports.canFlattenBoolQuery = exports.flattenQuery = exports.getTermField = exports.isMultiMatch = exports.translateQuery = void 0;
|
|
27
|
-
const utils_1 = require("@terascope/utils");
|
|
28
|
-
const p = __importStar(require("xlucene-parser"));
|
|
29
|
-
function translateQuery(parser, options) {
|
|
1
|
+
import { TSError, isString, isEmpty, matchWildcard, } from '@terascope/utils';
|
|
2
|
+
import * as p from 'xlucene-parser';
|
|
3
|
+
export function translateQuery(parser, options) {
|
|
30
4
|
const { logger, type_config: typeConfig, variables } = options;
|
|
31
5
|
let sort;
|
|
32
6
|
function buildAnyQuery(node) {
|
|
@@ -54,7 +28,7 @@ function translateQuery(parser, options) {
|
|
|
54
28
|
if (query)
|
|
55
29
|
return query;
|
|
56
30
|
}
|
|
57
|
-
const error = new
|
|
31
|
+
const error = new TSError(`Unexpected problem when translating xlucene query ${parser.query}`, {
|
|
58
32
|
context: {
|
|
59
33
|
node,
|
|
60
34
|
ast: parser.ast,
|
|
@@ -64,11 +38,11 @@ function translateQuery(parser, options) {
|
|
|
64
38
|
}
|
|
65
39
|
function buildTermLevelQuery(node) {
|
|
66
40
|
if (p.isWildcardField(node)) {
|
|
67
|
-
if (
|
|
41
|
+
if (isEmpty(typeConfig)) {
|
|
68
42
|
throw new Error(`Configuration for type_config needs to be provided with fields related to ${node.field}`);
|
|
69
43
|
}
|
|
70
44
|
const should = Object.keys(typeConfig)
|
|
71
|
-
.filter((field) =>
|
|
45
|
+
.filter((field) => matchWildcard(node.field, field))
|
|
72
46
|
.map((field) => Object.assign({}, node, { field }))
|
|
73
47
|
.map((newNode) => buildTermLevelQuery(newNode));
|
|
74
48
|
return {
|
|
@@ -143,7 +117,7 @@ function translateQuery(parser, options) {
|
|
|
143
117
|
return buildMultiMatchQuery(node, query);
|
|
144
118
|
}
|
|
145
119
|
const field = getTermField(node);
|
|
146
|
-
if (
|
|
120
|
+
if (isString(value) || node.analyzed) {
|
|
147
121
|
const matchQuery = {
|
|
148
122
|
match: {
|
|
149
123
|
[field]: {
|
|
@@ -297,16 +271,13 @@ function translateQuery(parser, options) {
|
|
|
297
271
|
...(sort && { sort })
|
|
298
272
|
};
|
|
299
273
|
}
|
|
300
|
-
|
|
301
|
-
function isMultiMatch(node) {
|
|
274
|
+
export function isMultiMatch(node) {
|
|
302
275
|
return !node.field || node.field === '*';
|
|
303
276
|
}
|
|
304
|
-
|
|
305
|
-
function getTermField(node) {
|
|
277
|
+
export function getTermField(node) {
|
|
306
278
|
return node.field;
|
|
307
279
|
}
|
|
308
|
-
|
|
309
|
-
function flattenQuery(query, flattenTo) {
|
|
280
|
+
export function flattenQuery(query, flattenTo) {
|
|
310
281
|
if (!query)
|
|
311
282
|
return [];
|
|
312
283
|
if (isBoolQuery(query) && canFlattenBoolQuery(query, flattenTo)) {
|
|
@@ -314,22 +285,19 @@ function flattenQuery(query, flattenTo) {
|
|
|
314
285
|
}
|
|
315
286
|
return [query];
|
|
316
287
|
}
|
|
317
|
-
exports.flattenQuery = flattenQuery;
|
|
318
288
|
/** This prevents double nested queries that do the same thing */
|
|
319
|
-
function canFlattenBoolQuery(query, flattenTo) {
|
|
289
|
+
export function canFlattenBoolQuery(query, flattenTo) {
|
|
320
290
|
const types = Object.keys(query.bool);
|
|
321
291
|
if (types.length !== 1)
|
|
322
292
|
return false;
|
|
323
293
|
return types[0] === flattenTo;
|
|
324
294
|
}
|
|
325
|
-
|
|
326
|
-
function isBoolQuery(query) {
|
|
295
|
+
export function isBoolQuery(query) {
|
|
327
296
|
if (!query || typeof query !== 'object')
|
|
328
297
|
return false;
|
|
329
298
|
return query.bool != null;
|
|
330
299
|
}
|
|
331
|
-
|
|
332
|
-
function compactFinalQuery(query) {
|
|
300
|
+
export function compactFinalQuery(query) {
|
|
333
301
|
if (!query)
|
|
334
302
|
return [];
|
|
335
303
|
if (isBoolQuery(query) && canFlattenBoolQuery(query, 'filter')) {
|
|
@@ -343,5 +311,4 @@ function compactFinalQuery(query) {
|
|
|
343
311
|
}
|
|
344
312
|
return query;
|
|
345
313
|
}
|
|
346
|
-
exports.compactFinalQuery = compactFinalQuery;
|
|
347
314
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/translator/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/translator/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "xlucene-translator",
|
|
3
3
|
"displayName": "xLucene Translator",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "1.0.0",
|
|
5
5
|
"description": "Translate xlucene query to database queries",
|
|
6
6
|
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/xlucene-translator#readme",
|
|
7
7
|
"repository": {
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
"license": "MIT",
|
|
12
12
|
"author": "Terascope, LLC <info@terascope.io>",
|
|
13
13
|
"sideEffects": false,
|
|
14
|
+
"type": "module",
|
|
14
15
|
"main": "dist/src/index.js",
|
|
15
16
|
"typings": "dist/src/index.d.ts",
|
|
16
17
|
"directories": {
|
|
@@ -28,10 +29,10 @@
|
|
|
28
29
|
"test:watch": "ts-scripts test --watch . --"
|
|
29
30
|
},
|
|
30
31
|
"dependencies": {
|
|
31
|
-
"@terascope/types": "^0.
|
|
32
|
-
"@terascope/utils": "^0.
|
|
32
|
+
"@terascope/types": "^1.0.0",
|
|
33
|
+
"@terascope/utils": "^1.0.0",
|
|
33
34
|
"@types/elasticsearch": "^5.0.43",
|
|
34
|
-
"xlucene-parser": "^0.
|
|
35
|
+
"xlucene-parser": "^1.0.0"
|
|
35
36
|
},
|
|
36
37
|
"devDependencies": {
|
|
37
38
|
"elasticsearch": "^15.4.1"
|
|
@@ -47,6 +48,6 @@
|
|
|
47
48
|
"srcMain": "src/index.ts",
|
|
48
49
|
"terascope": {
|
|
49
50
|
"enableTypedoc": true,
|
|
50
|
-
"testSuite": "unit"
|
|
51
|
+
"testSuite": "unit-esm"
|
|
51
52
|
}
|
|
52
53
|
}
|