rl-core-api 0.10.2 → 0.11.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.
|
@@ -9,3 +9,4 @@ export declare const isFilterGroup: (node: FilterNode) => node is FilterGroup;
|
|
|
9
9
|
export declare const escapeLike: (value: string) => string;
|
|
10
10
|
export declare const buildOperatorSql: (column: string, operator: FilterOperator, value: unknown, param: string) => FilterSql;
|
|
11
11
|
export declare const applyFilter: <T extends ObjectLiteral>(qb: SelectQueryBuilder<T>, node: FilterNode | null) => SelectQueryBuilder<T>;
|
|
12
|
+
export declare const ensureRelationJoin: <T extends ObjectLiteral>(qb: SelectQueryBuilder<T>, property: string, alias: string) => void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.applyFilter = exports.buildOperatorSql = exports.escapeLike = exports.isFilterGroup = void 0;
|
|
3
|
+
exports.ensureRelationJoin = exports.applyFilter = exports.buildOperatorSql = exports.escapeLike = exports.isFilterGroup = void 0;
|
|
4
4
|
const filterOperator_enum_1 = require("./filterOperator.enum");
|
|
5
5
|
const isFilterGroup = (node) => "combinator" in node;
|
|
6
6
|
exports.isFilterGroup = isFilterGroup;
|
|
@@ -91,16 +91,17 @@ const buildConditionSql = (condition, context) => {
|
|
|
91
91
|
}
|
|
92
92
|
const alias = relation ? relation.alias : context.alias;
|
|
93
93
|
if (relation) {
|
|
94
|
-
|
|
94
|
+
(0, exports.ensureRelationJoin)(context.qb, relation.property, relation.alias);
|
|
95
95
|
}
|
|
96
96
|
return (0, exports.buildOperatorSql)(`${alias}.${condition.field.column}`, condition.operator, condition.value, param);
|
|
97
97
|
};
|
|
98
|
-
const
|
|
99
|
-
const joined =
|
|
98
|
+
const ensureRelationJoin = (qb, property, alias) => {
|
|
99
|
+
const joined = qb.expressionMap.joinAttributes.some((join) => join.alias.name === alias);
|
|
100
100
|
if (!joined) {
|
|
101
|
-
|
|
101
|
+
qb.leftJoin(`${qb.alias}.${property}`, alias);
|
|
102
102
|
}
|
|
103
103
|
};
|
|
104
|
+
exports.ensureRelationJoin = ensureRelationJoin;
|
|
104
105
|
const buildExistsSql = (condition, context, param) => {
|
|
105
106
|
const relation = condition.field.relation;
|
|
106
107
|
const metadata = context.qb.expressionMap.mainAlias?.metadata;
|
|
@@ -24,10 +24,14 @@ const applySearch = (qb, search, catalog, searchFields) => {
|
|
|
24
24
|
const parts = searchFields
|
|
25
25
|
.map((name, index) => {
|
|
26
26
|
const definition = catalog.find((item) => item.field === name);
|
|
27
|
-
if (!definition || definition.relation) {
|
|
27
|
+
if (!definition || definition.relation?.kind === "toMany") {
|
|
28
28
|
return null;
|
|
29
29
|
}
|
|
30
|
-
|
|
30
|
+
const { relation } = definition;
|
|
31
|
+
if (relation) {
|
|
32
|
+
(0, applyFilter_util_1.ensureRelationJoin)(qb, relation.property, relation.alias);
|
|
33
|
+
}
|
|
34
|
+
return (0, applyFilter_util_1.buildOperatorSql)(`${relation ? relation.alias : qb.alias}.${definition.column}`, filterOperator_enum_1.FilterOperator.Substring, search, `s${index}`);
|
|
31
35
|
})
|
|
32
36
|
.filter((part) => part !== null);
|
|
33
37
|
if (parts.length === 0) {
|
package/package.json
CHANGED