xlucene-translator 0.26.0 → 0.27.1
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/index.js +5 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/query-access/index.js +5 -1
- package/dist/src/query-access/index.js.map +1 -1
- package/dist/src/query-access/interfaces.d.ts +7 -2
- package/dist/src/query-access/interfaces.d.ts.map +1 -1
- package/dist/src/query-access/query-access.d.ts.map +1 -1
- package/dist/src/query-access/query-access.js +14 -5
- package/dist/src/query-access/query-access.js.map +1 -1
- package/dist/src/translator/index.js +5 -1
- package/dist/src/translator/index.js.map +1 -1
- package/dist/src/translator/interfaces.d.ts +3 -1
- 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 +8 -1
- package/dist/src/translator/translator.js.map +1 -1
- package/dist/src/translator/utils.js +5 -1
- package/dist/src/translator/utils.js.map +1 -1
- package/package.json +4 -4
package/dist/src/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
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,iDAA+B;AAC/B,+CAA6B"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -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,wDAAsC;AACtC,iDAA+B;AAC/B,+CAA6B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { SearchParams } from 'elasticsearch';
|
|
2
2
|
import type { AnyObject } from '@terascope/utils';
|
|
3
|
-
import { SortOrder, ElasticsearchDSLOptions, xLuceneTypeConfig, xLuceneVariables, GeoDistanceUnit } from '@terascope/types';
|
|
3
|
+
import { SortOrder, ElasticsearchDSLOptions, xLuceneTypeConfig, xLuceneVariables, GeoDistanceUnit, ElasticsearchDistribution } from '@terascope/types';
|
|
4
4
|
import { ParserOptions } from 'xlucene-parser';
|
|
5
5
|
export interface RestrictSearchQueryOptions extends ElasticsearchDSLOptions {
|
|
6
6
|
variables?: xLuceneVariables;
|
|
@@ -14,7 +14,12 @@ export interface RestrictSearchQueryOptions extends ElasticsearchDSLOptions {
|
|
|
14
14
|
* The elasticsearch version (to format the request properly)
|
|
15
15
|
* @default 6
|
|
16
16
|
*/
|
|
17
|
-
|
|
17
|
+
version?: number;
|
|
18
|
+
/**
|
|
19
|
+
* The distribution (ie elasticsearch or opensearch)
|
|
20
|
+
* @default 'elasticsearch'
|
|
21
|
+
*/
|
|
22
|
+
distribution?: ElasticsearchDistribution;
|
|
18
23
|
}
|
|
19
24
|
export interface RestrictOptions {
|
|
20
25
|
variables?: xLuceneVariables;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/query-access/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EACH,SAAS,EACT,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/query-access/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EACH,SAAS,EACT,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,yBAAyB,EAC5B,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,CAAC;IAC/B;;;MAGE;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;MAGE;IACF,YAAY,CAAC,EAAE,yBAAyB,CAAC;CAC5C;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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-access.d.ts","sourceRoot":"","sources":["../../../src/query-access/query-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EACH,SAAS,EACT,eAAe,EACf,gBAAgB,EAChB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"query-access.d.ts","sourceRoot":"","sources":["../../../src/query-access/query-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EACH,SAAS,EACT,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EAGpB,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;IA4DxB;;;;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;IAUD,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,eAAe;CAQ1B"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -152,7 +156,12 @@ class QueryAccess {
|
|
|
152
156
|
*/
|
|
153
157
|
async restrictSearchQuery(query, opts, _overrideParsedQuery) {
|
|
154
158
|
var _a;
|
|
155
|
-
const { params: _params = {},
|
|
159
|
+
const { params: _params = {}, version: esVersion = 6, distribution = types_1.ElasticsearchDistribution.elasticsearch, ...options } = opts !== null && opts !== void 0 ? opts : {};
|
|
160
|
+
const translateOptions = {
|
|
161
|
+
...options,
|
|
162
|
+
distribution,
|
|
163
|
+
version: esVersion,
|
|
164
|
+
};
|
|
156
165
|
const variables = Object.assign({}, this.variables, (_a = opts === null || opts === void 0 ? void 0 : opts.variables) !== null && _a !== void 0 ? _a : {});
|
|
157
166
|
if (_params._source) {
|
|
158
167
|
throw new Error('Cannot include _source in params, use _sourceInclude or _sourceExclude');
|
|
@@ -165,14 +174,14 @@ class QueryAccess {
|
|
|
165
174
|
default_geo_field: this.defaultGeoField,
|
|
166
175
|
default_geo_sort_order: this.defaultGeoSortOrder,
|
|
167
176
|
default_geo_sort_unit: this.defaultGeoSortUnit,
|
|
168
|
-
variables
|
|
177
|
+
variables,
|
|
169
178
|
});
|
|
170
179
|
const translated = translator.toElasticsearchDSL(translateOptions);
|
|
171
180
|
const { includes, excludes } = this.restrictSourceFields(params._sourceInclude, params._sourceExclude);
|
|
172
181
|
delete params._sourceInclude;
|
|
173
182
|
delete params._sourceExclude;
|
|
174
|
-
const excludesKey = esVersion
|
|
175
|
-
const includesKey = esVersion
|
|
183
|
+
const excludesKey = esVersion === 6 ? '_sourceExclude' : '_sourceExcludes';
|
|
184
|
+
const includesKey = esVersion === 6 ? '_sourceInclude' : '_sourceIncludes';
|
|
176
185
|
const searchParams = {
|
|
177
186
|
...params,
|
|
178
187
|
body: { ...params.body, ...translated },
|
|
@@ -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,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -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,+CAA6B;AAC7B,sDAAoC;AACpC,+CAA6B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logger } from '@terascope/utils';
|
|
2
|
-
import { SortOrder, xLuceneTypeConfig, xLuceneVariables, GeoDistanceUnit, GeoPoint } from '@terascope/types';
|
|
2
|
+
import { SortOrder, xLuceneTypeConfig, xLuceneVariables, GeoDistanceUnit, GeoPoint, ElasticsearchDistribution } from '@terascope/types';
|
|
3
3
|
export declare type TranslatorOptions = {
|
|
4
4
|
logger?: Logger;
|
|
5
5
|
type_config?: xLuceneTypeConfig;
|
|
@@ -15,6 +15,8 @@ export declare type UtilsTranslateQueryOptions = {
|
|
|
15
15
|
logger: Logger;
|
|
16
16
|
type_config: xLuceneTypeConfig;
|
|
17
17
|
variables: xLuceneVariables;
|
|
18
|
+
version: number;
|
|
19
|
+
distribution: ElasticsearchDistribution;
|
|
18
20
|
default_geo_field?: string;
|
|
19
21
|
geo_sort_point?: GeoPoint;
|
|
20
22
|
geo_sort_order: SortOrder;
|
|
@@ -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,EACT,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,QAAQ,
|
|
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,EACT,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,QAAQ,EACR,yBAAyB,EAC5B,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,oBAAY,0BAA0B,GAAG;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;IAC/B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,yBAAyB,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,cAAc,EAAE,SAAS,CAAC;IAC1B,aAAa,EAAE,eAAe,CAAC;CAClC,CAAC"}
|
|
@@ -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,
|
|
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;CAoBjF"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -21,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
21
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
26
|
exports.Translator = void 0;
|
|
23
27
|
const utils_1 = require("@terascope/utils");
|
|
28
|
+
const types_1 = require("@terascope/types");
|
|
24
29
|
const xlucene_parser_1 = require("xlucene-parser");
|
|
25
30
|
const utils = __importStar(require("./utils"));
|
|
26
31
|
const logger = (0, utils_1.debugLogger)('xlucene-translator');
|
|
@@ -56,6 +61,8 @@ class Translator {
|
|
|
56
61
|
var _a;
|
|
57
62
|
const result = utils.translateQuery(this._parser, {
|
|
58
63
|
logger,
|
|
64
|
+
version: opts.version || 6,
|
|
65
|
+
distribution: opts.distribution || types_1.ElasticsearchDistribution.elasticsearch,
|
|
59
66
|
type_config: this.typeConfig,
|
|
60
67
|
default_geo_field: this._defaultGeoField,
|
|
61
68
|
variables: (_a = this.variables) !== null && _a !== void 0 ? _a : {},
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;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,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,CAAC;YAC1B,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,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;AA1DD,gCA0DC"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -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": "0.27.1",
|
|
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.10.
|
|
32
|
-
"@terascope/utils": "^0.44.
|
|
31
|
+
"@terascope/types": "^0.10.3",
|
|
32
|
+
"@terascope/utils": "^0.44.2",
|
|
33
33
|
"@types/elasticsearch": "^5.0.40",
|
|
34
|
-
"xlucene-parser": "^0.42.
|
|
34
|
+
"xlucene-parser": "^0.42.2"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"elasticsearch": "^15.4.1"
|