@opra/elastic 1.8.0 → 1.9.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 (3) hide show
  1. package/cjs/adapter-utils/prepare-filter.js +51 -46
  2. package/esm/adapter-utils/prepare-filter.js +51 -46
  3. package/package.json +3 -3
package/cjs/adapter-utils/prepare-filter.js CHANGED
@@ -60,54 +60,59 @@ function prepareFilterAst(ast, negative) {
60
60
  out = { exists: { field: left } };
61
61
  }
62
62
  else {
63
- switch (ast.op) {
64
- case '!=':
65
- case '=':
66
- case 'in':
67
- case '!in': {
68
- out = Array.isArray(right)
69
- ? { terms: { [left]: right } }
70
- : { match: { [left]: right } };
71
- break;
72
- }
73
- case '>': {
74
- out = { range: { [left]: { gt: right } } };
75
- break;
76
- }
77
- case '>=': {
78
- out = { range: { [left]: { gte: right } } };
79
- break;
80
- }
81
- case '<': {
82
- out = { range: { [left]: { lt: right } } };
83
- break;
84
- }
85
- case '<=': {
86
- out = { range: { [left]: { lte: right } } };
87
- break;
88
- }
89
- case '!like':
90
- case 'like': {
91
- out = {
92
- wildcard: { [left]: { value: String(right).replace(/%/g, '*') } },
93
- };
94
- break;
95
- }
96
- case '!ilike':
97
- case 'ilike': {
98
- out = {
99
- wildcard: {
100
- [left]: {
101
- value: String(right).replace(/%/g, '*'),
102
- case_insensitive: true,
63
+ if (ast.prepare) {
64
+ out = ast.prepare(right, ast.op);
65
+ }
66
+ if (!out) {
67
+ switch (ast.op) {
68
+ case '!=':
69
+ case '=':
70
+ case 'in':
71
+ case '!in': {
72
+ out = Array.isArray(right)
73
+ ? { terms: { [left]: right } }
74
+ : { match: { [left]: right } };
75
+ break;
76
+ }
77
+ case '>': {
78
+ out = { range: { [left]: { gt: right } } };
79
+ break;
80
+ }
81
+ case '>=': {
82
+ out = { range: { [left]: { gte: right } } };
83
+ break;
84
+ }
85
+ case '<': {
86
+ out = { range: { [left]: { lt: right } } };
87
+ break;
88
+ }
89
+ case '<=': {
90
+ out = { range: { [left]: { lte: right } } };
91
+ break;
92
+ }
93
+ case '!like':
94
+ case 'like': {
95
+ out = {
96
+ wildcard: { [left]: { value: String(right).replace(/%/g, '*') } },
97
+ };
98
+ break;
99
+ }
100
+ case '!ilike':
101
+ case 'ilike': {
102
+ out = {
103
+ wildcard: {
104
+ [left]: {
105
+ value: String(right).replace(/%/g, '*'),
106
+ case_insensitive: true,
107
+ },
103
108
  },
104
- },
105
- };
106
- break;
109
+ };
110
+ break;
111
+ }
112
+ default:
113
+ /* istanbul ignore next */
114
+ throw new TypeError(`Unknown ComparisonExpression operation (${ast.op})`);
107
115
  }
108
- default:
109
- /* istanbul ignore next */
110
- throw new TypeError(`Unknown ComparisonExpression operation (${ast.op})`);
111
116
  }
112
117
  }
113
118
  if ((ast.op.startsWith('!') && !negative) ||
package/esm/adapter-utils/prepare-filter.js CHANGED
@@ -57,54 +57,59 @@ function prepareFilterAst(ast, negative) {
57
57
  out = { exists: { field: left } };
58
58
  }
59
59
  else {
60
- switch (ast.op) {
61
- case '!=':
62
- case '=':
63
- case 'in':
64
- case '!in': {
65
- out = Array.isArray(right)
66
- ? { terms: { [left]: right } }
67
- : { match: { [left]: right } };
68
- break;
69
- }
70
- case '>': {
71
- out = { range: { [left]: { gt: right } } };
72
- break;
73
- }
74
- case '>=': {
75
- out = { range: { [left]: { gte: right } } };
76
- break;
77
- }
78
- case '<': {
79
- out = { range: { [left]: { lt: right } } };
80
- break;
81
- }
82
- case '<=': {
83
- out = { range: { [left]: { lte: right } } };
84
- break;
85
- }
86
- case '!like':
87
- case 'like': {
88
- out = {
89
- wildcard: { [left]: { value: String(right).replace(/%/g, '*') } },
90
- };
91
- break;
92
- }
93
- case '!ilike':
94
- case 'ilike': {
95
- out = {
96
- wildcard: {
97
- [left]: {
98
- value: String(right).replace(/%/g, '*'),
99
- case_insensitive: true,
60
+ if (ast.prepare) {
61
+ out = ast.prepare(right, ast.op);
62
+ }
63
+ if (!out) {
64
+ switch (ast.op) {
65
+ case '!=':
66
+ case '=':
67
+ case 'in':
68
+ case '!in': {
69
+ out = Array.isArray(right)
70
+ ? { terms: { [left]: right } }
71
+ : { match: { [left]: right } };
72
+ break;
73
+ }
74
+ case '>': {
75
+ out = { range: { [left]: { gt: right } } };
76
+ break;
77
+ }
78
+ case '>=': {
79
+ out = { range: { [left]: { gte: right } } };
80
+ break;
81
+ }
82
+ case '<': {
83
+ out = { range: { [left]: { lt: right } } };
84
+ break;
85
+ }
86
+ case '<=': {
87
+ out = { range: { [left]: { lte: right } } };
88
+ break;
89
+ }
90
+ case '!like':
91
+ case 'like': {
92
+ out = {
93
+ wildcard: { [left]: { value: String(right).replace(/%/g, '*') } },
94
+ };
95
+ break;
96
+ }
97
+ case '!ilike':
98
+ case 'ilike': {
99
+ out = {
100
+ wildcard: {
101
+ [left]: {
102
+ value: String(right).replace(/%/g, '*'),
103
+ case_insensitive: true,
104
+ },
100
105
  },
101
- },
102
- };
103
- break;
106
+ };
107
+ break;
108
+ }
109
+ default:
110
+ /* istanbul ignore next */
111
+ throw new TypeError(`Unknown ComparisonExpression operation (${ast.op})`);
104
112
  }
105
- default:
106
- /* istanbul ignore next */
107
- throw new TypeError(`Unknown ComparisonExpression operation (${ast.op})`);
108
113
  }
109
114
  }
110
115
  if ((ast.op.startsWith('!') && !negative) ||
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opra/elastic",
3
- "version": "1.8.0",
3
+ "version": "1.9.0",
4
4
  "description": "Opra Elastic Search adapter package",
5
5
  "author": "Panates",
6
6
  "license": "MIT",
@@ -11,8 +11,8 @@
11
11
  },
12
12
  "peerDependencies": {
13
13
  "@elastic/elasticsearch": ">=8.7.0 <9",
14
- "@opra/common": "^1.8.0",
15
- "@opra/core": "^1.8.0"
14
+ "@opra/common": "^1.9.0",
15
+ "@opra/core": "^1.9.0"
16
16
  },
17
17
  "type": "module",
18
18
  "exports": {