@storecraft/database-mongodb 1.0.12 → 1.0.13
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.collections.js +2 -0
- package/src/con.customers.js +0 -1
- package/src/con.discounts.utils.js +25 -18
- package/src/con.notifications.js +1 -0
- package/src/con.search.js +18 -17
- package/src/con.shared.js +4 -6
- package/src/utils.query.js +2 -2
package/package.json
CHANGED
package/src/con.collections.js
CHANGED
@@ -73,6 +73,7 @@ const upsert = (driver) => {
|
|
73
73
|
driver, 'collections', objid, data, session
|
74
74
|
);
|
75
75
|
|
76
|
+
// @ts-ignore
|
76
77
|
}, transactionOptions
|
77
78
|
);
|
78
79
|
|
@@ -136,6 +137,7 @@ const remove = (driver) => {
|
|
136
137
|
driver, 'collections', objid, session
|
137
138
|
);
|
138
139
|
|
140
|
+
// @ts-ignore
|
139
141
|
}, transactionOptions
|
140
142
|
);
|
141
143
|
} catch(e) {
|
package/src/con.customers.js
CHANGED
@@ -40,8 +40,9 @@ export const discount_to_mongo_conjunctions = d => {
|
|
40
40
|
break;
|
41
41
|
case enums.FilterMetaEnum.p_in_products.op:
|
42
42
|
{
|
43
|
-
/** @type {import("@storecraft/core/api").FilterValue_p_in_products} */
|
44
|
-
|
43
|
+
const cast = /** @type {import("@storecraft/core/api").FilterValue_p_in_products} */ (
|
44
|
+
filter.value ?? []
|
45
|
+
);
|
45
46
|
|
46
47
|
conjunctions.push(
|
47
48
|
{ handle: { $in: cast.map(it => it.handle) } }
|
@@ -50,8 +51,9 @@ export const discount_to_mongo_conjunctions = d => {
|
|
50
51
|
break;
|
51
52
|
case enums.FilterMetaEnum.p_not_in_products.op:
|
52
53
|
{
|
53
|
-
/** @type {import("@storecraft/core/api").FilterValue_p_not_in_products} */
|
54
|
-
|
54
|
+
const cast = /** @type {import("@storecraft/core/api").FilterValue_p_not_in_products} */(
|
55
|
+
filter.value ?? []
|
56
|
+
);
|
55
57
|
|
56
58
|
conjunctions.push(
|
57
59
|
{ handle: { $nin: cast.map(it => it.handle) } }
|
@@ -60,8 +62,9 @@ export const discount_to_mongo_conjunctions = d => {
|
|
60
62
|
break;
|
61
63
|
case enums.FilterMetaEnum.p_in_tags.op:
|
62
64
|
{
|
63
|
-
/** @type {import("@storecraft/core/api").FilterValue_p_in_tags} */
|
64
|
-
|
65
|
+
const cast = /** @type {import("@storecraft/core/api").FilterValue_p_in_tags} */ (
|
66
|
+
filter.value ?? []
|
67
|
+
);
|
65
68
|
|
66
69
|
conjunctions.push(
|
67
70
|
{ tags: { $in: cast } }
|
@@ -70,8 +73,9 @@ export const discount_to_mongo_conjunctions = d => {
|
|
70
73
|
break;
|
71
74
|
case enums.FilterMetaEnum.p_not_in_tags.op:
|
72
75
|
{
|
73
|
-
/** @type {import("@storecraft/core/api").FilterValue_p_not_in_tags} */
|
74
|
-
|
76
|
+
const cast = /** @type {import("@storecraft/core/api").FilterValue_p_not_in_tags} */(
|
77
|
+
filter.value ?? []
|
78
|
+
);
|
75
79
|
|
76
80
|
conjunctions.push(
|
77
81
|
{ tags: { $nin: cast } }
|
@@ -80,8 +84,9 @@ export const discount_to_mongo_conjunctions = d => {
|
|
80
84
|
break;
|
81
85
|
case enums.FilterMetaEnum.p_in_collections.op:
|
82
86
|
{
|
83
|
-
/** @type {import("@storecraft/core/api").FilterValue_p_in_collections} */
|
84
|
-
|
87
|
+
const cast = /** @type {import("@storecraft/core/api").FilterValue_p_in_collections} */ (
|
88
|
+
filter.value ?? []
|
89
|
+
);
|
85
90
|
|
86
91
|
conjunctions.push(
|
87
92
|
{
|
@@ -94,8 +99,9 @@ export const discount_to_mongo_conjunctions = d => {
|
|
94
99
|
break;
|
95
100
|
case enums.FilterMetaEnum.p_not_in_collections.op:
|
96
101
|
{
|
97
|
-
/** @type {import("@storecraft/core/api").FilterValue_p_not_in_collections} */
|
98
|
-
|
102
|
+
const cast = /** @type {import("@storecraft/core/api").FilterValue_p_not_in_collections} */ (
|
103
|
+
filter.value ?? []
|
104
|
+
);
|
99
105
|
|
100
106
|
conjunctions.push(
|
101
107
|
{
|
@@ -108,12 +114,13 @@ export const discount_to_mongo_conjunctions = d => {
|
|
108
114
|
break;
|
109
115
|
case enums.FilterMetaEnum.p_in_price_range.op:
|
110
116
|
{
|
111
|
-
/** @type {import("@storecraft/core/api").FilterValue_p_in_price_range} */
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
+
const cast = /** @type {import("@storecraft/core/api").FilterValue_p_in_price_range} */ (
|
118
|
+
{
|
119
|
+
from: 0,
|
120
|
+
to: Number.POSITIVE_INFINITY,
|
121
|
+
...(filter?.value ?? {})
|
122
|
+
}
|
123
|
+
);
|
117
124
|
|
118
125
|
const from = extract_abs_number(cast.from);
|
119
126
|
const to = extract_abs_number(cast.to);
|
package/src/con.notifications.js
CHANGED
package/src/con.search.js
CHANGED
@@ -102,25 +102,26 @@ export const quicksearch = (driver) => {
|
|
102
102
|
|
103
103
|
const db = driver.mongo_client.db(driver.name);
|
104
104
|
|
105
|
-
|
106
|
-
const items =
|
107
|
-
[
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
105
|
+
|
106
|
+
const items = /** @type {import('@storecraft/core/api').QuickSearchResource[]} */ (
|
107
|
+
await db.collection(tables_filtered[0]).aggregate(
|
108
|
+
[
|
109
|
+
...pipeline,
|
110
|
+
...tables_filtered.slice(1).map(
|
111
|
+
t => (
|
112
|
+
{
|
113
|
+
$unionWith: {
|
114
|
+
coll: t,
|
115
|
+
pipeline: pipeline
|
116
|
+
}
|
115
117
|
}
|
116
|
-
|
118
|
+
)
|
117
119
|
)
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
).toArray();
|
120
|
+
],
|
121
|
+
{
|
122
|
+
}
|
123
|
+
).toArray()
|
124
|
+
);
|
124
125
|
|
125
126
|
|
126
127
|
/** @type {import('@storecraft/core/api').QuickSearchResult} */
|
package/src/con.shared.js
CHANGED
@@ -11,15 +11,13 @@ import { add_search_terms_relation_on } from './utils.relations.js'
|
|
11
11
|
* @template {import('@storecraft/core/api').BaseType} T
|
12
12
|
* @template {import('@storecraft/core/api').BaseType} G
|
13
13
|
*
|
14
|
-
*
|
15
14
|
* @param {MongoDB} driver
|
16
15
|
* @param {Collection<G>} col
|
17
16
|
*
|
18
|
-
*
|
19
17
|
* @returns {import('@storecraft/core/database').db_crud<T, G>["upsert"]}
|
20
|
-
*
|
21
18
|
*/
|
22
19
|
export const upsert_regular = (driver, col) => {
|
20
|
+
|
23
21
|
return async (data, search_terms=[]) => {
|
24
22
|
|
25
23
|
data = {...data};
|
@@ -194,8 +192,8 @@ export const get_regular = (driver, col) => {
|
|
194
192
|
* should be instead
|
195
193
|
*
|
196
194
|
*
|
197
|
-
* @template {import('@storecraft/core/api').
|
198
|
-
* @template {import('@storecraft/core/api').
|
195
|
+
* @template {import('@storecraft/core/api').withOptionalID} T
|
196
|
+
* @template {import('@storecraft/core/api').withOptionalID} G
|
199
197
|
*
|
200
198
|
*
|
201
199
|
* @param {MongoDB} driver
|
@@ -278,7 +276,7 @@ export const list_regular = (driver, col) => {
|
|
278
276
|
|
279
277
|
// console.log('reverse_sign', reverse_sign)
|
280
278
|
// console.log('query', query)
|
281
|
-
|
279
|
+
console.log('filter', JSON.stringify(filter, null, 2))
|
282
280
|
// console.log('sort', sort)
|
283
281
|
// console.log('expand', query?.expand)
|
284
282
|
|
package/src/utils.query.js
CHANGED
@@ -116,7 +116,7 @@ export const query_vql_to_mongo = root => {
|
|
116
116
|
* Let's transform ids into mongo ids
|
117
117
|
*
|
118
118
|
*
|
119
|
-
* @param {import("@storecraft/core/api").Tuple
|
119
|
+
* @param {import("@storecraft/core/api").Tuple<>} c a cursor record
|
120
120
|
*
|
121
121
|
*
|
122
122
|
* @returns {[k: string, v: any]}
|
@@ -124,7 +124,7 @@ export const query_vql_to_mongo = root => {
|
|
124
124
|
const transform = c => {
|
125
125
|
if(c[0]!=='id')
|
126
126
|
return c;
|
127
|
-
return [ '_id', to_objid(c[1]) ];
|
127
|
+
return [ '_id', to_objid(String(c[1])) ];
|
128
128
|
}
|
129
129
|
|
130
130
|
/**
|