@terascope/data-mate 2.0.0-dev.9 → 2.0.0-rc.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.
Files changed (7) hide show
  1. package/dist/src/data-frame/search/buildSearchMatcherForQuery.d.ts.map +1 -1
  2. package/dist/src/data-frame/search/buildSearchMatcherForQuery.js +1 -4
  3. package/dist/src/data-frame/search/buildSearchMatcherForQuery.js.map +1 -1
  4. package/dist/src/document-matcher/index.d.ts.map +1 -1
  5. package/dist/src/document-matcher/index.js +1 -4
  6. package/dist/src/document-matcher/index.js.map +1 -1
  7. package/package.json +9 -7
package/dist/src/data-frame/search/buildSearchMatcherForQuery.d.ts.map CHANGED
@@ -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,iBAAiB,CAAC;AAGjD,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
+ {"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,iBAAiB,CAAC;AAGjD,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,CAU/B"}
package/dist/src/data-frame/search/buildSearchMatcherForQuery.js CHANGED
@@ -2,10 +2,7 @@ import { DataType } from '@terascope/data-types';
2
2
  import * as p from 'xlucene-parser';
3
3
  import { buildMatcherForNode } from './buildMatcherForNode.js';
4
4
  export function buildSearchMatcherForQuery(dataFrame, query, variables, _overrideParsedQuery) {
5
- let parser = new p.Parser(query, { type_config: frameToXluceneConfig(dataFrame) }, _overrideParsedQuery);
6
- if (variables) {
7
- parser = parser.resolveVariables(variables);
8
- }
5
+ const parser = new p.Parser(query, { type_config: frameToXluceneConfig(dataFrame), variables }, _overrideParsedQuery);
9
6
  return buildMatcherForNode(dataFrame, parser.typeConfig, variables ?? {})(parser.ast);
10
7
  }
11
8
  function frameToXluceneConfig(frame) {
package/dist/src/data-frame/search/buildSearchMatcherForQuery.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildSearchMatcherForQuery.js","sourceRoot":"","sources":["../../../../src/data-frame/search/buildSearchMatcherForQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,UAAU,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,CAAC;QACZ,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,mBAAmB,CAAC,SAAS,EAAE,MAAM,CAAC,UAAU,EAAE,SAAS,IAAI,EAAE,CAAC,CACrE,MAAM,CAAC,GAAG,CACb,CAAC;AACN,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAqB;IAC/C,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC;AAClD,CAAC"}
1
+ {"version":3,"file":"buildSearchMatcherForQuery.js","sourceRoot":"","sources":["../../../../src/data-frame/search/buildSearchMatcherForQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,UAAU,0BAA0B,CACtC,SAAyB,EACzB,KAAa,EACb,SAA4B,EAC5B,oBAA6B;IAE7B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,MAAM,CACvB,KAAK,EACL,EAAE,WAAW,EAAE,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,EAC3D,oBAAoB,CACvB,CAAC;IAEF,OAAO,mBAAmB,CAAC,SAAS,EAAE,MAAM,CAAC,UAAU,EAAE,SAAS,IAAI,EAAE,CAAC,CACrE,MAAM,CAAC,GAAG,CACb,CAAC;AACN,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAqB;IAC/C,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC;AAClD,CAAC"}
package/dist/src/document-matcher/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/document-matcher/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAa,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAGzE,qBAAa,eAAe;IACxB,OAAO,CAAC,QAAQ,CAAY;gBAEhB,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,sBAA2B;IAcxD,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO;CAGlD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/document-matcher/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAa,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAGzE,qBAAa,eAAe;IACxB,OAAO,CAAC,QAAQ,CAAY;gBAEhB,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,sBAA2B;IAUxD,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO;CAGlD"}
package/dist/src/document-matcher/index.js CHANGED
@@ -3,14 +3,11 @@ import logicBuilder from './logic-builder/index.js';
3
3
  export class DocumentMatcher {
4
4
  filterFn;
5
5
  constructor(query, options = {}) {
6
- let parser = new Parser(query, {
6
+ const parser = new Parser(query, {
7
7
  type_config: options.type_config,
8
8
  filterNilVariables: options.filterNilVariables,
9
9
  variables: options.variables
10
10
  });
11
- if (options.variables) {
12
- parser = parser.resolveVariables(options.variables);
13
- }
14
11
  this.filterFn = logicBuilder(parser, options.type_config);
15
12
  }
16
13
  match(doc) {
package/dist/src/document-matcher/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/document-matcher/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,YAAY,MAAM,0BAA0B,CAAC;AAEpD,MAAM,OAAO,eAAe;IAChB,QAAQ,CAAY;IAE5B,YAAY,KAAa,EAAE,UAAkC,EAAE;QAC3D,IAAI,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE;YAC3B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,SAAS,EAAE,OAAO,CAAC,SAAS;SAC/B,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAEM,KAAK,CAAC,GAAwB;QACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;CACJ"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/document-matcher/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,YAAY,MAAM,0BAA0B,CAAC;AAEpD,MAAM,OAAO,eAAe;IAChB,QAAQ,CAAY;IAE5B,YAAY,KAAa,EAAE,UAAkC,EAAE;QAC3D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE;YAC7B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,SAAS,EAAE,OAAO,CAAC,SAAS;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAEM,KAAK,CAAC,GAAwB;QACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;CACJ"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@terascope/data-mate",
3
3
  "displayName": "Data-Mate",
4
- "version": "2.0.0-dev.9",
4
+ "version": "2.0.0-rc.0",
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": {
@@ -30,11 +30,11 @@
30
30
  "test:watch": "node ../scripts/bin/ts-scripts test --watch ../data-mate --"
31
31
  },
32
32
  "dependencies": {
33
- "@terascope/core-utils": "~2.0.0-dev.9",
34
- "@terascope/data-types": "~2.0.0-dev.9",
35
- "@terascope/geo-utils": "~2.0.0-dev.9",
36
- "@terascope/ip-utils": "~2.0.0-dev.9",
37
- "@terascope/types": "~2.0.0-dev.8",
33
+ "@terascope/core-utils": "~2.0.0-rc.0",
34
+ "@terascope/data-types": "~2.0.0-rc.0",
35
+ "@terascope/geo-utils": "~2.0.0-rc.0",
36
+ "@terascope/ip-utils": "~2.0.0-rc.0",
37
+ "@terascope/types": "~2.0.0-rc.0",
38
38
  "@types/validator": "~13.12.3",
39
39
  "awesome-phonenumber": "~7.5.0",
40
40
  "big-json": "^3.2.0",
@@ -48,12 +48,14 @@
48
48
  "uuid": "~13.0.0",
49
49
  "valid-url": "~1.0.9",
50
50
  "validator": "~13.12.0",
51
- "xlucene-parser": "~2.0.0-dev.9"
51
+ "xlucene-parser": "~2.0.0-rc.0"
52
52
  },
53
53
  "devDependencies": {
54
54
  "@types/big-json": "^3.2.5",
55
55
  "@types/ip6addr": "~0.2.6",
56
+ "@types/jexl": "^2.3.4",
56
57
  "@types/uuid": "~10.0.0",
58
+ "@types/valid-url": "^1.0.7",
57
59
  "benchmark": "~2.1.4",
58
60
  "chance": "~1.1.13"
59
61
  },