@ryuzaki13/react-foundation-lib 1.1.15 → 1.1.16

package/dist/chunks/{odata-service-CDYp5CIE.js → odata-service-DNYr2dDx.js}

@@ -135,7 +135,7 @@ function ue(e) {
 	if (e == null) return !1;
 	if (typeof e == "string" && (e === "X" || e === " " || e === "")) return o(e);
 }
-function de(e, n) {
+function g(e, n) {
 	switch (e) {
 		case "boolean": return le(n) ?? n;
 		case "int":
@@ -150,14 +150,14 @@ function de(e, n) {
 		default: return String(n);
 	}
 }
-function fe(e, t) {
+function de(e, t) {
 	if (e.abapBooleanLike) {
 		let e = ue(t);
 		if (e !== void 0) return e;
 	}
-	return de(e.type, t);
+	return g(e.type, t);
 }
-function pe(e) {
+function fe(e) {
 	switch (e) {
 		case "boolean": return !1;
 		case "int":
@@ -172,7 +172,7 @@ function pe(e) {
 		default: return "";
 	}
 }
-function me(e) {
+function pe(e) {
 	switch (e) {
 		case "boolean": return !1;
 		case "number": return 0;
@@ -180,72 +180,72 @@ function me(e) {
 		default: return "";
 	}
 }
-function g(e, t) {
+function _(e, t) {
 	return (...n) => {
 		let r = e.safeParse(n);
 		if (!r.success) throw Error(`Validation failed: ${r.error.message}`);
 		return t(...r.data);
 	};
 }
-function _(e) {
-	return g(a.array(a.boolean()), e);
+function v(e) {
+	return _(a.array(a.boolean()), e);
 }
-function he(e) {
-	return g(a.array(a.string()), e);
+function me(e) {
+	return _(a.array(a.string()), e);
 }
-function ge(e) {
-	return g(a.array(a.number()), e);
+function he(e) {
+	return _(a.array(a.number()), e);
 }
-function v(e) {
-	return g(a.array(a.date()), e);
+function y(e) {
+	return _(a.array(a.date()), e);
 }
-var _e = v(r.datetime), ve = v(r.datetimeOffset), ye = v(r.time), be = v((e) => m("string", n(e))), xe = _((e) => m("boolean", e)), Se = _((e) => m("string", Number(e))), Ce = _((e) => m("byte", Number(e))), we = he((e) => m("string", e)), y = {
+var ge = y(r.datetime), _e = y(r.datetimeOffset), ve = y(r.time), ye = y((e) => m("string", n(e))), be = v((e) => m("boolean", e)), xe = v((e) => m("string", Number(e))), Se = v((e) => m("byte", Number(e))), Ce = me((e) => m("string", e)), b = {
 	date: {
 		base: {
 			label: "Базовый datetime",
 			description: "Используется для параметров OData с типом данных datetime",
-			fn: _e
+			fn: ge
 		},
 		datetimeOffset: {
 			label: "Базовый datetimeoffset",
 			description: "Используется для параметров OData с типом данных datetimeoffset",
-			fn: ve
+			fn: _e
 		},
 		time: {
 			label: "Базовый time",
 			description: "Используется для параметров OData с типом данных time",
-			fn: ye
+			fn: ve
 		},
 		stringAbapDate: {
 			label: "Дата ABAP YYYYMMDD",
 			description: "Используется для параметров OData с типом данных string(8)",
-			fn: be
+			fn: ye
 		}
 	},
 	boolean: {
 		base: {
 			label: "Базовое ABAP булево",
 			description: "Стандартный формат abap_bool со значением 'X' для true и '' для false",
-			fn: xe
+			fn: be
 		},
 		asChar: {
 			label: "Как символ",
 			description: "Преобразование булево в символы '0' или '1'",
-			fn: Se
+			fn: xe
 		},
 		asByte: {
 			label: "Как цифра",
 			description: "Преобразование булево в цифру 0 или 1",
-			fn: Ce
+			fn: Se
 		}
 	},
 	string: { base: {
 		label: "Базовая строка",
 		description: "",
-		fn: we
+		fn: Ce
 	} }
 };
-function b(e) {
+function x(e) {
 	switch (e) {
 		case "boolean": return "boolean";
 		case "int":
@@ -260,36 +260,36 @@ function b(e) {
 		default: return "string";
 	}
 }
-function Te(e) {
-	let t = y[b(e)];
+function we(e) {
+	let t = b[x(e)];
 	return t ? Object.entries(t).map(([e, t]) => ({
 		id: e,
 		...t
 	})) : [];
 }
-function Ee(e) {
-	let t = y[e];
+function Te(e) {
+	let t = b[e];
 	return t ? Object.entries(t).map(([e, t]) => ({
 		id: e,
 		...t
 	})) : [];
 }
-function De(e, t) {
-	return y[b(e)]?.[t];
+function Ee(e, t) {
+	return b[x(e)]?.[t];
 }
-function Oe(e, t) {
-	return y[e]?.[t];
+function De(e, t) {
+	return b[e]?.[t];
 }
 //#endregion
 //#region src/odata-service/builder.ts
-function ke(e, t) {
+function Oe(e, t) {
 	if (!t || typeof t != "number") return;
 	let n = e.match(/^'(.*)'$/s);
 	if (!n) throw Error(`Значение должно быть заключено в одинарные кавычки: ${e}`);
 	let r = n[1];
 	if (r.length > t) throw Error(`Значение слишком длинное для maxLength=${t}: '${e}' (${r.length} символов внутри кавычек)`);
 }
-function x(e, t) {
+function S(e, t) {
 	return e.parameters ? e.parameters.map((e) => {
 		let { id: n, type: r, maxLength: i, mandatory: a } = e, o = t[n] ?? {}, s = o.value, c = o.formatter;
 		if (a && s == null) throw Error(`Отсутствует обязательный параметр: ${n}`);
@@ -297,44 +297,44 @@ function x(e, t) {
 		try {
 			if (Array.isArray(s) && !c) throw Error("Массив значений OData-параметра требует custom formatter");
 			let e = c ? c(s) : h(r, s);
-			return ke(e, i), [n, e];
+			return Oe(e, i), [n, e];
 		} catch (e) {
 			throw Error(`Ошибка форматирования параметра ${n}: ${String(e)}`);
 		}
 	}).filter((e) => e !== null) : [];
 }
-function S(e, t) {
-	let n = x(e, t);
+function C(e, t) {
+	let n = S(e, t);
 	return n.length ? `(${n.map(([e, t]) => `${e}=${encodeURIComponent(t)}`).join(",")})` : "";
 }
-function C(e, t) {
+function w(e, t) {
 	let n = new URLSearchParams();
-	for (let [r, i] of x(e, t)) n.set(r, i);
+	for (let [r, i] of S(e, t)) n.set(r, i);
 	return n;
 }
-function Ae(e, t, n, r) {
+function ke(e, t, n, r) {
 	let i = `/${t.service}/${t.target}`;
-	return r === "create" ? i : r === "query" ? e.result ? w(e, t, n) : (__DEV__ && Object.keys(n).length > 0 && console.warn(`Параметры для query-запроса '/${t.service}/${t.target}' проигнорированы: target не поддерживает parameterized query.`), i) : `${i}${S(e, n)}`;
+	return r === "create" ? i : r === "query" ? e.result ? T(e, t, n) : (__DEV__ && Object.keys(n).length > 0 && console.warn(`Параметры для query-запроса '/${t.service}/${t.target}' проигнорированы: target не поддерживает parameterized query.`), i) : `${i}${C(e, n)}`;
 }
-function je(e, t, n) {
-	let r = C(e, n).toString(), i = `/${t.service}/${t.target}`;
+function Ae(e, t, n) {
+	let r = w(e, n).toString(), i = `/${t.service}/${t.target}`;
 	return r ? `${i}?${r}` : i;
 }
-function w(e, t, n) {
-	let r = S(e, n), i = e.result ? `/${e.result}` : "";
+function T(e, t, n) {
+	let r = C(e, n), i = e.result ? `/${e.result}` : "";
 	return `/${t.service}/${t.target}${r}${i}`;
 }
 //#endregion
 //#region src/odata-service/columns.ts
-function T(e) {
+function E(e) {
 	return e.filter((e) => e.semanticType === "code" && e.filterable);
 }
-function Me(e) {
-	return new Set(T(e).map((e) => e.id));
+function je(e) {
+	return new Set(E(e).map((e) => e.id));
 }
 //#endregion
 //#region src/odata-service/filters.ts
-var Ne = Object.freeze({
+var Me = Object.freeze({
 	eq: "eq",
 	ne: "ne",
 	gt: "gt",
@@ -344,7 +344,7 @@ var Ne = Object.freeze({
 	startswith: "startswith",
 	endswith: "endswith",
 	contains: "contains"
-}), Pe = Object.freeze(Object.values(Ne)), Fe = Object.freeze({
+}), Ne = Object.freeze(Object.values(Me)), Pe = Object.freeze({
 	eq: "равно",
 	ne: "не равно",
 	gt: "больше",
@@ -354,14 +354,14 @@ var Ne = Object.freeze({
 	startswith: "начинается с",
 	endswith: "заканчивается на",
 	contains: "содержит"
-}), Ie = new Set(Pe);
+}), Fe = new Set(Ne);
+function Ie(e) {
+	return typeof e == "string" && Fe.has(e);
+}
 function Le(e) {
-	return typeof e == "string" && Ie.has(e);
+	return Pe[e];
 }
 function Re(e) {
-	return Fe[e];
-}
-function ze(e) {
 	switch (typeof e) {
 		case "bigint":
 		case "number": return "int";
@@ -370,17 +370,17 @@ function ze(e) {
 	}
 	return "string";
 }
-function E(e) {
-	let { key: t, operation: n = "eq", value: r, type: i } = e, a = h(i ?? ze(r), r);
+function D(e) {
+	let { key: t, operation: n = "eq", value: r, type: i } = e, a = h(i ?? Re(r), r);
 	return n === "contains" ? `substringof(${a},${String(t)})` : n === "startswith" || n === "endswith" ? `${n}(${String(t)}, ${a})` : `${String(t)} ${n} ${a}`;
 }
-function Be(e) {
+function ze(e) {
 	return "conditions" in e && e.conditions !== void 0;
 }
-function Ve(e) {
+function Be(e) {
 	return "filters" in e && e.filters !== void 0;
 }
-function He(e, t) {
+function Ve(e, t) {
 	let n = [];
 	for (let r of e) {
 		let e = t(r);
@@ -388,46 +388,46 @@ function He(e, t) {
 	}
 	return n;
 }
-function D(e) {
+function O(e) {
 	if (!e) return "";
-	if (Be(e)) {
+	if (ze(e)) {
 		let { conditions: t, and: n = !1 } = e;
 		if (t.length === 0) return "";
-		if (t.length === 1) return E(t[0]);
+		if (t.length === 1) return D(t[0]);
 		let r = n ? "and" : "or";
-		return `(${t.map(E).join(` ${r} `)})`;
+		return `(${t.map(D).join(` ${r} `)})`;
 	}
-	if (Ve(e)) {
+	if (Be(e)) {
 		let { filters: t, and: n = !1 } = e;
 		if (t.length === 0) return "";
-		if (t.length === 1) return D(t[0]);
-		let r = n ? "and" : "or", i = He(t, D);
+		if (t.length === 1) return O(t[0]);
+		let r = n ? "and" : "or", i = Ve(t, O);
 		return i.length === 0 ? "" : i.length === 1 ? i[0] : `(${i.join(` ${r} `)})`;
 	}
 	throw Error("Некорректное выражение фильтра");
 }
-function Ue(e) {
+function He(e) {
 	let t = (e) => {
 		if (!e) return "";
-		if (Be(e)) {
+		if (ze(e)) {
 			let { conditions: t, and: n = !1 } = e;
 			if (t.length === 0) return "";
-			if (t.length === 1) return E(t[0]);
+			if (t.length === 1) return D(t[0]);
 			let r = n ? "and" : "or";
-			return `(${t.map(E).join(` ${r} `)})`;
+			return `(${t.map(D).join(` ${r} `)})`;
 		}
-		if (Ve(e)) {
+		if (Be(e)) {
 			let { filters: n, and: r = !1 } = e;
 			if (n.length === 0) return "";
 			if (n.length === 1) return t(n[0]);
-			let i = r ? "and" : "or", a = He(n, t).map((e) => e.includes(" ") ? `(${e})` : e);
+			let i = r ? "and" : "or", a = Ve(n, t).map((e) => e.includes(" ") ? `(${e})` : e);
 			return a.length === 0 ? "" : a.length === 1 ? a[0] : `(${a.join(` ${i} `)})`;
 		}
 		return "";
 	};
 	return t(e);
 }
-function O(e, t, n) {
+function k(e, t, n) {
 	if (t == null) return { conditions: [] };
 	if (Array.isArray(t)) {
 		let r = [];
@@ -444,7 +444,7 @@ function O(e, t, n) {
 		operation: n
 	}] };
 }
-function We(e, t) {
+function Ue(e, t) {
 	if (!t) return { conditions: [] };
 	let n = t[0], r = t[1];
 	return n == null || r == null ? n ? { conditions: [{
@@ -468,16 +468,16 @@ function We(e, t) {
 		}]
 	};
 }
-function k(e, t) {
-	return O(e, t, "eq");
+function A(e, t) {
+	return k(e, t, "eq");
+}
+function We(e, t) {
+	return k(e, Array.isArray(t) ? t.map((e) => e || null) : t || null, "eq");
 }
 function Ge(e, t) {
-	return O(e, Array.isArray(t) ? t.map((e) => e || null) : t || null, "eq");
+	return k(e, t, "contains");
 }
 function Ke(e, t) {
-	return O(e, t, "contains");
-}
-function qe(e, t) {
 	return e ? t ? {
 		and: !0,
 		filters: [e, t]
@@ -485,36 +485,36 @@ function qe(e, t) {
 }
 //#endregion
 //#region src/odata-service/filterDefinitions.ts
-function Je(e) {
+function qe(e) {
 	return e === "select" || e === "multi-select" || e === "checkbox" || e === "text-input" || e === "number-input";
 }
-function A(e, t) {
+function j(e, t) {
 	return e?.conditions.length ? e.conditions.map((e) => e.columnId?.trim() || t).filter((e) => !!e) : [];
 }
-function j(e, t) {
-	let n = e.kind === "list" ? e.options.flatMap((e) => A(e.filter, t)) : e.kind === "boolean" ? A(e.trueFilter, t) : A(e.valueFilter, t);
+function M(e, t) {
+	let n = e.kind === "list" ? e.options.flatMap((e) => j(e.filter, t)) : e.kind === "boolean" ? j(e.trueFilter, t) : j(e.valueFilter, t);
 	return [...new Set(n.length ? n : t ? [t] : [])];
 }
-function M(e, t) {
-	let n = A(e, t);
+function N(e, t) {
+	let n = j(e, t);
 	return n.length ? n : t ? [t] : [];
 }
-function Ye(e) {
+function Je(e) {
 	return e.kind === "registered" ? e.valueMode === "multiple" : e.componentId === "multi-select";
 }
-function Xe(e) {
+function Ye(e) {
 	return Array.isArray(e) ? [...new Set(e.filter((e) => typeof e == "string").map((e) => e.trim()))] : [];
 }
-function N(e, t) {
-	if (Ye(e)) return Xe(t);
-	let n = F(t);
+function P(e, t) {
+	if (Je(e)) return Ye(t);
+	let n = I(t);
 	return typeof n == "string" ? [n] : [];
 }
-function Ze(e) {
+function Xe(e) {
 	let t = H([e])[0];
 	return t ? t.kind === "registered" ? [...t.columnIds] : t.kind === "segment" || t.kind === "column" || t.kind === "advanced" ? [t.ownerColumnId] : [...t.columnIds] : [];
 }
-function Qe(e, t) {
+function Ze(e, t) {
 	let n = H([e])[0], r = U(t);
 	if (!n || r === void 0) return [];
 	switch (n.kind) {
@@ -527,67 +527,67 @@ function Qe(e, t) {
 		}
 		case "local":
 			if (n.binding.kind === "list") {
-				let e = N(n, r);
+				let e = P(n, r);
 				return [...new Set(e.flatMap((e) => {
 					let t = n.binding.kind === "list" ? n.binding.options.find((t) => t.key === e) : void 0;
-					return t ? M(t.filter, n.ownerColumnId) : [];
+					return t ? N(t.filter, n.ownerColumnId) : [];
 				}))];
 			}
-			return n.binding.kind === "boolean" ? r === !0 ? M(n.binding.trueFilter, n.ownerColumnId) : [] : M(n.binding.valueFilter, n.ownerColumnId);
+			return n.binding.kind === "boolean" ? r === !0 ? N(n.binding.trueFilter, n.ownerColumnId) : [] : N(n.binding.valueFilter, n.ownerColumnId);
 		case "registered": {
 			let e = n.binding;
 			if (!e) return [];
 			if (e.kind === "list") {
-				let t = N(n, r);
+				let t = P(n, r);
 				return [...new Set(t.flatMap((t) => {
 					let n = e.options.find((e) => e.key === t);
-					return n ? M(n.filter, "") : [];
+					return n ? N(n.filter, "") : [];
 				}))];
 			}
-			return e.kind === "boolean" ? r === !0 ? M(e.trueFilter, "") : [] : M(e.valueFilter, "");
+			return e.kind === "boolean" ? r === !0 ? N(e.trueFilter, "") : [] : N(e.valueFilter, "");
 		}
 		default: return [];
 	}
 }
-function P(e, t) {
+function F(e, t) {
 	let n = e?.trim();
 	return n && n !== t ? n : void 0;
 }
-function F(e) {
+function I(e) {
 	if (e instanceof Date) return Number.isFinite(e.getTime()) ? e : void 0;
 	if (typeof e == "string") return e.trim();
 	if (typeof e == "number") return Number.isFinite(e) ? e : void 0;
 	if (typeof e == "boolean") return e;
 }
-function I(e) {
+function L(e) {
 	return e instanceof Date ? `date:${e.toISOString()}` : `${typeof e}:${String(e)}`;
 }
-function L(e) {
+function R(e) {
 	if (!Array.isArray(e)) return;
 	let t = /* @__PURE__ */ new Set(), n = [];
 	for (let r of e) {
-		let e = F(r);
+		let e = I(r);
 		if (e === void 0) continue;
-		let i = I(e);
+		let i = L(e);
 		t.has(i) || (t.add(i), n.push(e));
 	}
-	return n.sort((e, t) => i(I(e), I(t))), n.length ? n : void 0;
+	return n.sort((e, t) => i(L(e), L(t))), n.length ? n : void 0;
 }
-function R(e) {
+function Qe(e) {
 	if (!Array.isArray(e)) return;
 	let t = [...new Set(e.filter((e) => typeof e == "string").map((e) => e.trim()).filter(Boolean))];
 	return t.length ? t : void 0;
 }
 function z(e) {
 	if (!e || typeof e != "object" || Array.isArray(e) || e instanceof Date) return;
-	let t = Object.fromEntries(Object.entries(e).map(([e, t]) => [e.trim(), R(t)]).filter((e) => !!e[0] && !!e[1]?.length));
+	let t = Object.fromEntries(Object.entries(e).map(([e, t]) => [e.trim(), Qe(t)]).filter((e) => !!e[0] && !!e[1]?.length));
 	return Object.keys(t).length ? t : void 0;
 }
 function B(e) {
 	if (!e?.conditions?.length) return;
 	let t = [];
 	for (let n of e.conditions) {
-		let e = F(n.value);
+		let e = I(n.value);
 		n.valueSource === "static" && e === void 0 || t.push({
 			columnId: n.columnId?.trim() || void 0,
 			operation: n.operation,
@@ -645,7 +645,7 @@ function H(e) {
 				id: e,
 				componentId: n,
 				valueMode: i,
-				columnIds: a ? j(a, "") : [],
+				columnIds: a ? M(a, "") : [],
 				binding: a
 			});
 			continue;
@@ -659,7 +659,7 @@ function H(e) {
 					ownerColumnId: i,
 					columnIds: [i],
 					componentId: r.componentId === "select" ? "select" : "multi-select",
-					dictionaryCodeKey: P(r.dictionaryCodeKey, i)
+					dictionaryCodeKey: F(r.dictionaryCodeKey, i)
 				});
 				break;
 			case "tree": {
@@ -682,7 +682,7 @@ function H(e) {
 					...r,
 					id: e,
 					ownerColumnId: i,
-					columnIds: j(n, i),
+					columnIds: M(n, i),
 					binding: n
 				});
 				break;
@@ -708,8 +708,8 @@ function H(e) {
 }
 function U(e) {
 	if (e == null) return;
-	let t = F(e);
-	return t === void 0 ? L(e) || z(e) : t;
+	let t = I(e);
+	return t === void 0 ? R(e) || z(e) : t;
 }
 function W(e) {
 	if (!e) return {};
@@ -752,7 +752,7 @@ function et(e, t, n) {
 	return r;
 }
 function tt(e, t) {
-	return F(t);
+	return I(t);
 }
 function nt(e, t, n) {
 	let r = tt(t.valueSource, t.valueSource === "input" ? n : t.value);
@@ -773,17 +773,17 @@ function G(e, t, n) {
 	};
 }
 function rt(e) {
-	return k(e, !0);
+	return A(e, !0);
 }
 function K(e, t) {
-	return k(e, t);
+	return A(e, t);
 }
 function it(e, t) {
 	let n = z(t);
 	if (!n) return;
 	let r = e.columnIds.map((e) => {
 		let t = n[e];
-		if (t?.length) return k(e, t);
+		if (t?.length) return A(e, t);
 	}).filter((e) => !!e);
 	if (r.length) return r.length === 1 ? r[0] : {
 		and: !0,
@@ -792,7 +792,7 @@ function it(e, t) {
 }
 function at(e, t) {
 	if (!e.binding || e.binding.kind !== "list") return;
-	let n = e.binding, r = N(e, t);
+	let n = e.binding, r = P(e, t);
 	if (!r.length) return;
 	let i = e.kind === "local" ? e.ownerColumnId : "", a = r.map((t) => {
 		let r = n.options.find((e) => e.key === t);
@@ -809,24 +809,24 @@ function ot(e, t) {
 	if (t !== void 0) switch (e.kind) {
 		case "segment": {
 			if (e.componentId === "select") {
-				let n = F(t);
+				let n = I(t);
 				return n === void 0 ? void 0 : K(e.ownerColumnId, n);
 			}
-			let n = L(t);
+			let n = R(t);
 			return n?.length ? K(e.ownerColumnId, n) : void 0;
 		}
 		case "tree": return it(e, t);
 		case "local": return e.binding.kind === "list" ? at(e, t) : e.binding.kind === "boolean" ? t === !0 ? G(e.ownerColumnId, e.binding.trueFilter) ?? rt(e.ownerColumnId) : void 0 : G(e.ownerColumnId, e.binding.valueFilter, t) ?? (() => {
-			let n = F(t), r = L(t), i = n ?? r;
+			let n = I(t), r = R(t), i = n ?? r;
 			return i === void 0 ? void 0 : K(e.ownerColumnId, i);
 		})();
 		case "registered": return e.binding ? e.binding.kind === "list" ? at(e, t) : e.binding.kind === "boolean" ? t === !0 ? G("", e.binding.trueFilter) : void 0 : G("", e.binding.valueFilter, t) : void 0;
 		case "column": {
-			let n = F(t), r = L(t), i = n ?? r;
+			let n = I(t), r = R(t), i = n ?? r;
 			return i === void 0 ? void 0 : K(e.ownerColumnId, i);
 		}
 		case "advanced": {
-			let n = L(t);
+			let n = R(t);
 			return n?.length ? K(e.ownerColumnId, n) : void 0;
 		}
 		default:
@@ -848,7 +848,7 @@ function ct(e, t) {
 		let t = r[e.id];
 		if (t === void 0) continue;
 		if (e.kind === "segment") {
-			let n = typeof t == "string" ? t : void 0, r = R(t), a = n ? [n] : r;
+			let n = typeof t == "string" ? t : void 0, r = Qe(t), a = n ? [n] : r;
 			if (!a?.length) continue;
 			i[e.dictionaryCodeKey ?? e.ownerColumnId] = a;
 			continue;
@@ -1192,40 +1192,53 @@ function Gt(e, t) {
 		values: t
 	};
 }
-function Kt(e) {
+function Kt(e, t) {
+	return {
+		operation: "group",
+		conjunction: t,
+		expressions: e
+	};
+}
+function qt(e) {
 	if (e instanceof Date) throw Error("Дата должна быть отформатирована вызывающей стороной до формирования SQL-фильтра");
 	if (!Ut(e) || typeof e == "number" && !Number.isFinite(e)) return;
 	let t = String(e);
 	if (!(!t || t.trim() === "")) return `'${t.replaceAll("'", "''")}'`;
 }
-function qt(e) {
+function Jt(e) {
+	if (e.operation === "group") {
+		let t = e.expressions.map((e) => Jt(e)).filter((e) => !!e);
+		if (!t.length) return;
+		let n = e.conjunction === "or" ? " OR " : " AND ";
+		return `(${t.join(n)})`;
+	}
 	if (e.operation === "eq") {
-		let t = Kt(e.value);
+		let t = qt(e.value);
 		return t ? ($(e.fieldId), `${e.fieldId}=${t}`) : void 0;
 	}
-	let t = (e.values ?? []).map((e) => Kt(e)).filter((e) => !!e);
+	let t = (e.values ?? []).map((e) => qt(e)).filter((e) => !!e);
 	if (t.length !== 0) return $(e.fieldId), `${e.fieldId} IN (${t.join(", ")})`;
 }
-function Jt(e) {
-	return e ? e.map((e) => qt(e)).filter((e) => !!e).join(" AND ") : "";
+function Yt(e) {
+	return e ? e.map((e) => Jt(e)).filter((e) => !!e).join(" AND ") : "";
 }
 //#endregion
 //#region src/odata-service/typesValidation.ts
-function Yt(e) {
+function Xt(e) {
 	return e === "boolean";
 }
-function Xt(e) {
+function Zt(e) {
 	return e === "byte" || e === "int" || e === "long" || e === "float" || e === "decimal" || e === "double";
 }
-function Zt(e) {
+function Qt(e) {
 	return e === "byte" || e === "int" || e === "long";
 }
-function Qt(e) {
+function $t(e) {
 	return e === "datetime" || e === "datetimeOffset" || e === "time";
 }
 //#endregion
 //#region src/odata-service/unwrapODataQueryResult.ts
-function $t(e) {
+function en(e) {
 	let t = e.data?.data, n = e.data?.totalCount;
 	return {
 		...e,
@@ -1235,30 +1248,30 @@ function $t(e) {
 }
 //#endregion
 //#region src/odata-service/utils.ts
-function en(e) {
-	return Array.isArray(e) ? [e[0] ?? null, e[1] ?? null] : [nn(e) ? e ?? null : null, null];
+function tn(e) {
+	return Array.isArray(e) ? [e[0] ?? null, e[1] ?? null] : [rn(e) ? e ?? null : null, null];
 }
-function tn(t) {
+function nn(t) {
 	return t instanceof Date ? t : Array.isArray(t) || e(t) ? null : t;
 }
-function nn(e) {
+function rn(e) {
 	return e == null || typeof e == "string" || typeof e == "number" || typeof e == "boolean" || e instanceof Date;
 }
 //#endregion
 //#region src/odata-service/wrapParams.ts
-function rn(e) {
+function an(e) {
 	if (!e) return {};
 	let t = {};
 	for (let n in e) t[n] = { value: e[n] };
 	return t;
 }
-function an(e) {
+function on(e) {
 	if (!e) return;
 	let t = {};
 	for (let n of Object.keys(e).sort()) t[n] = e[n]?.value ?? null;
 	return t;
 }
 //#endregion
-export { Me as $, Je as A, ee as At, Pe as B, ft as C, oe as Ct, et as D, ne as Dt, ut as E, d as Et, V as F, s as Ft, We as G, D as H, B as I, Ge as J, Ke as K, H as L, P as M, c as Mt, Qe as N, u as Nt, st as O, re as Ot, Ze as P, o as Pt, T as Q, U as R, q as S, ce as St, Ft as T, f as Tt, Ue as U, Ne as V, O as W, qe as X, Le as Y, Re as Z, Bt as _, Ee as _t, en as a, x as at, zt as b, fe as bt, Qt as c, g as ct, $ as d, me as dt, Ae as et, Jt as f, pe as ft, Lt as g, Te as gt, Ut as h, Oe as ht, tn as i, je as it, $e as j, l as jt, ct as k, ie as kt, Zt as l, ge as lt, Gt as m, De as mt, rn as n, w as nt, $t as o, _ as ot, Wt as p, b as pt, k as q, nn as r, C as rt, Yt as s, v as st, an as t, S as tt, Xt as u, he as ut, It as v, h as vt, dt as w, ae as wt, Rt as x, se as xt, Vt as y, de as yt, W as z };
+export { E as $, ct as A, ie as At, W as B, q as C, ce as Ct, ut as D, d as Dt, Ft as E, f as Et, Xe as F, o as Ft, k as G, Me as H, V as I, s as It, A as J, Ue as K, B as L, $e as M, l as Mt, F as N, c as Nt, et as O, ne as Ot, Ze as P, u as Pt, Le as Q, H as R, Rt as S, se as St, dt as T, ae as Tt, O as U, Ne as V, He as W, Ie as X, We as Y, Ke as Z, Lt as _, we as _t, tn as a, Ae as at, Vt as b, g as bt, $t as c, y as ct, $ as d, me as dt, je as et, Yt as f, pe as ft, Ut as g, De as gt, Gt as h, Ee as ht, nn as i, w as it, qe as j, ee as jt, st as k, re as kt, Qt as l, _ as lt, Kt as m, x as mt, an as n, C as nt, en as o, S as ot, Wt as p, fe as pt, Ge as q, rn as r, T as rt, Xt as s, v as st, on as t, ke as tt, Zt as u, he as ut, Bt as v, Te as vt, ft as w, oe as wt, zt as x, de as xt, It as y, h as yt, U as z };
 
-//# sourceMappingURL=odata-service-CDYp5CIE.js.map
+//# sourceMappingURL=odata-service-DNYr2dDx.js.map