xlucene-translator 0.28.2 → 0.28.3
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/dist/src/query-access/interfaces.d.ts +2 -13
- package/dist/src/query-access/interfaces.d.ts.map +1 -1
- package/dist/src/query-access/query-access.d.ts +2 -3
- package/dist/src/query-access/query-access.d.ts.map +1 -1
- package/dist/src/query-access/query-access.js +15 -9
- package/dist/src/query-access/query-access.js.map +1 -1
- package/dist/src/translator/interfaces.d.ts +3 -5
- package/dist/src/translator/interfaces.d.ts.map +1 -1
- package/dist/src/translator/translator.d.ts.map +1 -1
- package/dist/src/translator/translator.js +6 -4
- package/dist/src/translator/translator.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import type { SearchParams } from 'elasticsearch';
|
|
2
1
|
import type { AnyObject } from '@terascope/utils';
|
|
3
|
-
import { SortOrder, ElasticsearchDSLOptions, xLuceneTypeConfig, xLuceneVariables, GeoDistanceUnit,
|
|
2
|
+
import { SortOrder, ElasticsearchDSLOptions, xLuceneTypeConfig, xLuceneVariables, GeoDistanceUnit, ClientParams } from '@terascope/types';
|
|
4
3
|
import { ParserOptions } from 'xlucene-parser';
|
|
5
4
|
export interface RestrictSearchQueryOptions extends ElasticsearchDSLOptions {
|
|
6
5
|
variables?: xLuceneVariables;
|
|
@@ -9,17 +8,7 @@ export interface RestrictSearchQueryOptions extends ElasticsearchDSLOptions {
|
|
|
9
8
|
* _sourceInclude and _sourceExclude will be filtered based
|
|
10
9
|
* on the excludes and includes fields specified in the config
|
|
11
10
|
*/
|
|
12
|
-
params?: Partial<SearchParams>;
|
|
13
|
-
/**
|
|
14
|
-
* The elasticsearch version (to format the request properly)
|
|
15
|
-
* @default 6
|
|
16
|
-
*/
|
|
17
|
-
version?: number;
|
|
18
|
-
/**
|
|
19
|
-
* The distribution (ie elasticsearch or opensearch)
|
|
20
|
-
* @default 'elasticsearch'
|
|
21
|
-
*/
|
|
22
|
-
distribution?: ElasticsearchDistribution;
|
|
11
|
+
params?: Partial<ClientParams.SearchParams>;
|
|
23
12
|
}
|
|
24
13
|
export interface RestrictOptions {
|
|
25
14
|
variables?: xLuceneVariables;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/query-access/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/query-access/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EACH,SAAS,EAAE,uBAAuB,EAAE,iBAAiB,EACrD,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAClD,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,0BAA2B,SAAQ,uBAAuB;IACvE,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B;;;;MAIE;IACF,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,eAAe;IAC5B,SAAS,CAAC,EAAE,gBAAgB,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IAC9D,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,GAAC,MAAM,EAAE,CAAC;IAC7B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,SAAS,CAAC;IACnC,qBAAqB,CAAC,EAAE,eAAe,GAAC,MAAM,CAAC;IAC/C,WAAW,CAAC,EAAE,iBAAiB,CAAC;CACnC;AAED,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACrD,SAAS,CAAC,EAAE,gBAAgB,CAAC;CAChC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import type { SearchParams } from 'elasticsearch';
|
|
2
1
|
import * as ts from '@terascope/utils';
|
|
3
2
|
import * as p from 'xlucene-parser';
|
|
4
|
-
import { SortOrder, GeoDistanceUnit, xLuceneVariables, xLuceneTypeConfig } from '@terascope/types';
|
|
3
|
+
import { SortOrder, GeoDistanceUnit, xLuceneVariables, xLuceneTypeConfig, ClientParams } from '@terascope/types';
|
|
5
4
|
import * as i from './interfaces';
|
|
6
5
|
export declare class QueryAccess<T extends ts.AnyObject = ts.AnyObject> {
|
|
7
6
|
readonly excludes: (keyof T)[];
|
|
@@ -38,7 +37,7 @@ export declare class QueryAccess<T extends ts.AnyObject = ts.AnyObject> {
|
|
|
38
37
|
*
|
|
39
38
|
* @returns a restricted elasticsearch search query
|
|
40
39
|
*/
|
|
41
|
-
restrictSearchQuery(query: string, opts?: i.RestrictSearchQueryOptions, _overrideParsedQuery?: p.Node): Promise<SearchParams>;
|
|
40
|
+
restrictSearchQuery(query: string, opts?: i.RestrictSearchQueryOptions, _overrideParsedQuery?: p.Node): Promise<ClientParams.SearchParams>;
|
|
42
41
|
/**
|
|
43
42
|
* Restrict requested source to all or subset of the ones available
|
|
44
43
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-access.d.ts","sourceRoot":"","sources":["../../../src/query-access/query-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
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,cAAc,CAAC;AAElC,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;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;IA2BnF,UAAU,IAAI,IAAI;IAKlB;;;;OAIG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAI3B;;;;OAIG;IACH,OAAO,CAAC,SAAS;IA2EjB,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;IAuErC;;;;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"}
|
|
@@ -156,11 +156,13 @@ class QueryAccess {
|
|
|
156
156
|
*/
|
|
157
157
|
async restrictSearchQuery(query, opts, _overrideParsedQuery) {
|
|
158
158
|
var _a;
|
|
159
|
-
const { params: _params = {},
|
|
159
|
+
const { params: _params = {}, majorVersion = 6, minorVersion = 8, distribution = types_1.ElasticsearchDistribution.elasticsearch, version = '6.8.6', ...options } = opts !== null && opts !== void 0 ? opts : {};
|
|
160
160
|
const translateOptions = {
|
|
161
161
|
...options,
|
|
162
162
|
distribution,
|
|
163
|
-
|
|
163
|
+
majorVersion,
|
|
164
|
+
minorVersion,
|
|
165
|
+
version
|
|
164
166
|
};
|
|
165
167
|
const variables = Object.assign({}, this.variables, (_a = opts === null || opts === void 0 ? void 0 : opts.variables) !== null && _a !== void 0 ? _a : {});
|
|
166
168
|
if (_params._source) {
|
|
@@ -177,14 +179,18 @@ class QueryAccess {
|
|
|
177
179
|
variables,
|
|
178
180
|
});
|
|
179
181
|
const translated = translator.toElasticsearchDSL(translateOptions);
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
const
|
|
184
|
-
const
|
|
182
|
+
// keep _sourceInclude && _sourceExclude for backward compatibility
|
|
183
|
+
const { _sourceInclude, _source_includes, _sourceExclude, _source_excludes, ...parsedParams } = params;
|
|
184
|
+
const sourceIncludes = _sourceInclude !== null && _sourceInclude !== void 0 ? _sourceInclude : _source_includes;
|
|
185
|
+
const sourceExcludes = _sourceExclude !== null && _sourceExclude !== void 0 ? _sourceExclude : _source_excludes;
|
|
186
|
+
const { includes, excludes } = this.restrictSourceFields(sourceIncludes, sourceExcludes);
|
|
187
|
+
// we can remove this logic when we can get rid of legacy client
|
|
188
|
+
const isLegacy = version === '6.5';
|
|
189
|
+
const excludesKey = isLegacy ? '_sourceExclude' : '_source_excludes';
|
|
190
|
+
const includesKey = isLegacy ? '_sourceInclude' : '_source_includes';
|
|
185
191
|
const searchParams = {
|
|
186
|
-
...
|
|
187
|
-
body: { ...
|
|
192
|
+
...parsedParams,
|
|
193
|
+
body: { ...parsedParams.body, ...translated },
|
|
188
194
|
[excludesKey]: excludes,
|
|
189
195
|
[includesKey]: includes,
|
|
190
196
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-access.js","sourceRoot":"","sources":["../../../src/query-access/query-access.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"query-access.js","sourceRoot":"","sources":["../../../src/query-access/query-access.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logger } from '@terascope/utils';
|
|
2
|
-
import { SortOrder, xLuceneTypeConfig, xLuceneVariables, GeoDistanceUnit, GeoPoint,
|
|
2
|
+
import { SortOrder, xLuceneTypeConfig, xLuceneVariables, GeoDistanceUnit, GeoPoint, ClientMetadata } from '@terascope/types';
|
|
3
3
|
export declare type TranslatorOptions = {
|
|
4
4
|
logger?: Logger;
|
|
5
5
|
type_config?: xLuceneTypeConfig;
|
|
@@ -11,15 +11,13 @@ export declare type TranslatorOptions = {
|
|
|
11
11
|
/**
|
|
12
12
|
* @internal
|
|
13
13
|
*/
|
|
14
|
-
export
|
|
14
|
+
export interface UtilsTranslateQueryOptions extends Partial<ClientMetadata> {
|
|
15
15
|
logger: Logger;
|
|
16
16
|
type_config: xLuceneTypeConfig;
|
|
17
17
|
variables: xLuceneVariables;
|
|
18
|
-
version: number;
|
|
19
|
-
distribution: ElasticsearchDistribution;
|
|
20
18
|
default_geo_field?: string;
|
|
21
19
|
geo_sort_point?: GeoPoint;
|
|
22
20
|
geo_sort_order: SortOrder;
|
|
23
21
|
geo_sort_unit: GeoDistanceUnit;
|
|
24
|
-
}
|
|
22
|
+
}
|
|
25
23
|
//# sourceMappingURL=interfaces.d.ts.map
|
|
@@ -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;AAC1C,OAAO,EACH,SAAS,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/translator/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EACH,SAAS,EAAE,iBAAiB,EAAE,gBAAgB,EAC9C,eAAe,EAAE,QAAQ,EAAE,cAAc,EAC5C,MAAM,kBAAkB,CAAC;AAE1B,oBAAY,iBAAiB,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,SAAS,CAAC;IACnC,qBAAqB,CAAC,EAAE,eAAe,GAAC,MAAM,CAAC;IAC/C,SAAS,CAAC,EAAE,gBAAgB,CAAC;CAChC,CAAC;AAEF;;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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translator.d.ts","sourceRoot":"","sources":["../../../src/translator/translator.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,gBAAgB,EAChB,iBAAiB,EAEjB,uBAAuB,EACvB,sBAAsB,EAEzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAKlC,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,CAAC,CAAC,iBAAsB;IA6BrE,kBAAkB,CAAC,IAAI,GAAE,uBAA4B,GAAG,sBAAsB;
|
|
1
|
+
{"version":3,"file":"translator.d.ts","sourceRoot":"","sources":["../../../src/translator/translator.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,gBAAgB,EAChB,iBAAiB,EAEjB,uBAAuB,EACvB,sBAAsB,EAEzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAKlC,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,CAAC,CAAC,iBAAsB;IA6BrE,kBAAkB,CAAC,IAAI,GAAE,uBAA4B,GAAG,sBAAsB;CAsBjF"}
|
|
@@ -58,14 +58,16 @@ class Translator {
|
|
|
58
58
|
this.query = this._parser.query;
|
|
59
59
|
}
|
|
60
60
|
toElasticsearchDSL(opts = {}) {
|
|
61
|
-
var _a;
|
|
61
|
+
var _a, _b, _c, _d, _e;
|
|
62
62
|
const result = utils.translateQuery(this._parser, {
|
|
63
63
|
logger,
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
majorVersion: (_a = opts.majorVersion) !== null && _a !== void 0 ? _a : 6,
|
|
65
|
+
minorVersion: (_b = opts.minorVersion) !== null && _b !== void 0 ? _b : 8,
|
|
66
|
+
version: (_c = opts.version) !== null && _c !== void 0 ? _c : '6.8.6',
|
|
67
|
+
distribution: (_d = opts.distribution) !== null && _d !== void 0 ? _d : types_1.ElasticsearchDistribution.elasticsearch,
|
|
66
68
|
type_config: this.typeConfig,
|
|
67
69
|
default_geo_field: this._defaultGeoField,
|
|
68
|
-
variables: (
|
|
70
|
+
variables: (_e = this.variables) !== null && _e !== void 0 ? _e : {},
|
|
69
71
|
geo_sort_point: opts.geo_sort_point,
|
|
70
72
|
geo_sort_order: opts.geo_sort_order || this._defaultGeoSortOrder,
|
|
71
73
|
geo_sort_unit: opts.geo_sort_unit || this._defaultGeoSortUnit,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translator.js","sourceRoot":"","sources":["../../../src/translator/translator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAE0B;AAC1B,4CAO0B;AAC1B,mDAAwC;AAExC,+CAAiC;AAEjC,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,oBAAoB,CAAC,CAAC;AAEjD,MAAa,UAAU;IASnB,YAAY,KAAsB,EAAE,UAA+B,EAAE;QAH7D,yBAAoB,GAAiB,KAAK,CAAC;QAC3C,wBAAmB,GAAoB,QAAQ,CAAC;QAGpD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAEnC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;QAC5C,IAAI,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAM,CAAC,KAAK,EAAE;gBAC7B,WAAW,EAAE,IAAI,CAAC,UAAU;aAC/B,CAAC,CAAC;SACN;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;SACxB;QAED,IAAI,OAAO,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnE;QAED,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC3B,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;SACrD;QACD,IAAI,OAAO,CAAC,sBAAsB,EAAE;YAChC,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,sBAAsB,CAAC;SAC9D;QACD,IAAI,OAAO,CAAC,qBAAqB,EAAE;YAC/B,IAAI,CAAC,mBAAmB,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAClF;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IACpC,CAAC;IAED,kBAAkB,CAAC,OAAgC,EAAE;;QACjD,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE;YAC9C,MAAM;YACN,
|
|
1
|
+
{"version":3,"file":"translator.js","sourceRoot":"","sources":["../../../src/translator/translator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAE0B;AAC1B,4CAO0B;AAC1B,mDAAwC;AAExC,+CAAiC;AAEjC,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,oBAAoB,CAAC,CAAC;AAEjD,MAAa,UAAU;IASnB,YAAY,KAAsB,EAAE,UAA+B,EAAE;QAH7D,yBAAoB,GAAiB,KAAK,CAAC;QAC3C,wBAAmB,GAAoB,QAAQ,CAAC;QAGpD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAEnC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;QAC5C,IAAI,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAM,CAAC,KAAK,EAAE;gBAC7B,WAAW,EAAE,IAAI,CAAC,UAAU;aAC/B,CAAC,CAAC;SACN;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;SACxB;QAED,IAAI,OAAO,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnE;QAED,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC3B,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;SACrD;QACD,IAAI,OAAO,CAAC,sBAAsB,EAAE;YAChC,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,sBAAsB,CAAC;SAC9D;QACD,IAAI,OAAO,CAAC,qBAAqB,EAAE;YAC/B,IAAI,CAAC,mBAAmB,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAClF;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IACpC,CAAC;IAED,kBAAkB,CAAC,OAAgC,EAAE;;QACjD,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE;YAC9C,MAAM;YACN,YAAY,EAAE,MAAA,IAAI,CAAC,YAAY,mCAAI,CAAC;YACpC,YAAY,EAAE,MAAA,IAAI,CAAC,YAAY,mCAAI,CAAC;YACpC,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,mCAAI,OAAO;YAChC,YAAY,EAAE,MAAA,IAAI,CAAC,YAAY,mCAAI,iCAAyB,CAAC,aAAa;YAC1E,WAAW,EAAE,IAAI,CAAC,UAAU;YAC5B,iBAAiB,EAAE,IAAI,CAAC,gBAAgB;YACxC,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,mCAAI,EAAE;YAC/B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,oBAAoB;YAChE,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,mBAAmB;SAChE,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACvB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAClD,MAAM,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,SAAS,CAAC,CAAC;SACpF;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA5DD,gCA4DC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "xlucene-translator",
|
|
3
3
|
"displayName": "xLucene Translator",
|
|
4
|
-
"version": "0.28.
|
|
4
|
+
"version": "0.28.3",
|
|
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": {
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
"test:watch": "ts-scripts test --watch . --"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@terascope/types": "^0.
|
|
32
|
-
"@terascope/utils": "^0.45.
|
|
31
|
+
"@terascope/types": "^0.11.1",
|
|
32
|
+
"@terascope/utils": "^0.45.2",
|
|
33
33
|
"@types/elasticsearch": "^5.0.40",
|
|
34
|
-
"xlucene-parser": "^0.43.
|
|
34
|
+
"xlucene-parser": "^0.43.2"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"elasticsearch": "^15.4.1"
|
|
@@ -47,6 +47,6 @@
|
|
|
47
47
|
"srcMain": "src/index.ts",
|
|
48
48
|
"terascope": {
|
|
49
49
|
"enableTypedoc": true,
|
|
50
|
-
"testSuite": "unit
|
|
50
|
+
"testSuite": "unit"
|
|
51
51
|
}
|
|
52
52
|
}
|