temba 0.59.1 → 0.61.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.
- package/dist/data/mongo/filtering.d.ts +3 -0
- package/dist/data/mongo/filtering.d.ts.map +1 -0
- package/dist/data/mongo/filtering.js +62 -0
- package/dist/data/mongo/filtering.js.map +1 -0
- package/dist/data/mongo/index.d.ts.map +1 -1
- package/dist/data/mongo/index.js +12 -4
- package/dist/data/mongo/index.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filtering.d.ts","sourceRoot":"","sources":["../../../src/data/mongo/filtering.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAA0C,MAAM,wBAAwB,CAAA;AAsE5F,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAOtE,CAAA"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { supportedOperators } from '../../filtering/filter.js';
|
|
2
|
+
const coerceValue = (value) => {
|
|
3
|
+
const asNumber = Number(value);
|
|
4
|
+
if (value !== '' && !isNaN(asNumber))
|
|
5
|
+
return asNumber;
|
|
6
|
+
const lower = value.toLowerCase();
|
|
7
|
+
if (lower === 'true')
|
|
8
|
+
return true;
|
|
9
|
+
if (lower === 'false')
|
|
10
|
+
return false;
|
|
11
|
+
return value;
|
|
12
|
+
};
|
|
13
|
+
const buildOperatorCondition = (op, raw) => {
|
|
14
|
+
const coerced = coerceValue(raw);
|
|
15
|
+
if (op === 'eq') {
|
|
16
|
+
return { $eq: coerced };
|
|
17
|
+
}
|
|
18
|
+
if (op === 'neq') {
|
|
19
|
+
return { $ne: coerced };
|
|
20
|
+
}
|
|
21
|
+
if (op === 'ieq') {
|
|
22
|
+
if (typeof coerced === 'string') {
|
|
23
|
+
return { $regex: new RegExp(`^${escapeRegex(coerced)}$`, 'i') };
|
|
24
|
+
}
|
|
25
|
+
return { $eq: coerced };
|
|
26
|
+
}
|
|
27
|
+
// ineq
|
|
28
|
+
if (typeof coerced === 'string') {
|
|
29
|
+
return { $not: new RegExp(`^${escapeRegex(coerced)}$`, 'i') };
|
|
30
|
+
}
|
|
31
|
+
return { $ne: coerced };
|
|
32
|
+
};
|
|
33
|
+
const escapeRegex = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
34
|
+
const isOperatorObject = (obj) => obj !== null &&
|
|
35
|
+
typeof obj === 'object' &&
|
|
36
|
+
Object.keys(obj).some((k) => supportedOperators.includes(k));
|
|
37
|
+
const collectConditions = (spec, path, conditions) => {
|
|
38
|
+
for (const [key, value] of Object.entries(spec)) {
|
|
39
|
+
const fieldPath = path ? `${path}.${key}` : key;
|
|
40
|
+
if (isOperatorObject(value)) {
|
|
41
|
+
for (const op of Object.keys(value)) {
|
|
42
|
+
const raw = value[op];
|
|
43
|
+
if (raw !== undefined) {
|
|
44
|
+
conditions.push({ [fieldPath]: buildOperatorCondition(op, raw) });
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
collectConditions(value, fieldPath, conditions);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
export const buildMongoQuery = (filter) => {
|
|
54
|
+
const conditions = [];
|
|
55
|
+
collectConditions(filter.filter, '', conditions);
|
|
56
|
+
if (conditions.length === 0)
|
|
57
|
+
return {};
|
|
58
|
+
if (conditions.length === 1)
|
|
59
|
+
return conditions[0];
|
|
60
|
+
return { $and: conditions };
|
|
61
|
+
};
|
|
62
|
+
//# sourceMappingURL=filtering.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filtering.js","sourceRoot":"","sources":["../../../src/data/mongo/filtering.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/data/mongo/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,KAAK,EAAuB,OAAO,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/data/mongo/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,KAAK,EAAuB,OAAO,EAAE,MAAM,UAAU,CAAA;AAa5D,eAAO,MAAM,kBAAkB,GAAI,kBAAkB,MAAM,EAAE,KAAK,MAAM,EAAE,mBAAiB,YA8H1F,CAAA"}
|
package/dist/data/mongo/index.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { connect } from '@rakered/mongo';
|
|
2
|
+
import { buildMongoQuery } from './filtering.js';
|
|
2
3
|
const removeUnderscoreFromId = ({ _id: id, ...updatedItem }) => ({
|
|
3
4
|
id,
|
|
4
5
|
...updatedItem,
|
|
@@ -29,8 +30,13 @@ export const createMongoQueries = (connectionString, log, isTesting = false) =>
|
|
|
29
30
|
return [];
|
|
30
31
|
return items.map((item) => removeUnderscoreFromId(item));
|
|
31
32
|
};
|
|
32
|
-
const getByFilter = async ({ resource }) => {
|
|
33
|
-
|
|
33
|
+
const getByFilter = async ({ resource, filter }) => {
|
|
34
|
+
await connectToDatabase();
|
|
35
|
+
const mongoQuery = buildMongoQuery(filter);
|
|
36
|
+
const items = (await db[collectionName(resource)].find(mongoQuery));
|
|
37
|
+
if (!items)
|
|
38
|
+
return [];
|
|
39
|
+
return items.map((item) => removeUnderscoreFromId(item));
|
|
34
40
|
};
|
|
35
41
|
const getById = async ({ resource, id }) => {
|
|
36
42
|
await connectToDatabase();
|
|
@@ -66,8 +72,10 @@ export const createMongoQueries = (connectionString, log, isTesting = false) =>
|
|
|
66
72
|
await connectToDatabase();
|
|
67
73
|
await db[collectionName(resource)].deleteMany({});
|
|
68
74
|
};
|
|
69
|
-
const deleteByFilter = async ({ resource }) => {
|
|
70
|
-
|
|
75
|
+
const deleteByFilter = async ({ resource, filter }) => {
|
|
76
|
+
await connectToDatabase();
|
|
77
|
+
const mongoQuery = buildMongoQuery(filter);
|
|
78
|
+
await db[collectionName(resource)].deleteMany(mongoQuery);
|
|
71
79
|
};
|
|
72
80
|
const mongoQueries = {
|
|
73
81
|
getAll,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/data/mongo/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/data/mongo/index.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "0.
|
|
1
|
+
export declare const version = "0.61.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "0.
|
|
1
|
+
export const version = "0.61.0";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|