@terascope/data-mate 0.38.1 → 0.38.2
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/data-frame/search/buildMatcherForNode.d.ts.map +1 -1
- package/dist/src/data-frame/search/buildMatcherForNode.js +22 -2
- package/dist/src/data-frame/search/buildMatcherForNode.js.map +1 -1
- package/dist/src/data-frame/search/buildSearchMatcherForQuery.d.ts.map +1 -1
- package/dist/src/data-frame/search/buildSearchMatcherForQuery.js.map +1 -1
- package/dist/src/document-matcher/logic-builder/index.d.ts.map +1 -1
- package/dist/src/document-matcher/logic-builder/index.js +24 -20
- package/dist/src/document-matcher/logic-builder/index.js.map +1 -1
- package/dist/src/document-matcher/logic-builder/string.d.ts +2 -2
- package/dist/src/document-matcher/logic-builder/string.d.ts.map +1 -1
- package/dist/src/document-matcher/logic-builder/string.js +4 -0
- package/dist/src/document-matcher/logic-builder/string.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildMatcherForNode.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/buildMatcherForNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAOzF,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAgB,MAAM,cAAc,CAAC;AAIxD;;;;EAIE;AACF,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,EACzB,UAAU,EAAE,iBAAiB,EAC7B,SAAS,EAAE,gBAAgB,UAEgB,MAAM,KAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"buildMatcherForNode.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/buildMatcherForNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAOzF,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAgB,MAAM,cAAc,CAAC;AAIxD;;;;EAIE;AACF,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,EACzB,UAAU,EAAE,iBAAiB,EAC7B,SAAS,EAAE,gBAAgB,UAEgB,MAAM,KAAG,UAAU,CAsDjE"}
|
|
@@ -60,6 +60,9 @@ function buildMatcherForNode(dataFrame, typeConfig, variables) {
|
|
|
60
60
|
}
|
|
61
61
|
if (p.isTermType(node)) {
|
|
62
62
|
const value = getComparisonValue(node, variables);
|
|
63
|
+
if (value === undefined) {
|
|
64
|
+
return () => false;
|
|
65
|
+
}
|
|
63
66
|
if (p.isTerm(node)) {
|
|
64
67
|
return matchFieldValue(dataFrame, field, typeFunctions(node, typeConfig, variables, makeIsValue(value)));
|
|
65
68
|
}
|
|
@@ -147,6 +150,9 @@ function typeFunctions(node, typeConfig, variables, defaultCb) {
|
|
|
147
150
|
return (0, date_utils_1.dateRange)(rangeQuery);
|
|
148
151
|
}
|
|
149
152
|
const value = p.getFieldValue(node.value, variables);
|
|
153
|
+
if (value === undefined) {
|
|
154
|
+
return () => false;
|
|
155
|
+
}
|
|
150
156
|
return (0, date_utils_1.compareTermDates)(value);
|
|
151
157
|
}
|
|
152
158
|
if (type === types_1.xLuceneFieldType.IP) {
|
|
@@ -155,6 +161,9 @@ function typeFunctions(node, typeConfig, variables, defaultCb) {
|
|
|
155
161
|
return (0, ip_utils_1.ipRange)(rangeQuery);
|
|
156
162
|
}
|
|
157
163
|
const value = p.getFieldValue(node.value, variables);
|
|
164
|
+
if (value === undefined) {
|
|
165
|
+
return () => false;
|
|
166
|
+
}
|
|
158
167
|
return (0, ip_utils_1.ipTerm)(value);
|
|
159
168
|
}
|
|
160
169
|
if (type === types_1.xLuceneFieldType.Boolean) {
|
|
@@ -172,6 +181,8 @@ function makeIsValue(value) {
|
|
|
172
181
|
if (typeof value === 'number' && typeof data === 'bigint') {
|
|
173
182
|
return (0, utils_1.toBigIntOrThrow)(value) === data;
|
|
174
183
|
}
|
|
184
|
+
if (data == null && value == null)
|
|
185
|
+
return true;
|
|
175
186
|
if (data == null && value == null)
|
|
176
187
|
return true;
|
|
177
188
|
return (0, utils_1.isEqual)(data, value);
|
|
@@ -199,11 +210,20 @@ function makeRangeFn(node, variables) {
|
|
|
199
210
|
const { left, right } = node;
|
|
200
211
|
if (right == null) {
|
|
201
212
|
const value = p.getFieldValue(left.value, variables);
|
|
202
|
-
|
|
213
|
+
const leftFN = value === undefined
|
|
214
|
+
? () => false
|
|
215
|
+
: rangeMapping[left.operator](value);
|
|
216
|
+
return leftFN;
|
|
203
217
|
}
|
|
204
218
|
const leftValue = p.getFieldValue(left.value, variables);
|
|
205
219
|
const rightValue = p.getFieldValue(right.value, variables);
|
|
206
|
-
|
|
220
|
+
const leftFN = leftValue === undefined
|
|
221
|
+
? () => false
|
|
222
|
+
: rangeMapping[left.operator](leftValue);
|
|
223
|
+
const rightFN = leftValue === undefined
|
|
224
|
+
? () => false
|
|
225
|
+
: rangeMapping[right.operator](rightValue);
|
|
226
|
+
return (0, utils_1.and)(leftFN, rightFN);
|
|
207
227
|
}
|
|
208
228
|
function isFalse() {
|
|
209
229
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildMatcherForNode.js","sourceRoot":"","sources":["../../../../src/data-frame/search/buildMatcherForNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAyF;AACzF,4CAI0B;AAC1B,+BAA+B;AAC/B,kDAAoC;AAEpC,6CAA2D;AAE3D,yCAA6C;AAC7C,2EAAmF;AAEnF;;;;EAIE;AACF,SAAgB,mBAAmB,CAC/B,SAAyB,EACzB,UAA6B,EAC7B,SAA2B;IAE3B,OAAO,SAAS,oBAAoB,CAAC,IAAY;QAC7C,IAAI,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,OAAO,CAAC;SAClB;QAED,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACpB,OAAO,IAAA,WAAG,EAAC,mBAAmB,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAChF;QAED,IAAI,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,WAAW,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;SAC9D;QAED,MAAM,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,OAAO,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,aAAa,CAClD,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAC5D,CAAC,CAAC;SACN;QAED,IAAI,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YACxB,MAAM,QAAQ,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;YAC9E,OAAO,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;SAC5D;QAED,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClB,OAAO,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,gBAAQ,CAAC,CAAC;SACtD;QAED,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAElD,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAChB,OAAO,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,aAAa,CAClD,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,KAAK,CAAC,CAClD,CAAC,CAAC;aACN;YAED,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAClB,OAAO,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,IAAA,kCAAM,EAAC,KAAK,CAAC,CAAC,CAAC;aAC3D;YAED,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACpB,OAAO,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,IAAA,oCAAQ,EAAC,KAAK,CAAC,CAAC,CAAC;aAC7D;SACJ;QAED,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAA,cAAO,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC;AACN,CAAC;
|
|
1
|
+
{"version":3,"file":"buildMatcherForNode.js","sourceRoot":"","sources":["../../../../src/data-frame/search/buildMatcherForNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildSearchMatcherForQuery.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/buildSearchMatcherForQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,wBAAgB,0BAA0B,CACtC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,EACzB,KAAK,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,gBAAgB,EAC5B,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,GAC9B,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,
|
|
1
|
+
{"version":3,"file":"buildSearchMatcherForQuery.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/buildSearchMatcherForQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,wBAAgB,0BAA0B,CACtC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,EACzB,KAAK,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,gBAAgB,EAC5B,oBAAoB,CAAC,EAAE,CAAC,CAAC,IAAI,GAC9B,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAc/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildSearchMatcherForQuery.js","sourceRoot":"","sources":["../../../../src/data-frame/search/buildSearchMatcherForQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAiD;AAEjD,kDAAoC;AAEpC,+DAA4D;AAE5D,SAAgB,0BAA0B,CACtC,SAAyB,EACzB,KAAa,EACb,SAA4B,EAC5B,oBAA6B;IAE7B,IAAI,MAAM,GAAG,IAAI,CAAC,CAAC,MAAM,CACrB,KAAK,EACL,EAAE,WAAW,EAAE,oBAAoB,CAAC,SAAS,CAAC,EAAE,EAChD,oBAAoB,CACvB,CAAC;IAEF,IAAI,SAAS,EAAE;QACX,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;KAC/C;
|
|
1
|
+
{"version":3,"file":"buildSearchMatcherForQuery.js","sourceRoot":"","sources":["../../../../src/data-frame/search/buildSearchMatcherForQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAiD;AAEjD,kDAAoC;AAEpC,+DAA4D;AAE5D,SAAgB,0BAA0B,CACtC,SAAyB,EACzB,KAAa,EACb,SAA4B,EAC5B,oBAA6B;IAE7B,IAAI,MAAM,GAAG,IAAI,CAAC,CAAC,MAAM,CACrB,KAAK,EACL,EAAE,WAAW,EAAE,oBAAoB,CAAC,SAAS,CAAC,EAAE,EAChD,oBAAoB,CACvB,CAAC;IAEF,IAAI,SAAS,EAAE;QACX,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;KAC/C;IAED,OAAO,IAAA,yCAAmB,EAAC,SAAS,EAAE,MAAM,CAAC,UAAU,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,CACrE,MAAM,CAAC,GAAG,CACb,CAAC;AACN,CAAC;AAnBD,gEAmBC;AAED,SAAS,oBAAoB,CAAC,KAAqB;IAC/C,OAAO,IAAI,qBAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC;AAClD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzF,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzF,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAUpC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,MAAM,CAAC,OAAO,UAAU,YAAY,CAChC,MAAM,EAAE,CAAC,CAAC,MAAM,EAChB,SAAS,GAAE,gBAAqB,GACjC,SAAS,CAEX"}
|
|
@@ -67,33 +67,29 @@ function makeNegate(fn) {
|
|
|
67
67
|
};
|
|
68
68
|
}
|
|
69
69
|
const rangeMapping = {
|
|
70
|
-
gte
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
return value > other;
|
|
75
|
-
},
|
|
76
|
-
lte(value, other) {
|
|
77
|
-
return value <= other;
|
|
78
|
-
},
|
|
79
|
-
lt(value, other) {
|
|
80
|
-
return value < other;
|
|
81
|
-
}
|
|
70
|
+
gte: utils_1.isGreaterThanOrEqualToFP,
|
|
71
|
+
gt: utils_1.isGreaterThanFP,
|
|
72
|
+
lte: utils_1.isLessThanOrEqualToFP,
|
|
73
|
+
lt: utils_1.isLessThanFP
|
|
82
74
|
};
|
|
83
75
|
function rangeFn(node, variables) {
|
|
84
76
|
const { left, right } = node;
|
|
85
|
-
if (
|
|
77
|
+
if (right == null) {
|
|
86
78
|
const value = p.getFieldValue(left.value, variables);
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
79
|
+
const leftFN = value === undefined
|
|
80
|
+
? () => false
|
|
81
|
+
: rangeMapping[left.operator](value);
|
|
82
|
+
return leftFN;
|
|
90
83
|
}
|
|
91
84
|
const leftValue = p.getFieldValue(left.value, variables);
|
|
92
85
|
const rightValue = p.getFieldValue(right.value, variables);
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
86
|
+
const leftFN = leftValue === undefined
|
|
87
|
+
? () => false
|
|
88
|
+
: rangeMapping[left.operator](leftValue);
|
|
89
|
+
const rightFN = leftValue === undefined
|
|
90
|
+
? () => false
|
|
91
|
+
: rangeMapping[right.operator](rightValue);
|
|
92
|
+
return (0, utils_1.and)(leftFN, rightFN);
|
|
97
93
|
}
|
|
98
94
|
function valueExists(value) {
|
|
99
95
|
return value != null;
|
|
@@ -154,6 +150,9 @@ function typeFunctions(node, typeConfig, variables, defaultCb) {
|
|
|
154
150
|
return (0, dates_1.dateRange)(rangeQuery);
|
|
155
151
|
}
|
|
156
152
|
const value = p.getFieldValue(node.value, variables);
|
|
153
|
+
if (value === undefined) {
|
|
154
|
+
return () => false;
|
|
155
|
+
}
|
|
157
156
|
return (0, dates_1.compareTermDates)(value);
|
|
158
157
|
}
|
|
159
158
|
if (type === types_1.xLuceneFieldType.IP) {
|
|
@@ -162,6 +161,9 @@ function typeFunctions(node, typeConfig, variables, defaultCb) {
|
|
|
162
161
|
return (0, ip_1.ipRange)(rangeQuery);
|
|
163
162
|
}
|
|
164
163
|
const value = p.getFieldValue(node.value, variables);
|
|
164
|
+
if (value === undefined) {
|
|
165
|
+
return () => false;
|
|
166
|
+
}
|
|
165
167
|
return (0, ip_1.ipTerm)(value);
|
|
166
168
|
}
|
|
167
169
|
if (type === types_1.xLuceneFieldType.Boolean) {
|
|
@@ -172,6 +174,8 @@ function typeFunctions(node, typeConfig, variables, defaultCb) {
|
|
|
172
174
|
return defaultCb;
|
|
173
175
|
}
|
|
174
176
|
function makeIsValue(value) {
|
|
177
|
+
if (value === undefined)
|
|
178
|
+
return () => false;
|
|
175
179
|
return function isValue(data) {
|
|
176
180
|
if (typeof value === 'bigint' && typeof data === 'number') {
|
|
177
181
|
return value === BigInt(data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAyF;AACzF,kDAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BooleanCB } from '../interfaces';
|
|
2
|
-
export declare function regexp(regexStr: string): (str: string) => boolean;
|
|
3
|
-
export declare function wildcard(wildcardStr: string): (str: string) => boolean;
|
|
2
|
+
export declare function regexp(regexStr: string | undefined): (str: string) => boolean;
|
|
3
|
+
export declare function wildcard(wildcardStr: string | undefined): (str: string) => boolean;
|
|
4
4
|
export declare function findWildcardField(field: string, cb: BooleanCB): (data: Record<string, any>) => boolean;
|
|
5
5
|
//# sourceMappingURL=string.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/string.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/string.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAC,SAAS,SAGb,MAAM,KAAG,OAAO,CAGnD;AAED,wBAAgB,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAC,SAAS,SAGhB,MAAM,KAAG,OAAO,CAGrD;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,UACtB,OAAO,MAAM,EAAE,GAAG,CAAC,KAAG,OAAO,CAKpE"}
|
|
@@ -3,12 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.findWildcardField = exports.wildcard = exports.regexp = void 0;
|
|
4
4
|
const utils_1 = require("@terascope/utils");
|
|
5
5
|
function regexp(regexStr) {
|
|
6
|
+
if (regexStr === undefined)
|
|
7
|
+
return () => false;
|
|
6
8
|
return function regexpTerm(str) {
|
|
7
9
|
return (0, utils_1.match)(`^${regexStr}$`, str) != null;
|
|
8
10
|
};
|
|
9
11
|
}
|
|
10
12
|
exports.regexp = regexp;
|
|
11
13
|
function wildcard(wildcardStr) {
|
|
14
|
+
if (wildcardStr === undefined)
|
|
15
|
+
return () => false;
|
|
12
16
|
return function wildcardTerm(str) {
|
|
13
17
|
return (0, utils_1.matchWildcard)(wildcardStr, str);
|
|
14
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/string.ts"],"names":[],"mappings":";;;AAAA,4CAK0B;AAG1B,SAAgB,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/string.ts"],"names":[],"mappings":";;;AAAA,4CAK0B;AAG1B,SAAgB,MAAM,CAAC,QAA0B;IAC7C,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;IAE/C,OAAO,SAAS,UAAU,CAAC,GAAW;QAClC,OAAO,IAAA,aAAK,EAAC,IAAI,QAAQ,GAAG,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC;IAC/C,CAAC,CAAC;AACN,CAAC;AAND,wBAMC;AAED,SAAgB,QAAQ,CAAC,WAA6B;IAClD,IAAI,WAAW,KAAK,SAAS;QAAE,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;IAElD,OAAO,SAAS,YAAY,CAAC,GAAW;QACpC,OAAO,IAAA,qBAAa,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC,CAAC;AACN,CAAC;AAND,4BAMC;AAED,SAAgB,iBAAiB,CAAC,KAAa,EAAE,EAAa;IAC1D,OAAO,SAAS,aAAa,CAAC,IAAyB;QACnD,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAC5C,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC,CAAC;AACN,CAAC;AAND,8CAMC;AAED,oCAAoC;AACpC,SAAS,iBAAiB,CAAC,KAAa,EAAE,MAA2B;IACjE,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,uBAAe,CAAC,CAAC;IAC5D,OAAO,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,OAAO,CAAC,GAAa,EAAE,GAAwB;IACpD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,EAAG,CAAC;IAE7B,MAAM,OAAO,GAAU,EAAE,CAAC;IAC1B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC5C,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACnB,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;gBAClB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACvB;iBAAM,IAAI,IAAA,qBAAa,EAAC,KAAK,CAAC,EAAE;gBAC7B,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;aAChD;SACJ;KACJ;IACD,OAAO,OAAO,CAAC;AACnB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@terascope/data-mate",
|
|
3
3
|
"displayName": "Data-Mate",
|
|
4
|
-
"version": "0.38.
|
|
4
|
+
"version": "0.38.2",
|
|
5
5
|
"description": "Library of data validations/transformations",
|
|
6
6
|
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/data-mate#readme",
|
|
7
7
|
"repository": {
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"uuid": "^8.3.2",
|
|
47
47
|
"valid-url": "^1.0.9",
|
|
48
48
|
"validator": "^13.7.0",
|
|
49
|
-
"xlucene-parser": "^0.42.
|
|
49
|
+
"xlucene-parser": "^0.42.3"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
52
|
"@types/ip6addr": "^0.2.2",
|