@ewb/mongoose-query 1.1.6 → 1.1.8
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/lib/Query.d.ts +2 -4
- package/lib/Query.js +11 -16
- package/lib/QueryModel.js +3 -4
- package/package.json +1 -1
package/lib/Query.d.ts
CHANGED
|
@@ -48,10 +48,8 @@ export declare class Query<R extends object, T extends object = object, Q extend
|
|
|
48
48
|
getModelQuery<TT extends object>(key: string): QueryType<TT>;
|
|
49
49
|
addToModelQuery<TT extends {
|
|
50
50
|
[key: string]: object;
|
|
51
|
-
}, K extends keyof TT = keyof TT>(
|
|
52
|
-
removeFromModelQuery
|
|
53
|
-
[key: string]: object;
|
|
54
|
-
}, K extends keyof TT = keyof TT>(key: K | K[]): this;
|
|
51
|
+
}, K extends keyof TT = keyof TT>(model: K | K[], query: QueryType<TT[K]>): this;
|
|
52
|
+
removeFromModelQuery(model: string, key: string): this;
|
|
55
53
|
createQuery({ query, noRoot, }?: ICreateQueryOptions<R, T>): QueryType<T>;
|
|
56
54
|
private initQuery;
|
|
57
55
|
private mongooseTextSearch;
|
package/lib/Query.js
CHANGED
|
@@ -37,16 +37,15 @@ export class Query {
|
|
|
37
37
|
return this._limit;
|
|
38
38
|
}
|
|
39
39
|
get root() {
|
|
40
|
+
const modelQuery = this._addToModelQuery[this._model];
|
|
40
41
|
const root = this._root;
|
|
41
|
-
if (this._model &&
|
|
42
|
+
if (this._model && modelQuery && Object.keys(modelQuery).length) {
|
|
42
43
|
if (root) {
|
|
43
|
-
return {
|
|
44
|
-
$and: [root, this._addToModelQuery[this._model]],
|
|
45
|
-
};
|
|
44
|
+
return { $and: [root, modelQuery] };
|
|
46
45
|
}
|
|
47
|
-
return
|
|
46
|
+
return { ...modelQuery };
|
|
48
47
|
}
|
|
49
|
-
return root;
|
|
48
|
+
return { ...root };
|
|
50
49
|
}
|
|
51
50
|
get model() {
|
|
52
51
|
return this._model;
|
|
@@ -133,8 +132,8 @@ export class Query {
|
|
|
133
132
|
getModelQuery(key) {
|
|
134
133
|
return this._addToModelQuery[key];
|
|
135
134
|
}
|
|
136
|
-
addToModelQuery(
|
|
137
|
-
const modelKeys =
|
|
135
|
+
addToModelQuery(model, query) {
|
|
136
|
+
const modelKeys = model;
|
|
138
137
|
const keys = Array.isArray(modelKeys)
|
|
139
138
|
? modelKeys
|
|
140
139
|
: [modelKeys];
|
|
@@ -151,14 +150,10 @@ export class Query {
|
|
|
151
150
|
}
|
|
152
151
|
return this;
|
|
153
152
|
}
|
|
154
|
-
removeFromModelQuery(key) {
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
: [modelKeys];
|
|
159
|
-
for (const modelKey of keys) {
|
|
160
|
-
if (this._addToModelQuery[modelKey]) {
|
|
161
|
-
delete this._addToModelQuery[modelKey];
|
|
153
|
+
removeFromModelQuery(model, key) {
|
|
154
|
+
if (this._addToModelQuery[model]) {
|
|
155
|
+
if (key in this._addToModelQuery[model]) {
|
|
156
|
+
delete this._addToModelQuery[model][key];
|
|
162
157
|
}
|
|
163
158
|
}
|
|
164
159
|
return this;
|
package/lib/QueryModel.js
CHANGED
|
@@ -165,10 +165,9 @@ export class QueryModel {
|
|
|
165
165
|
for (const key in body) {
|
|
166
166
|
$set[`${String(sub)}.$.${key}`] = body[key];
|
|
167
167
|
}
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
}, { $set });
|
|
168
|
+
const filter = query.root;
|
|
169
|
+
filter[sub] = { $elemMatch: subQuery };
|
|
170
|
+
await this._model.updateOne(filter, { $set });
|
|
172
171
|
return this.subFindOne(sub, query, subQuery);
|
|
173
172
|
}
|
|
174
173
|
async subDelete(sub, query, subQuery) {
|
package/package.json
CHANGED