@terascope/data-mate 1.3.0 → 1.3.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/data-frame/search/buildMatcherForNode.d.ts.map +1 -1
- package/dist/src/data-frame/search/buildMatcherForNode.js +3 -3
- package/dist/src/data-frame/search/buildMatcherForNode.js.map +1 -1
- package/dist/src/data-frame/search/date-utils.d.ts +1 -1
- package/dist/src/data-frame/search/date-utils.d.ts.map +1 -1
- package/dist/src/data-frame/search/interfaces.d.ts +0 -3
- package/dist/src/data-frame/search/interfaces.d.ts.map +1 -1
- package/dist/src/data-frame/search/wildcards-and-regex-utils.d.ts +1 -1
- package/dist/src/data-frame/search/wildcards-and-regex-utils.d.ts.map +1 -1
- package/dist/src/data-frame/utils.js +1 -1
- package/dist/src/data-frame/utils.js.map +1 -1
- package/dist/src/document-matcher/logic-builder/index.js +1 -1
- package/dist/src/document-matcher/logic-builder/index.js.map +1 -1
- package/dist/src/interfaces.d.ts +3 -0
- package/dist/src/interfaces.d.ts.map +1 -1
- package/dist/src/{data-frame/search/ip-utils.d.ts → ip-utils.d.ts} +2 -0
- package/dist/src/ip-utils.d.ts.map +1 -0
- package/dist/src/{data-frame/search/ip-utils.js → ip-utils.js} +32 -11
- package/dist/src/ip-utils.js.map +1 -0
- package/package.json +1 -1
- package/dist/src/data-frame/search/ip-utils.d.ts.map +0 -1
- package/dist/src/data-frame/search/ip-utils.js.map +0 -1
- package/dist/src/document-matcher/logic-builder/ip.d.ts +0 -5
- package/dist/src/document-matcher/logic-builder/ip.d.ts.map +0 -1
- package/dist/src/document-matcher/logic-builder/ip.js +0 -91
- package/dist/src/document-matcher/logic-builder/ip.js.map +0 -1
|
@@ -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,iBAAiB,CAAC;AAEjD,OAAO,EAAE,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,iBAAiB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C;;;;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"}
|
|
@@ -3,7 +3,7 @@ import { and, isEqual, isNotNil, isWildCardString, not, or, isGreaterThanFP, isG
|
|
|
3
3
|
import { inspect } from 'node:util';
|
|
4
4
|
import * as p from 'xlucene-parser';
|
|
5
5
|
import { compareTermDates, dateRange } from './date-utils.js';
|
|
6
|
-
import {
|
|
6
|
+
import { ipRangeOrThrow, ipTermOrThrow } from '../../ip-utils.js';
|
|
7
7
|
import { findWildcardFields, regexp, wildcard } from './wildcards-and-regex-utils.js';
|
|
8
8
|
/**
|
|
9
9
|
* This builds a matcher for particular node,
|
|
@@ -131,13 +131,13 @@ function typeFunctions(node, typeConfig, variables, defaultCb) {
|
|
|
131
131
|
if (type === xLuceneFieldType.IP) {
|
|
132
132
|
if (p.isRange(node)) {
|
|
133
133
|
const rangeQuery = p.parseRange(node, variables);
|
|
134
|
-
return
|
|
134
|
+
return ipRangeOrThrow(rangeQuery);
|
|
135
135
|
}
|
|
136
136
|
const value = p.getFieldValue(node.value, variables);
|
|
137
137
|
if (value === undefined) {
|
|
138
138
|
return () => false;
|
|
139
139
|
}
|
|
140
|
-
return
|
|
140
|
+
return ipTermOrThrow(value);
|
|
141
141
|
}
|
|
142
142
|
if (type === xLuceneFieldType.Boolean) {
|
|
143
143
|
if (p.isRange(node)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildMatcherForNode.js","sourceRoot":"","sources":["../../../../src/data-frame/search/buildMatcherForNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAuC,MAAM,kBAAkB,CAAC;AACzF,OAAO,EACH,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,EAAE,EACjD,eAAe,EAAE,wBAAwB,EACzC,qBAAqB,EAAE,YAAY,EAAE,eAAe,EACvD,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"buildMatcherForNode.js","sourceRoot":"","sources":["../../../../src/data-frame/search/buildMatcherForNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ParsedRange } from 'xlucene-parser';
|
|
2
|
-
import { MatchValueFn } from '
|
|
2
|
+
import { MatchValueFn } from '../../interfaces.js';
|
|
3
3
|
export declare function compareTermDates(value: unknown): MatchValueFn;
|
|
4
4
|
export declare function dateRange(rangeQuery: ParsedRange): MatchValueFn;
|
|
5
5
|
//# sourceMappingURL=date-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date-utils.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/date-utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgC,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"date-utils.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/date-utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgC,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAInD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY,CAO7D;AA8BD,wBAAgB,SAAS,CACrB,UAAU,EAAE,WAAW,GACxB,YAAY,CAed"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/interfaces.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACvB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/interfaces.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACvB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wildcards-and-regex-utils.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/wildcards-and-regex-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"wildcards-and-regex-utils.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/wildcards-and-regex-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,wBAAgB,MAAM,CAAC,QAAQ,EAAE,OAAO,GAAG,YAAY,CAYtD;AAED,wBAAgB,QAAQ,CAAC,WAAW,EAAE,OAAO,GAAG,YAAY,CAW3D;AAED;;;EAGE;AACF,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAGpF"}
|
|
@@ -26,7 +26,7 @@ export function distributeRowsToColumns(config, records) {
|
|
|
26
26
|
}
|
|
27
27
|
export function concatColumnsToColumns(builders, columns, offset) {
|
|
28
28
|
for (const [field, builder] of builders) {
|
|
29
|
-
const col = columns.find((
|
|
29
|
+
const col = columns.find((c) => c.name === field);
|
|
30
30
|
if (col) {
|
|
31
31
|
for (const [i, v] of col.vector.values()) {
|
|
32
32
|
builder.data.set(i + offset, v);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/data-frame/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAKvD,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,MAAM,EAAY,MAAM,oBAAoB,CAAC;AAEtD,MAAM,UAAU,YAAY,CACxB,QAAwC,EACxC,OAAY;IAEZ,MAAM,SAAS,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;QAC1B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;KACtB;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,eAAe,CACpB,QAAmC;IAEnC,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC5B,OAAO,SAAS,gBAAgB,CAAC,MAAS;QACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC1B,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACjD;IACL,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,MAA+C,EAAE,OAAY;IAE7D,OAAO,YAAY,CACf,oBAAoB,CAAI,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAC/C,OAAO,CACV,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CACvB,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE;QAC3B,IAAI;QACJ,OAAO,EAAE,MAAM,CAAC,OAAO;KAC1B,CAAC,CACL,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,sBAAsB,CAClC,QAAoC,EACpC,OAAwC,EACxC,MAAc;IAEd,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QACrC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/data-frame/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import * as p from 'xlucene-parser';
|
|
|
3
3
|
import { isWildCardString, get, isEqual, isArray, and, isGreaterThanFP, isGreaterThanOrEqualToFP, isLessThanOrEqualToFP, isLessThanFP, } from '@terascope/utils';
|
|
4
4
|
import { compareTermDates, dateRange } from './dates.js';
|
|
5
5
|
import { regexp, wildcard, findWildcardField } from './string.js';
|
|
6
|
-
import { ipTerm, ipRange } from '
|
|
6
|
+
import { ipTerm, ipRange } from '../../ip-utils.js';
|
|
7
7
|
export default function buildLogicFn(parser, variables = {}) {
|
|
8
8
|
return walkAst(parser.ast, parser.typeConfig, variables);
|
|
9
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAuC,MAAM,kBAAkB,CAAC;AACzF,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EACH,gBAAgB,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EACvC,GAAG,EAAE,eAAe,EAAE,wBAAwB,EAC9C,qBAAqB,EAAE,YAAY,GACtC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAuC,MAAM,kBAAkB,CAAC;AACzF,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EACH,gBAAgB,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EACvC,GAAG,EAAE,eAAe,EAAE,wBAAwB,EAC9C,qBAAqB,EAAE,YAAY,GACtC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,OAAO,UAAU,YAAY,CAChC,MAAgB,EAChB,YAA8B,EAAE;IAEhC,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC7B,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAEzD,OAAO,SAAS,OAAO,CAAC,GAAG;QACvB,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;YACd,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;SACtE;QACD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;AACN,CAAC;AAED,SAAS,SAAS,CAAC,KAAyB,EAAE,EAAa;IACvD,IAAI,KAAK,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE;QAClC,OAAO,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;KACvC;IACD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAElC,OAAO,SAAS,UAAU,CAAC,GAAG;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAExB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;SAC3B;QACD,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAC;AACN,CAAC;AAED,SAAS,UAAU,CAAC,EAAa;IAC7B,OAAO,SAAS,MAAM,CAAC,IAAW;QAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC,CAAC;AACN,CAAC;AAED,SAAS,UAAU,CAAC,EAAO;IACvB,OAAO,SAAS,MAAM,CAAC,IAAS;QAC5B,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC,CAAC;AACN,CAAC;AAED,MAAM,YAAY,GAAG;IACjB,GAAG,EAAE,wBAAwB;IAC7B,EAAE,EAAE,eAAe;IACnB,GAAG,EAAE,qBAAqB;IAC1B,EAAE,EAAE,YAAY;CACV,CAAC;AAEX,SAAS,OAAO,CAAC,IAAa,EAAE,SAA2B;IACvD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAE7B,IAAI,KAAK,IAAI,IAAI,EAAE;QACf,MAAM,KAAK,GAAG,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErD,MAAM,MAAM,GAAG,KAAK,KAAK,SAAS;YAC9B,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK;YACb,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC;QAEzC,OAAO,MAAM,CAAC;KACjB;IAED,MAAM,SAAS,GAAG,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAG,SAAS,KAAK,SAAS;QAClC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK;QACb,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,SAAS,KAAK,SAAS;QACnC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK;QACb,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC;IAE/C,OAAO,GAAG,CACN,MAAM,EACN,OAAO,CACV,CAAC;AACN,CAAC;AAED,SAAS,WAAW,CAAC,KAAU;IAC3B,OAAO,KAAK,IAAI,IAAI,CAAC;AACzB,CAAC;AAED,SAAS,OAAO;IACZ,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,OAAO,CACZ,IAAY,EACZ,UAA6B,EAC7B,SAA2B;IAE3B,IAAI,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QACrB,OAAO,OAAO,CAAC;KAClB;IAED,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACpB,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAC7D,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC;KACjC;IAED,IAAI,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QACrB,OAAO,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;KACnD;IAED,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE/B,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAChB,OAAO,SAAS,CAAC,KAAK,EAAE,aAAa,CACjC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,KAAK,CAAC,CAClD,CAAC,CAAC;KACN;IAED,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,SAAS,CAAC,KAAK,EAAE,aAAa,CACjC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CACxD,CAAC,CAAC;KACN;IAED,IAAI,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;QACxB,MAAM,QAAQ,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;QAC9E,OAAO,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC3C;IAED,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;KACxC;IAED,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;KAC1C;IAED,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACpB,OAAO,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;KAC5C;IAED,sDAAsD;IACtD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS,WAAW,CAChB,IAAa,EAAE,SAA2B;IAE1C,IAAI,CAAC,IAAI;QAAE,OAAO,SAAgB,CAAC;IACnC,IAAI,OAAQ,IAAY,CAAC,KAAK,KAAK,QAAQ,EAAE;QACzC,OAAO,CAAC,CAAC,aAAa,CAAE,IAAY,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;KAC1D;IACD,OAAQ,IAAY,CAAC,KAAK,CAAC;AAC/B,CAAC;AAED,SAAS,aAAa,CAClB,IAAsB,EACtB,UAA6B,EAC7B,SAA2B,EAC3B,SAAoB;IAEpB,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC;IAEzC,MAAM,IAAI,GAAqB,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACtD,IAAI,IAAI,KAAK,gBAAgB,CAAC,IAAI,EAAE;QAChC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACjD,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;SAChC;QACD,MAAM,KAAK,GAAG,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAErD,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;SACtB;QAED,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC;KAClC;IAED,IAAI,IAAI,KAAK,gBAAgB,CAAC,EAAE,EAAE;QAC9B,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACjD,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC;SAC9B;QAED,MAAM,KAAK,GAAG,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACrD,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;SACtB;QAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;KACxB;IAED,IAAI,IAAI,KAAK,gBAAgB,CAAC,OAAO,EAAE;QACnC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;SACnE;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,WAAW,CAAC,KAAU;IAC3B,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;IAE5C,OAAO,SAAS,OAAO,CAAC,IAAS;QAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACvD,OAAO,KAAK,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;SACjC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACvD,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;SACjC;QACD,OAAO,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,iBAAiB,CACtB,WAA0B,EAC1B,UAA6B,EAC7B,SAA2B;IAE3B,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;IAClF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,WAAW,CAChB,IAAqB,EACrB,UAA6B,EAC7B,SAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,iBAAiB,CACxD,WAAW,EAAE,UAAU,EAAE,SAAS,CACrC,CAAC,CAAC;IACH,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,aAAa,CAAC,GAAgB;IACnC,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;IACvB,OAAO,SAAS,SAAS,CAAC,IAAS;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC1B,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC;SACjC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC;AACN,CAAC;AAED,SAAS,aAAa,CAAC,GAAgB;IACnC,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;IAEvB,OAAO,SAAS,SAAS,CAAC,IAAS;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC1B,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAAE,OAAO,KAAK,CAAC;SACnC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;AACN,CAAC"}
|
package/dist/src/interfaces.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElE,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,oBAAY,SAAS;IACjB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,GAAG,QAAQ;CACd;AAED,MAAM,WAAW,UAAU;IACvB,EAAE,EAAE,GAAG,CAAC;IACR,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,kBAAkB,EAAE,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,UAAU;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC;CAC7B;AAED,UAAU,MAAM;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAC;CACtC;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;AAEtE,MAAM,WAAW,kBAAkB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,GAAG,CAAC,EAAE,GAAG,CAAC;CACb"}
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElE,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,oBAAY,SAAS;IACjB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,GAAG,QAAQ;CACd;AAED,MAAM,WAAW,UAAU;IACvB,EAAE,EAAE,GAAG,CAAC;IACR,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,kBAAkB,EAAE,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,UAAU;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC;CAC7B;AAED,UAAU,MAAM;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAC;CACtC;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;AAEtE,MAAM,WAAW,kBAAkB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,GAAG,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,WAAW,YAAY;IACzB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC;CAC7B"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { ParsedRange } from 'xlucene-parser';
|
|
2
2
|
import { MatchValueFn } from './interfaces.js';
|
|
3
|
+
export declare function ipTermOrThrow(value: unknown): MatchValueFn;
|
|
3
4
|
export declare function ipTerm(value: unknown): MatchValueFn;
|
|
4
5
|
export declare function ipRange(rangeQuery: ParsedRange): MatchValueFn;
|
|
6
|
+
export declare function ipRangeOrThrow(rangeQuery: ParsedRange): MatchValueFn;
|
|
5
7
|
//# sourceMappingURL=ip-utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ip-utils.d.ts","sourceRoot":"","sources":["../../src/ip-utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE3E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAwB/C,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,gBAS3C;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY,CASnD;AA8FD,wBAAgB,OAAO,CAAC,UAAU,EAAE,WAAW,GAAG,YAAY,CAG7D;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,WAAW,gBAGrD"}
|
|
@@ -16,16 +16,28 @@ function getRangeValues(rangeQuery) {
|
|
|
16
16
|
incMin, incMax, minValue, maxValue
|
|
17
17
|
};
|
|
18
18
|
}
|
|
19
|
+
export function ipTermOrThrow(value) {
|
|
20
|
+
const argCidr = isString(value) ? isCidr(value) : false;
|
|
21
|
+
if (argCidr) {
|
|
22
|
+
const range = ip6addr.createCIDR(`${value}`);
|
|
23
|
+
return pRangeTerm(range, true);
|
|
24
|
+
}
|
|
25
|
+
return isIPTerm(value, true);
|
|
26
|
+
}
|
|
19
27
|
export function ipTerm(value) {
|
|
20
28
|
const argCidr = isString(value) ? isCidr(value) : false;
|
|
21
29
|
if (argCidr) {
|
|
22
30
|
const range = ip6addr.createCIDR(`${value}`);
|
|
23
|
-
return pRangeTerm(range);
|
|
31
|
+
return pRangeTerm(range, false);
|
|
24
32
|
}
|
|
25
|
-
return
|
|
26
|
-
|
|
33
|
+
return isIPTerm(value, false);
|
|
34
|
+
}
|
|
35
|
+
function isIPTerm(value, shouldThrow) {
|
|
36
|
+
return function _isIPTerm(ip) {
|
|
37
|
+
if (ip == null) {
|
|
27
38
|
return false;
|
|
28
|
-
|
|
39
|
+
}
|
|
40
|
+
if (shouldThrow && !isString(ip)) {
|
|
29
41
|
throw new TypeError(`Expected string for IP term match, got ${ip} (${getTypeOf(ip)})`);
|
|
30
42
|
}
|
|
31
43
|
if (isNonZeroCidr(ip)) {
|
|
@@ -76,24 +88,33 @@ function checkCidr(ip, range) {
|
|
|
76
88
|
|| argRange.contains(range.first().toString())
|
|
77
89
|
|| argRange.contains(range.last().toString()));
|
|
78
90
|
}
|
|
79
|
-
function pRangeTerm(range) {
|
|
91
|
+
function pRangeTerm(range, shouldThrow) {
|
|
80
92
|
return function checkIP(ip) {
|
|
81
|
-
if (ip == null)
|
|
93
|
+
if (ip == null) {
|
|
82
94
|
return false;
|
|
83
|
-
|
|
95
|
+
}
|
|
96
|
+
if (shouldThrow && !isString(ip)) {
|
|
84
97
|
throw new TypeError(`Expected string for IP Range match, got ${ip} (${getTypeOf(ip)})`);
|
|
85
98
|
}
|
|
86
99
|
if (isNonZeroCidr(ip)) {
|
|
87
100
|
return checkCidr(ip, range);
|
|
88
101
|
}
|
|
89
|
-
if (isIP(ip))
|
|
102
|
+
if (isIP(ip)) {
|
|
90
103
|
return range.contains(ip);
|
|
104
|
+
}
|
|
91
105
|
return false;
|
|
92
106
|
};
|
|
93
107
|
}
|
|
94
|
-
|
|
108
|
+
function createRange(rangeQuery) {
|
|
95
109
|
const { minValue, maxValue } = validateIPRange(rangeQuery);
|
|
96
|
-
|
|
97
|
-
|
|
110
|
+
return ip6addr.createAddrRange(minValue, maxValue);
|
|
111
|
+
}
|
|
112
|
+
export function ipRange(rangeQuery) {
|
|
113
|
+
const range = createRange(rangeQuery);
|
|
114
|
+
return pRangeTerm(range, false);
|
|
115
|
+
}
|
|
116
|
+
export function ipRangeOrThrow(rangeQuery) {
|
|
117
|
+
const range = createRange(rangeQuery);
|
|
118
|
+
return pRangeTerm(range, true);
|
|
98
119
|
}
|
|
99
120
|
//# sourceMappingURL=ip-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ip-utils.js","sourceRoot":"","sources":["../../src/ip-utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@terascope/data-mate",
|
|
3
3
|
"displayName": "Data-Mate",
|
|
4
|
-
"version": "1.3.
|
|
4
|
+
"version": "1.3.1",
|
|
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": {
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ip-utils.d.ts","sourceRoot":"","sources":["../../../../src/data-frame/search/ip-utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE3E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAwB/C,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY,CAkBnD;AA4DD,wBAAgB,OAAO,CAAC,UAAU,EAAE,WAAW,GAAG,YAAY,CAI7D"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ip-utils.js","sourceRoot":"","sources":["../../../../src/data-frame/search/ip-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ip.d.ts","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/ip.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE3E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAwB7C,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAchD;AAyDD,wBAAgB,OAAO,CAAC,UAAU,EAAE,WAAW,GAAG,SAAS,CAI1D"}
|
|
@@ -1,91 +0,0 @@
|
|
|
1
|
-
import isCidr from 'is-cidr';
|
|
2
|
-
import ip6addr from 'ip6addr';
|
|
3
|
-
import { isIP, isIPv6 } from 'is-ip';
|
|
4
|
-
import { isInfiniteMin, isInfiniteMax } from 'xlucene-parser';
|
|
5
|
-
import { isString, isNonZeroCidr } from '@terascope/utils';
|
|
6
|
-
const MIN_IPV4_IP = '0.0.0.0';
|
|
7
|
-
const MAX_IPV4_IP = '255.255.255.255';
|
|
8
|
-
const MIN_IPV6_IP = '::';
|
|
9
|
-
const MAX_IPV6_IP = 'ffff.ffff.ffff.ffff.ffff.ffff.ffff.ffff';
|
|
10
|
-
function getRangeValues(rangeQuery) {
|
|
11
|
-
const incMin = rangeQuery.gte != null;
|
|
12
|
-
const incMax = rangeQuery.lte != null;
|
|
13
|
-
const minValue = `${rangeQuery.gte || rangeQuery.gt || '*'}`;
|
|
14
|
-
const maxValue = `${rangeQuery.lte || rangeQuery.lt || '*'}`;
|
|
15
|
-
return {
|
|
16
|
-
incMin, incMax, minValue, maxValue
|
|
17
|
-
};
|
|
18
|
-
}
|
|
19
|
-
export function ipTerm(value) {
|
|
20
|
-
const argCidr = isString(value) ? isCidr(value) : false;
|
|
21
|
-
if (argCidr) {
|
|
22
|
-
const range = ip6addr.createCIDR(`${value}`);
|
|
23
|
-
return pRangeTerm(range);
|
|
24
|
-
}
|
|
25
|
-
return function isIPTerm(ip) {
|
|
26
|
-
if (isNonZeroCidr(ip)) {
|
|
27
|
-
const argRange = ip6addr.createCIDR(ip);
|
|
28
|
-
return argRange.contains(`${value}`);
|
|
29
|
-
}
|
|
30
|
-
return ip === value;
|
|
31
|
-
};
|
|
32
|
-
}
|
|
33
|
-
function validateIPRange(rangeQuery) {
|
|
34
|
-
const values = getRangeValues(rangeQuery);
|
|
35
|
-
const { incMin, incMax } = values;
|
|
36
|
-
let { minValue, maxValue } = values;
|
|
37
|
-
if (isInfiniteMin(minValue)) {
|
|
38
|
-
if (isIPv6(maxValue)) {
|
|
39
|
-
minValue = MIN_IPV6_IP;
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
minValue = MIN_IPV4_IP;
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
if (isInfiniteMax(maxValue)) {
|
|
46
|
-
if (isIPv6(minValue)) {
|
|
47
|
-
maxValue = MAX_IPV6_IP;
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
maxValue = MAX_IPV4_IP;
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
if (!incMin) {
|
|
54
|
-
const parsed = ip6addr.parse(minValue).offset(1);
|
|
55
|
-
if (!parsed)
|
|
56
|
-
throw new Error(`Invalid min IP value ${minValue}`);
|
|
57
|
-
minValue = parsed.toString();
|
|
58
|
-
}
|
|
59
|
-
if (!incMax) {
|
|
60
|
-
const parsed = ip6addr.parse(maxValue).offset(-1);
|
|
61
|
-
if (!parsed)
|
|
62
|
-
throw new Error(`Invalid max IP value ${maxValue}`);
|
|
63
|
-
maxValue = parsed.toString();
|
|
64
|
-
}
|
|
65
|
-
return { minValue, maxValue };
|
|
66
|
-
}
|
|
67
|
-
function checkCidr(ip, range) {
|
|
68
|
-
const argRange = ip6addr.createCIDR(ip);
|
|
69
|
-
return (range.contains(argRange.first().toString())
|
|
70
|
-
|| range.contains(argRange.last().toString())
|
|
71
|
-
|| argRange.contains(range.first().toString())
|
|
72
|
-
|| argRange.contains(range.last().toString()));
|
|
73
|
-
}
|
|
74
|
-
function pRangeTerm(range) {
|
|
75
|
-
return function checkIP(ip) {
|
|
76
|
-
if (ip === null || ip === undefined)
|
|
77
|
-
return false;
|
|
78
|
-
if (isNonZeroCidr(ip)) {
|
|
79
|
-
return checkCidr(ip, range);
|
|
80
|
-
}
|
|
81
|
-
if (isIP(ip))
|
|
82
|
-
return range.contains(ip);
|
|
83
|
-
return false;
|
|
84
|
-
};
|
|
85
|
-
}
|
|
86
|
-
export function ipRange(rangeQuery) {
|
|
87
|
-
const { minValue, maxValue } = validateIPRange(rangeQuery);
|
|
88
|
-
const range = ip6addr.createAddrRange(minValue, maxValue);
|
|
89
|
-
return pRangeTerm(range);
|
|
90
|
-
}
|
|
91
|
-
//# sourceMappingURL=ip.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ip.js","sourceRoot":"","sources":["../../../../src/document-matcher/logic-builder/ip.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAe,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAG3D,MAAM,WAAW,GAAG,SAAS,CAAC;AAC9B,MAAM,WAAW,GAAG,iBAAiB,CAAC;AAEtC,MAAM,WAAW,GAAG,IAAI,CAAC;AACzB,MAAM,WAAW,GAAG,yCAAyC,CAAC;AAE9D,SAAS,cAAc,CAAC,UAAuB;IAM3C,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,IAAI,IAAI,CAAC;IACtC,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,IAAI,IAAI,CAAC;IACtC,MAAM,QAAQ,GAAG,GAAG,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC;IAC7D,MAAM,QAAQ,GAAG,GAAG,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC;IAE7D,OAAO;QACH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;KACrC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAc;IACjC,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACxD,IAAI,OAAO,EAAE;QACT,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;QAC7C,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;KAC5B;IAED,OAAO,SAAS,QAAQ,CAAC,EAAU;QAC/B,IAAI,aAAa,CAAC,EAAE,CAAC,EAAE;YACnB,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACxC,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;SACxC;QACD,OAAO,EAAE,KAAK,KAAK,CAAC;IACxB,CAAC,CAAC;AACN,CAAC;AAED,SAAS,eAAe,CAAC,UAAuB;IAC5C,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAClC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEpC,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE;QACzB,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE;YAClB,QAAQ,GAAG,WAAW,CAAC;SAC1B;aAAM;YACH,QAAQ,GAAG,WAAW,CAAC;SAC1B;KACJ;IAED,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE;QACzB,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE;YAClB,QAAQ,GAAG,WAAW,CAAC;SAC1B;aAAM;YACH,QAAQ,GAAG,WAAW,CAAC;SAC1B;KACJ;IAED,IAAI,CAAC,MAAM,EAAE;QACT,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,EAAE,CAAC,CAAC;QACjE,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;KAChC;IACD,IAAI,CAAC,MAAM,EAAE;QACT,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,EAAE,CAAC,CAAC;QACjE,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;KAChC;IACD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,SAAS,CAAC,EAAU,EAAE,KAAU;IACrC,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxC,OAAO,CACH,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC;WACxC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;WAC1C,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC;WAC3C,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,CAChD,CAAC;AACN,CAAC;AAED,SAAS,UAAU,CAAC,KAAU;IAC1B,OAAO,SAAS,OAAO,CAAC,EAAW;QAC/B,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAClD,IAAI,aAAa,CAAC,EAAS,CAAC,EAAE;YAC1B,OAAO,SAAS,CAAC,EAAS,EAAE,KAAK,CAAC,CAAC;SACtC;QACD,IAAI,IAAI,CAAC,EAAS,CAAC;YAAE,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC/C,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,UAAuB;IAC3C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC1D,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
|