@storecraft/database-sql-base 1.0.23 → 1.0.24
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/package.json +1 -1
- package/src/con.auth_users.js +17 -13
- package/src/con.collections.js +24 -16
- package/src/con.customers.js +24 -17
- package/src/con.discounts.js +30 -19
- package/src/con.discounts.utils.js +8 -4
- package/src/con.images.js +18 -13
- package/src/con.notifications.js +22 -15
- package/src/con.orders.js +25 -18
- package/src/con.posts.js +28 -28
- package/src/con.products.js +52 -34
- package/src/con.search.js +12 -12
- package/src/con.shared.js +17 -35
- package/src/con.shipping.js +23 -16
- package/src/con.storefronts.js +23 -17
- package/src/con.tags.js +22 -14
- package/src/con.templates.js +21 -24
- package/src/utils.query.OLD.js +259 -0
- package/src/utils.query.js +212 -204
- package/tests/sandbox.js +5 -6
@@ -0,0 +1,259 @@
|
|
1
|
+
/**
|
2
|
+
* @import { ApiQuery, Cursor } from '@storecraft/core/api'
|
3
|
+
* @import { BOOLQL } from '@storecraft/core/vql/bool-ql'
|
4
|
+
* @import { Database } from '../types.sql.tables.js'
|
5
|
+
* @import { BinaryOperator, ExpressionBuilder } from 'kysely'
|
6
|
+
* @import {
|
7
|
+
* DirectedOrderByStringReference, QueryableTables
|
8
|
+
* } from './utils.types.js'
|
9
|
+
*/
|
10
|
+
|
11
|
+
import { parse } from "@storecraft/core/vql/bool-ql";
|
12
|
+
|
13
|
+
/**
|
14
|
+
* Convert an API Query cursor into mongo dialect, also sanitize.
|
15
|
+
*
|
16
|
+
* 1. (a1, a2) > (b1, b2) ==> (a1 > b1) || (a1=b1 & a2>b2)
|
17
|
+
* 2. (a1, a2) >= (b1, b2) ==> (a1 > b1) || (a1=b1 & a2>=b2)
|
18
|
+
* 3. (a1, a2, a3) > (b1, b2, b3) ==> (a1 > b1) || (a1=b1 & a2>b2) || (a1=b1 & a2=b2 & a3>b3)
|
19
|
+
* 4. (a1, a2, a3) >= (b1, b2, b3) ==> (a1 > b1) || (a1=b1 & a2>b2) || (a1=b1 & a2=b2 & a3>=b3)
|
20
|
+
*
|
21
|
+
* @param {ExpressionBuilder<Database>} eb
|
22
|
+
* @param {Cursor} c
|
23
|
+
* @param {'>' | '>=' | '<' | '<='} relation
|
24
|
+
* @param {(x: [k: string, v: any]) => [k: string, v: any]} transformer
|
25
|
+
* Your chance to change key and value
|
26
|
+
*/
|
27
|
+
export const query_cursor_to_eb = (
|
28
|
+
eb, c, relation, transformer=(x)=>x
|
29
|
+
) => {
|
30
|
+
|
31
|
+
/** @type {BinaryOperator} */
|
32
|
+
let rel_key_1; // relation in last conjunction term in [0, n-1] disjunctions
|
33
|
+
/** @type {BinaryOperator} */
|
34
|
+
let rel_key_2; // relation in last conjunction term in last disjunction
|
35
|
+
|
36
|
+
if (relation==='>' || relation==='>=') {
|
37
|
+
rel_key_1 = rel_key_2 = '>';
|
38
|
+
if(relation==='>=')
|
39
|
+
rel_key_2='>=';
|
40
|
+
}
|
41
|
+
else if (relation==='<' || relation==='<=') {
|
42
|
+
rel_key_1 = rel_key_2 = '<';
|
43
|
+
if(relation==='<=')
|
44
|
+
rel_key_2='<=';
|
45
|
+
} else return undefined;
|
46
|
+
|
47
|
+
|
48
|
+
const disjunctions = [];
|
49
|
+
// each disjunction clause
|
50
|
+
for (let ix = 0; ix < c.length; ix++) {
|
51
|
+
const is_last_disjunction = ix==c.length-1;
|
52
|
+
const conjunctions = [];
|
53
|
+
// each conjunction clause up until the last term (not inclusive)
|
54
|
+
for (let jx = 0; jx < ix; jx++) {
|
55
|
+
// the a_n=b_n
|
56
|
+
const r = transformer(c[jx]);
|
57
|
+
|
58
|
+
// conjunctions.push({ [r[0]] : r[1] });
|
59
|
+
conjunctions.push(eb(r[0], '=', r[1]));
|
60
|
+
}
|
61
|
+
|
62
|
+
// Last conjunction term
|
63
|
+
const relation_key = is_last_disjunction ? rel_key_2 : rel_key_1;
|
64
|
+
const r = transformer(c[ix]);
|
65
|
+
// conjunctions.push({ [r[0]] : { [relation_key]: r[1] } });
|
66
|
+
conjunctions.push(eb(r[0], relation_key, r[1]));
|
67
|
+
// Add to disjunctions list
|
68
|
+
// disjunctions.push({ $and: conjunctions });
|
69
|
+
disjunctions.push(eb.and(conjunctions));
|
70
|
+
}
|
71
|
+
|
72
|
+
if(disjunctions.length==0)
|
73
|
+
return undefined;
|
74
|
+
|
75
|
+
// const result = {
|
76
|
+
// $or: disjunctions
|
77
|
+
// };
|
78
|
+
|
79
|
+
return eb.or(disjunctions);
|
80
|
+
|
81
|
+
// return result;
|
82
|
+
}
|
83
|
+
|
84
|
+
|
85
|
+
/**
|
86
|
+
* @template {QueryableTables} T
|
87
|
+
* @param {ExpressionBuilder<Database>} eb
|
88
|
+
* @param {BOOLQL.Node} node
|
89
|
+
* @param {T} table_name
|
90
|
+
*/
|
91
|
+
export const query_vql_node_to_eb = (eb, node, table_name) => {
|
92
|
+
if(node.op==='LEAF') {
|
93
|
+
// console.log('value', node.value)
|
94
|
+
return eb
|
95
|
+
.exists(
|
96
|
+
eb => eb
|
97
|
+
.selectFrom('entity_to_search_terms')
|
98
|
+
.select('id')
|
99
|
+
.where(
|
100
|
+
eb => eb.and(
|
101
|
+
[
|
102
|
+
eb.or(
|
103
|
+
[
|
104
|
+
eb(
|
105
|
+
'entity_to_search_terms.entity_id', '=',
|
106
|
+
eb.ref(`${table_name}.id`)
|
107
|
+
),
|
108
|
+
eb(
|
109
|
+
`entity_to_search_terms.entity_handle`, '=',
|
110
|
+
eb.ref(`${table_name}.handle`)
|
111
|
+
),
|
112
|
+
]
|
113
|
+
),
|
114
|
+
eb(
|
115
|
+
`entity_to_search_terms.value`, 'like',
|
116
|
+
node.value.toLowerCase()
|
117
|
+
)
|
118
|
+
]
|
119
|
+
)
|
120
|
+
)
|
121
|
+
)
|
122
|
+
}
|
123
|
+
|
124
|
+
let conjunctions = [];
|
125
|
+
for(let arg of node?.args) {
|
126
|
+
conjunctions.push(query_vql_node_to_eb(eb, arg, table_name));
|
127
|
+
}
|
128
|
+
|
129
|
+
switch (node.op) {
|
130
|
+
case '&':
|
131
|
+
return eb.and(conjunctions)
|
132
|
+
case '|':
|
133
|
+
return eb.or(conjunctions)
|
134
|
+
case '!':
|
135
|
+
return eb.not(conjunctions[0])
|
136
|
+
default:
|
137
|
+
throw new Error('VQL-failed')
|
138
|
+
}
|
139
|
+
|
140
|
+
}
|
141
|
+
|
142
|
+
|
143
|
+
/**
|
144
|
+
*
|
145
|
+
* @param {[k: string, v: any]} kv
|
146
|
+
* @param {keyof Database} table_name
|
147
|
+
* @returns {[k: string, v: any]}
|
148
|
+
*/
|
149
|
+
const transform_boolean_to_0_or_1 = (kv, table_name) => {
|
150
|
+
|
151
|
+
// console.log('transform_boolean_to_0_or_1', kv)
|
152
|
+
kv = [
|
153
|
+
table_name ? `${table_name}.${kv[0]}` : kv[0],
|
154
|
+
typeof kv[1] === 'boolean' ? (kv[1] ? 1 : 0) : kv[1]
|
155
|
+
];
|
156
|
+
|
157
|
+
return kv;
|
158
|
+
}
|
159
|
+
|
160
|
+
/**
|
161
|
+
* Convert an API Query into dialect, also sanitize.
|
162
|
+
*
|
163
|
+
* @template {any} [T=any]
|
164
|
+
*
|
165
|
+
* @param {ExpressionBuilder<Database>} eb
|
166
|
+
* @param {ApiQuery<T>} q
|
167
|
+
* @param {QueryableTables} table_name
|
168
|
+
*
|
169
|
+
*/
|
170
|
+
export const query_to_eb = (eb, q={}, table_name) => {
|
171
|
+
const clauses = [];
|
172
|
+
|
173
|
+
const sort_sign = q.order === 'asc' ? 1 : -1;
|
174
|
+
const asc = sort_sign==1;
|
175
|
+
const transformer = (x) => transform_boolean_to_0_or_1(x, table_name);
|
176
|
+
|
177
|
+
// compute index clauses
|
178
|
+
// if(q.startAt) {
|
179
|
+
// clauses.push(
|
180
|
+
// query_cursor_to_eb(
|
181
|
+
// eb, q.startAt, asc ? '>=' : '<=', transformer
|
182
|
+
// )
|
183
|
+
// );
|
184
|
+
// } else if(q.startAfter) {
|
185
|
+
// clauses.push(
|
186
|
+
// query_cursor_to_eb(
|
187
|
+
// eb, q.startAfter, asc ? '>' : '<', transformer
|
188
|
+
// )
|
189
|
+
// );
|
190
|
+
// }
|
191
|
+
|
192
|
+
// if(q.endAt) {
|
193
|
+
// clauses.push(
|
194
|
+
// query_cursor_to_eb(
|
195
|
+
// eb, q.endAt, asc ? '<=' : '>=', transformer
|
196
|
+
// )
|
197
|
+
// );
|
198
|
+
// } else if(q.endBefore) {
|
199
|
+
// clauses.push(
|
200
|
+
// query_cursor_to_eb(
|
201
|
+
// eb, q.endBefore, asc ? '<' : '>', transformer
|
202
|
+
// )
|
203
|
+
// );
|
204
|
+
// }
|
205
|
+
|
206
|
+
// compute VQL clauses
|
207
|
+
try {
|
208
|
+
if(q.vql && !q.vqlParsed) {
|
209
|
+
q.vqlParsed = parse(q.vql)
|
210
|
+
}
|
211
|
+
} catch(e) {
|
212
|
+
console.error('VQL parse error', e);
|
213
|
+
}
|
214
|
+
|
215
|
+
if(q.vqlParsed) {
|
216
|
+
const vql_clause = query_vql_node_to_eb(
|
217
|
+
eb, q.vqlParsed, table_name
|
218
|
+
);
|
219
|
+
vql_clause &&
|
220
|
+
clauses.push(vql_clause);
|
221
|
+
}
|
222
|
+
|
223
|
+
return eb.and(clauses);
|
224
|
+
}
|
225
|
+
|
226
|
+
const SIGN = {
|
227
|
+
'1': 'asc',
|
228
|
+
'-1': 'desc'
|
229
|
+
}
|
230
|
+
|
231
|
+
/**
|
232
|
+
* Convert an API Query into mongo dialect, also sanitize.
|
233
|
+
* @template {Record<string, any>} [Type=Record<string, any>]
|
234
|
+
* @template {keyof Database} [Table=keyof Database]
|
235
|
+
*
|
236
|
+
* @param {ApiQuery<Type>} q
|
237
|
+
* @param {Table} table
|
238
|
+
* @returns {DirectedOrderByStringReference<Database, Table, Database[Table]>[]}
|
239
|
+
*/
|
240
|
+
export const query_to_sort = (q={}, table) => {
|
241
|
+
// const sort_sign = q.order === 'asc' ? 'asc' : 'desc';
|
242
|
+
// `reverse_sign=-1` means we need to reverse because of `limitToLast`
|
243
|
+
const reverse_sign = (q.limitToLast && !q.limit) ? -1 : 1;
|
244
|
+
const asc = q.order === 'asc';
|
245
|
+
const sort_sign = (asc ? 1 : -1) * reverse_sign;
|
246
|
+
|
247
|
+
// compute sort fields and order
|
248
|
+
const keys = q.sortBy?.length ? q.sortBy : ['updated_at', 'id'];
|
249
|
+
const sort = keys.map(
|
250
|
+
s => table ? `${table}.${s} ${SIGN[sort_sign]}` : `${s} ${SIGN[sort_sign]}`
|
251
|
+
)
|
252
|
+
// it's too complicated to map each ket to table column.
|
253
|
+
// kysely was designed to do this in place
|
254
|
+
return (
|
255
|
+
/** @type {DirectedOrderByStringReference<Database, Table, Database[Table]>[]} */ (
|
256
|
+
sort
|
257
|
+
)
|
258
|
+
);
|
259
|
+
}
|