@opra/elastic 1.8.0 → 1.9.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.
Files changed (3) hide show
  1. package/cjs/adapter-utils/prepare-filter.js +56 -46
  2. package/esm/adapter-utils/prepare-filter.js +56 -46
  3. package/package.json +3 -3
package/cjs/adapter-utils/prepare-filter.js CHANGED
@@ -60,54 +60,64 @@ 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({
65
+ left,
66
+ right,
67
+ op: ast.op,
68
+ adapter: 'elastic',
69
+ });
70
+ }
71
+ if (!out) {
72
+ switch (ast.op) {
73
+ case '!=':
74
+ case '=':
75
+ case 'in':
76
+ case '!in': {
77
+ out = Array.isArray(right)
78
+ ? { terms: { [left]: right } }
79
+ : { match: { [left]: right } };
80
+ break;
81
+ }
82
+ case '>': {
83
+ out = { range: { [left]: { gt: right } } };
84
+ break;
85
+ }
86
+ case '>=': {
87
+ out = { range: { [left]: { gte: right } } };
88
+ break;
89
+ }
90
+ case '<': {
91
+ out = { range: { [left]: { lt: right } } };
92
+ break;
93
+ }
94
+ case '<=': {
95
+ out = { range: { [left]: { lte: right } } };
96
+ break;
97
+ }
98
+ case '!like':
99
+ case 'like': {
100
+ out = {
101
+ wildcard: { [left]: { value: String(right).replace(/%/g, '*') } },
102
+ };
103
+ break;
104
+ }
105
+ case '!ilike':
106
+ case 'ilike': {
107
+ out = {
108
+ wildcard: {
109
+ [left]: {
110
+ value: String(right).replace(/%/g, '*'),
111
+ case_insensitive: true,
112
+ },
103
113
  },
104
- },
105
- };
106
- break;
114
+ };
115
+ break;
116
+ }
117
+ default:
118
+ /* istanbul ignore next */
119
+ throw new TypeError(`Unknown ComparisonExpression operation (${ast.op})`);
107
120
  }
108
- default:
109
- /* istanbul ignore next */
110
- throw new TypeError(`Unknown ComparisonExpression operation (${ast.op})`);
111
121
  }
112
122
  }
113
123
  if ((ast.op.startsWith('!') && !negative) ||
package/esm/adapter-utils/prepare-filter.js CHANGED
@@ -57,54 +57,64 @@ 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({
62
+ left,
63
+ right,
64
+ op: ast.op,
65
+ adapter: 'elastic',
66
+ });
67
+ }
68
+ if (!out) {
69
+ switch (ast.op) {
70
+ case '!=':
71
+ case '=':
72
+ case 'in':
73
+ case '!in': {
74
+ out = Array.isArray(right)
75
+ ? { terms: { [left]: right } }
76
+ : { match: { [left]: right } };
77
+ break;
78
+ }
79
+ case '>': {
80
+ out = { range: { [left]: { gt: right } } };
81
+ break;
82
+ }
83
+ case '>=': {
84
+ out = { range: { [left]: { gte: right } } };
85
+ break;
86
+ }
87
+ case '<': {
88
+ out = { range: { [left]: { lt: right } } };
89
+ break;
90
+ }
91
+ case '<=': {
92
+ out = { range: { [left]: { lte: right } } };
93
+ break;
94
+ }
95
+ case '!like':
96
+ case 'like': {
97
+ out = {
98
+ wildcard: { [left]: { value: String(right).replace(/%/g, '*') } },
99
+ };
100
+ break;
101
+ }
102
+ case '!ilike':
103
+ case 'ilike': {
104
+ out = {
105
+ wildcard: {
106
+ [left]: {
107
+ value: String(right).replace(/%/g, '*'),
108
+ case_insensitive: true,
109
+ },
100
110
  },
101
- },
102
- };
103
- break;
111
+ };
112
+ break;
113
+ }
114
+ default:
115
+ /* istanbul ignore next */
116
+ throw new TypeError(`Unknown ComparisonExpression operation (${ast.op})`);
104
117
  }
105
- default:
106
- /* istanbul ignore next */
107
- throw new TypeError(`Unknown ComparisonExpression operation (${ast.op})`);
108
118
  }
109
119
  }
110
120
  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.1",
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.1",
15
+ "@opra/core": "^1.9.1"
16
16
  },
17
17
  "type": "module",
18
18
  "exports": {