xlucene-parser 0.43.5 → 0.44.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/dist/src/interfaces.d.ts
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import { Logger } from '@terascope/utils';
|
|
2
2
|
import * as t from '@terascope/types';
|
|
3
|
+
/**
|
|
4
|
+
* @param filterNilVariables CAUTION: Filters out variable nodes that don't have
|
|
5
|
+
* a variable provided in the variables object so make sure to pass in variables.
|
|
6
|
+
*/
|
|
3
7
|
export interface ParserOptions {
|
|
4
8
|
type_config?: t.xLuceneTypeConfig;
|
|
9
|
+
filterNilVariables?: boolean;
|
|
10
|
+
variables?: t.xLuceneVariables;
|
|
5
11
|
}
|
|
6
12
|
export interface ContextArg {
|
|
7
13
|
typeConfig?: t.xLuceneTypeConfig;
|
|
@@ -40,14 +46,16 @@ export interface EmptyNode extends Node {
|
|
|
40
46
|
type: NodeType.Empty;
|
|
41
47
|
}
|
|
42
48
|
export declare type Field = string | null;
|
|
43
|
-
export declare type
|
|
49
|
+
export declare type FieldValueValue<T> = {
|
|
44
50
|
type: 'value';
|
|
45
51
|
value: T;
|
|
46
|
-
}
|
|
52
|
+
};
|
|
53
|
+
export declare type FieldValueVariable = {
|
|
47
54
|
type: 'variable';
|
|
48
55
|
scoped: boolean;
|
|
49
56
|
value: string;
|
|
50
57
|
};
|
|
58
|
+
export declare type FieldValue<T> = FieldValueValue<T> | FieldValueVariable;
|
|
51
59
|
export interface TermList extends TermLikeNode {
|
|
52
60
|
type: NodeType.TermList;
|
|
53
61
|
value: FieldValue<any>[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,CAAC,MAAM,kBAAkB,CAAC;AAEtC,MAAM,WAAW,aAAa;IAC1B,WAAW,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,CAAC,MAAM,kBAAkB,CAAC;AAEtC;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC1B,WAAW,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC;CAClC;AAED,MAAM,WAAW,UAAU;IACvB,UAAU,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC;IACjC,SAAS,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC;CAClC;AAED,oBAAY,SAAS,GAAG,UAAU,GAAC,YAAY,CAAC;AAChD,oBAAY,aAAa,GAAG,QAAQ,CAAC,YAAY,GAAC,QAAQ,CAAC,UAAU,CAAC;AAEtE,MAAM,WAAW,IAAI;IACjB,IAAI,EAAE,QAAQ,CAAC;CAClB;AAED,MAAM,WAAW,aAAc,SAAQ,IAAI;IACvC,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,oBAAY,YAAY,GACpB,QAAQ,CAAC,IAAI,GACb,QAAQ,CAAC,MAAM,GACf,QAAQ,CAAC,KAAK,GACd,QAAQ,CAAC,QAAQ,GACjB,QAAQ,CAAC,QAAQ,GACjB,QAAQ,CAAC,QAAQ,CAAC;AAEtB,MAAM,WAAW,YAAa,SAAQ,IAAI;IACtC,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,oBAAY,QAAQ;IAChB,YAAY,kBAAkB;IAC9B,UAAU,gBAAgB;IAC1B,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,QAAQ,cAAc;CACzB;AAED,MAAM,WAAW,SAAU,SAAQ,IAAI;IACnC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC;CACxB;AAED,oBAAY,KAAK,GAAG,MAAM,GAAC,IAAI,CAAC;AAEhC,oBAAY,eAAe,CAAC,CAAC,IAAI;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,CAAC,CAAC;CACZ,CAAA;AACD,oBAAY,kBAAkB,GAAG;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB,CAAA;AAED,oBAAY,UAAU,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,GAAC,kBAAkB,CAAC;AAElE,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC1C,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACxB,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,WAAW;IACxB;;;MAGE;IACF,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC;IAC/B,KAAK,EAAE,UAAU,CAAC,MAAM,GAAC,MAAM,GAAC,OAAO,GAAC,GAAG,CAAC,CAAC;CAChD;AAED,MAAM,WAAW,cAAc;IAC3B,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC,OAAO,GAAG,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC;IAClE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc;IAC3B,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACvC,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,YAAa,SAAQ,aAAa;IAC/C,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC;CAC/B;AAED,MAAM,WAAW,WAAY,SAAQ,IAAI;IACrC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC;IAC3B,KAAK,EAAE,IAAI,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,QAAS,SAAQ,IAAI;IAClC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACxB,IAAI,EAAE,IAAI,CAAC;CACd;AAED,MAAM,WAAW,UAAW,SAAQ,aAAa;IAC7C,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC;IAC1B,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,MAAO,SAAQ,IAAI;IAChC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,oBAAY,aAAa,GAAG,KAAK,GAAC,IAAI,GAAC,IAAI,GAAC,KAAK,CAAC;AAClD,MAAM,WAAW,KAAM,SAAQ,YAAY;IACvC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC;IACrB,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC;IAC/B,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,SAAS,CAAC;IAGlB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACtB,QAAQ,EAAE,aAAa,CAAC;IACxB,UAAU,EAAE,CAAC,CAAC,gBAAgB,CAAC,OAAO,GACpC,CAAC,CAAC,gBAAgB,CAAC,KAAK,GACxB,CAAC,CAAC,gBAAgB,CAAC,MAAM,GACzB,CAAC,CAAC,gBAAgB,CAAC,cAAc,GACjC,CAAC,CAAC,gBAAgB,CAAC,IAAI,GACvB,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC;IACxB,KAAK,EAAE,UAAU,CAAC,MAAM,GAAC,MAAM,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,YAAa,SAAQ,YAAY;IAC9C,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC;IACxB;;MAEE;IACF,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,CAAC,IAAI,GAAC,QAAQ,CAAC,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,MAAO,SAAQ,cAAc,EAAE,YAAY;IACxD,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,QAAS,SAAQ,cAAc,EAAE,YAAY;IAC1D,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC;CAC3B;AAED,MAAM,WAAW,IAAK,SAAQ,WAAW,EAAE,YAAY;IACnD,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,YAAY,CAAC;IACnB,WAAW,EAAE,CAAC,CAAC,iBAAiB,CAAC;IACjC,SAAS,EAAE,CAAC,CAAC,gBAAgB,CAAC;CACjC;AAED,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,eAAe,CAAC;CACvD;AAED,MAAM,WAAW,sBAAsB;IACnC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC;IAClB,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC;CACzB;AAED,oBAAY,4BAA4B,GACpC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,CAAC,CAAC,iBAAiB,CAAA;CAAE,GAClD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAEzB,MAAM,WAAW,eAAe;IAC5B,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;IACzB,oBAAoB,CAChB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,4BAA4B,GACtC,sBAAsB,CAAC;CAC7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":";;;AA4CA,IAAY,QAaX;AAbD,WAAY,QAAQ;IAChB,0CAA8B,CAAA;IAC9B,sCAA0B,CAAA;IAC1B,uCAA2B,CAAA;IAC3B,iCAAqB,CAAA;IACrB,yBAAa,CAAA;IACb,6BAAiB,CAAA;IACjB,2BAAe,CAAA;IACf,6BAAiB,CAAA;IACjB,iCAAqB,CAAA;IACrB,2BAAe,CAAA;IACf,iCAAqB,CAAA;IACrB,kCAAsB,CAAA;AAC1B,CAAC,EAbW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAanB"}
|
package/dist/src/parser.d.ts
CHANGED
|
@@ -7,7 +7,9 @@ export declare class Parser {
|
|
|
7
7
|
readonly ast: i.Node;
|
|
8
8
|
readonly query: string;
|
|
9
9
|
readonly typeConfig: xLuceneTypeConfig;
|
|
10
|
+
readonly filterNilVariables: boolean;
|
|
10
11
|
constructor(query: string, options?: i.ParserOptions, _overrideNode?: i.Node);
|
|
12
|
+
filterNodes(ast: i.Node, fn: (node: i.Node, parent?: i.Node) => boolean): i.Node;
|
|
11
13
|
/**
|
|
12
14
|
* Recursively Iterate over all or select set of the nodes types
|
|
13
15
|
*/
|
package/dist/src/parser.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzF,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAOlC;;EAEE;AACF,qBAAa,MAAM;IACf,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;gBAGjC,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,CAAC,CAAC,aAAa,EACzB,aAAa,CAAC,EAAE,CAAC,CAAC,IAAI;IA+D1B,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,OAAO,GAAG,CAAC,CAAC,IAAI;IAsHhF;;MAEE;IACF,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,GAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EACjD,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,KAAK,IAAI,EAAE,kBAAkB,UAAQ,GACjE,IAAI;IAmCP;;MAEE;IACF,YAAY,CACR,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,YAAY,KAAK,IAAI,EAClC,kBAAkB,UAAO,GAC1B,IAAI;IAQP;;;MAGE;IACF,iBAAiB,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,YAAY,KAAK,IAAI,GAAG,IAAI;IAsBrF,eAAe,CACX,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,EACvC,cAAc,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI,GACxD,IAAI;IA+DP;;MAEE;IACF,gBAAgB,CAAC,SAAS,EAAE,gBAAgB,GAAG,MAAM;IAyBrD;;MAEE;IACF,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI;CAkCjE"}
|
package/dist/src/parser.js
CHANGED
|
@@ -36,6 +36,7 @@ const termTypes = new Set(utils.termTypes.filter((type) => (type !== i.NodeType.
|
|
|
36
36
|
class Parser {
|
|
37
37
|
constructor(query, options, _overrideNode) {
|
|
38
38
|
this.query = (0, utils_1.trim)(query || '');
|
|
39
|
+
this.filterNilVariables = !!(options === null || options === void 0 ? void 0 : options.filterNilVariables);
|
|
39
40
|
this.typeConfig = { ...options === null || options === void 0 ? void 0 : options.type_config };
|
|
40
41
|
if (_overrideNode) {
|
|
41
42
|
this.ast = _overrideNode;
|
|
@@ -46,6 +47,38 @@ class Parser {
|
|
|
46
47
|
};
|
|
47
48
|
try {
|
|
48
49
|
this.ast = (0, peg_engine_1.parse)(this.query, { contextArg });
|
|
50
|
+
if (options === null || options === void 0 ? void 0 : options.filterNilVariables) {
|
|
51
|
+
if (!options.variables) {
|
|
52
|
+
utils.logger.warn('Parser filtering out undefined variables but no variables were provided. Consider adding variables or not running in "filterNilVariables" mode.');
|
|
53
|
+
}
|
|
54
|
+
this.ast = this.filterNodes(this.ast, (_node) => {
|
|
55
|
+
var _a, _b, _c, _d;
|
|
56
|
+
let type = '';
|
|
57
|
+
let value = '';
|
|
58
|
+
let node = _node;
|
|
59
|
+
if (utils.isNegation(node)) {
|
|
60
|
+
node = _node.node;
|
|
61
|
+
}
|
|
62
|
+
if (utils.isTerm(node)) {
|
|
63
|
+
if (node.value.scoped)
|
|
64
|
+
return true;
|
|
65
|
+
type = node.value.type;
|
|
66
|
+
value = node.value.value;
|
|
67
|
+
}
|
|
68
|
+
if (utils.isRange(node)) {
|
|
69
|
+
type = (_a = node.left.value.type) !== null && _a !== void 0 ? _a : (_b = node.right) === null || _b === void 0 ? void 0 : _b.value.type;
|
|
70
|
+
value = (_c = node.left.value.value) !== null && _c !== void 0 ? _c : (_d = node.right) === null || _d === void 0 ? void 0 : _d.value.value;
|
|
71
|
+
}
|
|
72
|
+
function keep(nodeType, nodeVariable) {
|
|
73
|
+
if (nodeType !== 'variable')
|
|
74
|
+
return true;
|
|
75
|
+
if (nodeVariable in ((options === null || options === void 0 ? void 0 : options.variables) || {}))
|
|
76
|
+
return true;
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
return keep(type, value);
|
|
80
|
+
});
|
|
81
|
+
}
|
|
49
82
|
if (utils.logger.level() === 10) {
|
|
50
83
|
const astJSON = JSON.stringify(this.ast, null, 4);
|
|
51
84
|
utils.logger.trace(`parsed ${this.query ? this.query : "''"} to `, astJSON);
|
|
@@ -60,6 +93,111 @@ class Parser {
|
|
|
60
93
|
});
|
|
61
94
|
}
|
|
62
95
|
}
|
|
96
|
+
filterNodes(ast, fn) {
|
|
97
|
+
const filterNode = (ogNode, parent) => {
|
|
98
|
+
const clone = (0, utils_1.cloneDeep)(ogNode);
|
|
99
|
+
if (utils.isLogicalGroup(clone) || utils.isFieldGroup(clone)) {
|
|
100
|
+
const filtered = clone.flow
|
|
101
|
+
.map((f) => {
|
|
102
|
+
const nodes = f.nodes
|
|
103
|
+
.map((n) => {
|
|
104
|
+
if (utils.isConjunction(n) || utils.isLogicalGroup(n)) {
|
|
105
|
+
// if grouping recurse to filter the inner nodes
|
|
106
|
+
return filterNode(n, clone);
|
|
107
|
+
}
|
|
108
|
+
if (utils.isNegation(n)
|
|
109
|
+
&& (utils.isConjunction(n.node) || utils.isLogicalGroup(n.node))) {
|
|
110
|
+
const _node = filterNode(n.node, clone);
|
|
111
|
+
if (utils.isEmptyNode(_node))
|
|
112
|
+
return;
|
|
113
|
+
return {
|
|
114
|
+
...n,
|
|
115
|
+
node: _node
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
// if filter fn returns true, keep the node
|
|
119
|
+
if (fn({ ...n }, parent))
|
|
120
|
+
return n;
|
|
121
|
+
return;
|
|
122
|
+
})
|
|
123
|
+
.filter(Boolean); // filter out undefined flow nodes
|
|
124
|
+
if (nodes.length) {
|
|
125
|
+
return { ...f, nodes };
|
|
126
|
+
}
|
|
127
|
+
return;
|
|
128
|
+
})
|
|
129
|
+
.filter(// filter out flows with zero nodes
|
|
130
|
+
(f) => !!(f === null || f === void 0 ? void 0 : f.nodes.filter(Boolean).length));
|
|
131
|
+
if (!filtered.length) {
|
|
132
|
+
return {
|
|
133
|
+
type: i.NodeType.Empty
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
clone.flow = filtered;
|
|
137
|
+
// if only 1 flow and 1 node, don't need conjunction anymore
|
|
138
|
+
if (clone.flow.length === 1 && clone.flow[0].nodes.length === 1) {
|
|
139
|
+
return clone.flow[0].nodes[0];
|
|
140
|
+
}
|
|
141
|
+
return clone;
|
|
142
|
+
}
|
|
143
|
+
if (utils.isRange(clone)) {
|
|
144
|
+
const keepLeft = fn(clone.left, clone);
|
|
145
|
+
let keepRight = false;
|
|
146
|
+
if (clone.right) {
|
|
147
|
+
keepRight = fn(clone.right, clone);
|
|
148
|
+
if (!keepRight) {
|
|
149
|
+
(0, utils_1.unset)(clone, 'right');
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
if (!keepLeft) {
|
|
153
|
+
(0, utils_1.unset)(clone, 'left');
|
|
154
|
+
if (keepRight && clone.right) {
|
|
155
|
+
clone.left = { ...clone.right, };
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
if (clone.left) {
|
|
159
|
+
return clone;
|
|
160
|
+
}
|
|
161
|
+
// fall through to end empty node if no left range
|
|
162
|
+
}
|
|
163
|
+
if (utils.isFunctionNode(clone)) {
|
|
164
|
+
const filtered = clone.params.map((n) => {
|
|
165
|
+
if (utils.isTermList(n)) {
|
|
166
|
+
const value = n.value.map((v) => {
|
|
167
|
+
const keep = fn({
|
|
168
|
+
...n,
|
|
169
|
+
type: i.NodeType.Term,
|
|
170
|
+
value: { ...v }
|
|
171
|
+
}, ogNode);
|
|
172
|
+
if (keep)
|
|
173
|
+
return v;
|
|
174
|
+
return;
|
|
175
|
+
}).filter(Boolean);
|
|
176
|
+
if (!value.length)
|
|
177
|
+
return;
|
|
178
|
+
n.value = value;
|
|
179
|
+
return n;
|
|
180
|
+
}
|
|
181
|
+
const keep = fn(n, ogNode);
|
|
182
|
+
if (keep)
|
|
183
|
+
return n;
|
|
184
|
+
return;
|
|
185
|
+
}).filter(Boolean);
|
|
186
|
+
if (!filtered.length) {
|
|
187
|
+
return { type: i.NodeType.Empty };
|
|
188
|
+
}
|
|
189
|
+
clone.params = filtered;
|
|
190
|
+
return clone;
|
|
191
|
+
}
|
|
192
|
+
if (fn(ogNode, parent)) {
|
|
193
|
+
return clone;
|
|
194
|
+
}
|
|
195
|
+
return {
|
|
196
|
+
type: i.NodeType.Empty
|
|
197
|
+
};
|
|
198
|
+
};
|
|
199
|
+
return filterNode(ast);
|
|
200
|
+
}
|
|
63
201
|
/**
|
|
64
202
|
* Recursively Iterate over all or select set of the nodes types
|
|
65
203
|
*/
|
|
@@ -193,6 +331,7 @@ class Parser {
|
|
|
193
331
|
});
|
|
194
332
|
return new Parser(this.query, {
|
|
195
333
|
type_config: this.typeConfig,
|
|
334
|
+
filterNilVariables: this.filterNilVariables
|
|
196
335
|
}, ast);
|
|
197
336
|
}
|
|
198
337
|
/**
|
package/dist/src/parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/parser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "xlucene-parser",
|
|
3
3
|
"displayName": "xLucene Parser",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.44.0",
|
|
5
5
|
"description": "Flexible Lucene-like evaluator and language parser",
|
|
6
6
|
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/xlucene-parser#readme",
|
|
7
7
|
"repository": {
|