@ahoo-wang/fetcher-wow 3.17.0 → 3.17.1

package/dist/index.es.js

@@ -169,10 +169,10 @@ function y(e, t) {
 	let n = {};
 	return e !== void 0 && (n.datePattern = e), t !== void 0 && (n.zoneId = t), n;
 }
-var ae = /* @__PURE__ */ function(e) {
+var b = /* @__PURE__ */ function(e) {
 	return e.ACTIVE = "ACTIVE", e.DELETED = "DELETED", e.ALL = "ALL", e;
 }({});
-function b(...e) {
+function x(...e) {
 	if (e.length === 0) return w();
 	if (e.length === 1) return _(e[0]) ? e[0] : w();
 	let t = [];
@@ -183,69 +183,69 @@ function b(...e) {
 		children: t
 	};
 }
-function oe(...e) {
+function ae(...e) {
 	let t = e?.filter((e) => _(e));
 	return t.length === 0 ? w() : {
 		operator: g.OR,
 		children: t
 	};
 }
-function se(...e) {
+function oe(...e) {
 	return e.length === 0 ? w() : {
 		operator: g.NOR,
 		children: e
 	};
 }
-function ce(e) {
+function se(e) {
 	return {
 		operator: g.ID,
 		value: e
 	};
 }
-function le(e) {
+function ce(e) {
 	return {
 		operator: g.IDS,
 		value: e
 	};
 }
-function x(e) {
+function S(e) {
 	return {
 		operator: g.AGGREGATE_ID,
 		value: e
 	};
 }
-function S(e) {
+function C(e) {
 	return {
 		operator: g.AGGREGATE_IDS,
 		value: e
 	};
 }
-function ue(e) {
+function le(e) {
 	return {
 		operator: g.TENANT_ID,
 		value: e
 	};
 }
-function de(e) {
+function ue(e) {
 	return {
 		operator: g.OWNER_ID,
 		value: e
 	};
 }
-function fe(e) {
+function de(e) {
 	return {
 		operator: g.SPACE_ID,
 		value: e
 	};
 }
-function C(e) {
+function fe(e) {
 	return {
 		operator: g.DELETED,
 		value: e
 	};
 }
 function pe() {
-	return C("ACTIVE");
+	return fe("ACTIVE");
 }
 function w() {
 	return { operator: g.ALL };
@@ -264,35 +264,35 @@ function he(e, t) {
 		value: t
 	};
 }
-function T(e, t) {
+function ge(e, t) {
 	return {
 		field: e,
 		operator: g.GT,
 		value: t
 	};
 }
-function E(e, t) {
+function _e(e, t) {
 	return {
 		field: e,
 		operator: g.LT,
 		value: t
 	};
 }
-function ge(e, t) {
+function ve(e, t) {
 	return {
 		field: e,
 		operator: g.GTE,
 		value: t
 	};
 }
-function _e(e, t) {
+function ye(e, t) {
 	return {
 		field: e,
 		operator: g.LTE,
 		value: t
 	};
 }
-function ve(e, t, n) {
+function be(e, t, n) {
 	let r = v(n);
 	return {
 		field: e,
@@ -301,35 +301,35 @@ function ve(e, t, n) {
 		options: r
 	};
 }
-function ye(e, ...t) {
+function xe(e, ...t) {
 	return {
 		field: e,
 		operator: g.IN,
 		value: t
 	};
 }
-function D(e, ...t) {
+function Se(e, ...t) {
 	return {
 		field: e,
 		operator: g.NOT_IN,
 		value: t
 	};
 }
-function O(e, t, n) {
+function Ce(e, t, n) {
 	return {
 		field: e,
 		operator: g.BETWEEN,
 		value: [t, n]
 	};
 }
-function k(e, ...t) {
+function we(e, ...t) {
 	return {
 		field: e,
 		operator: g.ALL_IN,
 		value: t
 	};
 }
-function A(e, t, n) {
+function Te(e, t, n) {
 	let r = v(n);
 	return {
 		field: e,
@@ -338,14 +338,14 @@ function A(e, t, n) {
 		options: r
 	};
 }
-function j(e, t) {
+function Ee(e, t) {
 	return {
 		field: e,
 		operator: g.MATCH,
 		value: t
 	};
 }
-function M(e, t, n) {
+function De(e, t, n) {
 	let r = v(n);
 	return {
 		field: e,
@@ -354,45 +354,45 @@ function M(e, t, n) {
 		options: r
 	};
 }
-function N(e, t) {
+function Oe(e, t) {
 	return {
 		field: e,
 		operator: g.ELEM_MATCH,
 		children: [t]
 	};
 }
-function P(e) {
+function ke(e) {
 	return {
 		field: e,
 		operator: g.NULL
 	};
 }
-function be(e) {
+function Ae(e) {
 	return {
 		field: e,
 		operator: g.NOT_NULL
 	};
 }
-function xe(e) {
+function je(e) {
 	return {
 		field: e,
 		operator: g.TRUE
 	};
 }
-function Se(e) {
+function Me(e) {
 	return {
 		field: e,
 		operator: g.FALSE
 	};
 }
-function Ce(e, t = !0) {
+function Ne(e, t = !0) {
 	return {
 		field: e,
 		operator: g.EXISTS,
 		value: t
 	};
 }
-function we(e, t, n) {
+function Pe(e, t, n) {
 	let r = y(t, n);
 	return {
 		field: e,
@@ -400,7 +400,7 @@ function we(e, t, n) {
 		options: r
 	};
 }
-function Te(e, t, n, r) {
+function Fe(e, t, n, r) {
 	let i = y(n, r);
 	return {
 		field: e,
@@ -409,7 +409,7 @@ function Te(e, t, n, r) {
 		options: i
 	};
 }
-function Ee(e, t, n) {
+function Ie(e, t, n) {
 	let r = y(t, n);
 	return {
 		field: e,
@@ -417,7 +417,7 @@ function Ee(e, t, n) {
 		options: r
 	};
 }
-function De(e, t, n) {
+function Le(e, t, n) {
 	let r = y(t, n);
 	return {
 		field: e,
@@ -425,7 +425,7 @@ function De(e, t, n) {
 		options: r
 	};
 }
-function Oe(e, t, n) {
+function Re(e, t, n) {
 	let r = y(t, n);
 	return {
 		field: e,
@@ -433,7 +433,7 @@ function Oe(e, t, n) {
 		options: r
 	};
 }
-function ke(e, t, n) {
+function ze(e, t, n) {
 	let r = y(t, n);
 	return {
 		field: e,
@@ -441,7 +441,7 @@ function ke(e, t, n) {
 		options: r
 	};
 }
-function Ae(e, t, n) {
+function Be(e, t, n) {
 	let r = y(t, n);
 	return {
 		field: e,
@@ -449,7 +449,7 @@ function Ae(e, t, n) {
 		options: r
 	};
 }
-function je(e, t, n) {
+function Ve(e, t, n) {
 	let r = y(t, n);
 	return {
 		field: e,
@@ -457,7 +457,7 @@ function je(e, t, n) {
 		options: r
 	};
 }
-function Me(e, t, n, r) {
+function He(e, t, n, r) {
 	let i = y(n, r);
 	return {
 		field: e,
@@ -466,7 +466,7 @@ function Me(e, t, n, r) {
 		options: i
 	};
 }
-function Ne(e, t, n, r) {
+function Ue(e, t, n, r) {
 	let i = y(n, r);
 	return {
 		field: e,
@@ -475,19 +475,467 @@ function Ne(e, t, n, r) {
 		options: i
 	};
 }
-function Pe(e) {
+function We(e) {
 	return {
 		operator: g.RAW,
 		value: e
 	};
 }
 //#endregion
-//#region src/query/pagination.ts
+//#region src/query/filter.ts
+var Ge = /* @__PURE__ */ function(e) {
+	return e.MATCH_ALL = "MATCH_ALL", e.MATCH_NONE = "MATCH_NONE", e.ID = "ID", e.IDS = "IDS", e.AGGREGATE_ID = "AGGREGATE_ID", e.AGGREGATE_IDS = "AGGREGATE_IDS", e.TENANT_ID = "TENANT_ID", e.OWNER_ID = "OWNER_ID", e.SPACE_ID = "SPACE_ID", e.AND = "AND", e.OR = "OR", e.NOR = "NOR", e.EQ = "EQ", e.NE = "NE", e.GT = "GT", e.GTE = "GTE", e.LT = "LT", e.LTE = "LTE", e.CONTAINS = "CONTAINS", e.STARTS_WITH = "STARTS_WITH", e.ENDS_WITH = "ENDS_WITH", e.IN = "IN", e.NOT_IN = "NOT_IN", e.BETWEEN = "BETWEEN", e.CONTAINS_ALL = "CONTAINS_ALL", e.IS_EMPTY = "IS_EMPTY", e.IS_NULL = "IS_NULL", e.IS_NOT_NULL = "IS_NOT_NULL", e.EXISTS = "EXISTS", e.NOT_EXISTS = "NOT_EXISTS", e.DELETION = "DELETION", e.ELEMENT_MATCH = "ELEMENT_MATCH", e.SEARCH = "SEARCH", e.TODAY = "TODAY", e.BEFORE_TODAY = "BEFORE_TODAY", e.TOMORROW = "TOMORROW", e.THIS_WEEK = "THIS_WEEK", e.NEXT_WEEK = "NEXT_WEEK", e.LAST_WEEK = "LAST_WEEK", e.THIS_MONTH = "THIS_MONTH", e.LAST_MONTH = "LAST_MONTH", e.RECENT_DAYS = "RECENT_DAYS", e.EARLIER_DAYS = "EARLIER_DAYS", e;
+}({}), Ke = /* @__PURE__ */ function(e) {
+	return e.CASE_SENSITIVE = "CASE_SENSITIVE", e.CASE_INSENSITIVE = "CASE_INSENSITIVE", e;
+}({}), qe = /^([01][0-9]|2[0-3]):[0-5][0-9](?::[0-5][0-9](?:\.[0-9]{1,9})?)?$/, Je = /^@?[A-Za-z_][A-Za-z0-9_-]*(\.(?:@?[A-Za-z_][A-Za-z0-9_-]*|[0-9]+))*$/, Ye = /^(?:UTC|GMT|UT)?[+-](\d{1,2}|\d{4}|\d{6}|\d{2}:\d{2}|\d{2}:\d{2}:\d{2})$/, Xe = /^(?:UTC|GMT|UT)?[+-]/, Ze = {
+	G: 5,
+	u: 19,
+	y: 19,
+	Q: 5,
+	q: 5,
+	M: 5,
+	L: 5,
+	D: 3,
+	d: 2,
+	F: 1,
+	E: 5,
+	e: 5,
+	c: [
+		1,
+		3,
+		4,
+		5
+	],
+	a: 1,
+	B: [
+		1,
+		4,
+		5
+	],
+	h: 2,
+	H: 2,
+	k: 2,
+	K: 2,
+	m: 2,
+	s: 2,
+	S: 9,
+	A: 19,
+	n: 19,
+	N: 19,
+	V: [2],
+	v: [1, 4],
+	z: 4,
+	O: [1, 4],
+	X: 5,
+	x: 5,
+	Z: 5,
+	W: 1,
+	w: 2,
+	Y: Infinity,
+	g: 19
+};
+function T(e) {
+	if (typeof e != "string" || !Je.test(e)) throw TypeError(`Logical field is invalid: [${String(e)}].`);
+	return e;
+}
+function E(e, t) {
+	if (!(e === null ? t : typeof e == "string" || typeof e == "boolean" || typeof e == "number" && Number.isFinite(e))) throw TypeError("Filter value must be a JSON scalar.");
+	return e;
+}
+function D(e) {
+	return Array.isArray(e) ? (e.forEach((e) => E(e, !0)), e) : E(e, !0);
+}
+function O(e, t) {
+	if (typeof t != "string") throw TypeError(`${e} must be a string.`);
+	return t;
+}
+function k(e) {
+	if (e !== "CASE_SENSITIVE" && e !== "CASE_INSENSITIVE") throw TypeError(`String comparison is invalid: [${String(e)}].`);
+}
+function A(e, t) {
+	if (t.length === 0) throw TypeError(`${e} cannot be empty.`);
+	if (t.some((e) => e == null)) throw TypeError(`${e} cannot contain null.`);
+}
+function Qe(e) {
+	let t = Ye.exec(e);
+	if (!t) return !1;
+	let n = t[1], [r, i = 0, a = 0] = (n.includes(":") ? n.split(":") : n.length <= 2 ? [n] : [
+		n.slice(0, 2),
+		n.slice(2, 4),
+		n.slice(4, 6)
+	]).map(Number);
+	return i <= 59 && a <= 59 && (r < 18 || r === 18 && i === 0 && a === 0);
+}
+function j({ zoneId: e, datePattern: t }) {
+	if (e !== void 0) {
+		if (typeof e != "string" || !e.trim()) throw TypeError("zoneId cannot be blank.");
+		if (Xe.test(e) && !Qe(e)) throw TypeError(`zoneId is invalid: [${e}].`);
+	}
+	return t !== void 0 && et(t), {
+		...e === void 0 ? {} : { zoneId: e },
+		...t === void 0 ? {} : { datePattern: t }
+	};
+}
+function $e(e, t, n) {
+	let r = Ze[t];
+	if (!(typeof r == "number" ? n <= r : r?.includes(n) === !0)) throw TypeError(`datePattern is invalid: [${e}].`);
+}
+function M(e, t) {
+	return e !== void 0 && ("uyDFdhHkKmsSgAnNWwY".includes(e) || e === "c" && t === 1 || "eMLQq".includes(e) && t <= 2);
+}
+function et(e) {
+	if (typeof e != "string" || !e.trim()) throw TypeError("datePattern cannot be blank.");
+	let t = !1, n = 0;
+	for (let r = 0; r < e.length; r++) {
+		let i = e[r];
+		if (i === "'") {
+			e[r + 1] === "'" ? r++ : t = !t;
+			continue;
+		}
+		if (!t) {
+			if (/[A-Za-z]/.test(i)) {
+				let t = i, n = r + 1;
+				for (; e[n] === t;) n++;
+				let a = n - r, o = !1;
+				if (t === "p") {
+					if (o = !0, t = e[n], !t || !/[A-Za-z]/.test(t) || t === "p") throw TypeError(`datePattern is invalid: [${e}].`);
+					let r = n++;
+					for (; e[n] === t;) n++;
+					a = n - r;
+				}
+				if ($e(e, t, a), o && M(t, a)) {
+					let t = e[n], r = n;
+					for (; r < e.length && e[r] === t;) r++;
+					if (M(t, r - n)) throw TypeError(`datePattern is invalid: [${e}].`);
+				}
+				r = n - 1;
+			} else if (i === "[") n++;
+			else if (i === "]") {
+				if (n === 0) throw TypeError(`datePattern is invalid: [${e}].`);
+				n--;
+			} else if ("{}#".includes(i)) throw TypeError(`datePattern is invalid: [${e}].`);
+		}
+	}
+	if (t) throw TypeError(`datePattern is invalid: [${e}].`);
+}
+function N(e, t) {
+	if (!Number.isInteger(t) || t < 1 || t > 2147483647) throw TypeError(`${e} days must be a positive JVM Int.`);
+}
+function P(e) {
+	switch (e.op) {
+		case "ID":
+		case "IDS":
+		case "AGGREGATE_ID":
+		case "AGGREGATE_IDS":
+		case "TENANT_ID":
+		case "OWNER_ID":
+		case "SPACE_ID":
+		case "DELETION":
+		case "SEARCH": throw TypeError("ELEMENT_MATCH predicate cannot contain root filters.");
+		case "AND":
+		case "OR":
+		case "NOR":
+			A(`${e.op} operands`, e.operands), e.operands.forEach(P);
+			break;
+		case "ELEMENT_MATCH": P(e.predicate);
+	}
+}
+function tt(...e) {
+	return A("AND operands", e), {
+		op: "AND",
+		operands: e
+	};
+}
+function nt(...e) {
+	return A("OR operands", e), {
+		op: "OR",
+		operands: e
+	};
+}
+function rt(...e) {
+	return A("NOR operands", e), {
+		op: "NOR",
+		operands: e
+	};
+}
 var F = {
+	matchAll() {
+		return { op: "MATCH_ALL" };
+	},
+	matchNone() {
+		return { op: "MATCH_NONE" };
+	},
+	id(e) {
+		return {
+			op: "ID",
+			value: O("ID value", e)
+		};
+	},
+	ids(...e) {
+		return A("IDS values", e), e.forEach((e) => O("IDS value", e)), {
+			op: "IDS",
+			values: e
+		};
+	},
+	aggregateId(e) {
+		return {
+			op: "AGGREGATE_ID",
+			value: O("AGGREGATE_ID value", e)
+		};
+	},
+	aggregateIds(...e) {
+		return A("AGGREGATE_IDS values", e), e.forEach((e) => O("AGGREGATE_IDS value", e)), {
+			op: "AGGREGATE_IDS",
+			values: e
+		};
+	},
+	tenantId(e) {
+		return {
+			op: "TENANT_ID",
+			value: O("TENANT_ID value", e)
+		};
+	},
+	ownerId(e) {
+		return {
+			op: "OWNER_ID",
+			value: O("OWNER_ID value", e)
+		};
+	},
+	spaceId(e) {
+		return {
+			op: "SPACE_ID",
+			value: O("SPACE_ID value", e)
+		};
+	},
+	and: tt,
+	or: nt,
+	nor: rt,
+	eq(e, t) {
+		return {
+			op: "EQ",
+			field: T(e),
+			value: D(t)
+		};
+	},
+	ne(e, t) {
+		return {
+			op: "NE",
+			field: T(e),
+			value: D(t)
+		};
+	},
+	gt(e, t) {
+		return {
+			op: "GT",
+			field: T(e),
+			value: E(t, !1)
+		};
+	},
+	gte(e, t) {
+		return {
+			op: "GTE",
+			field: T(e),
+			value: E(t, !1)
+		};
+	},
+	lt(e, t) {
+		return {
+			op: "LT",
+			field: T(e),
+			value: E(t, !1)
+		};
+	},
+	lte(e, t) {
+		return {
+			op: "LTE",
+			field: T(e),
+			value: E(t, !1)
+		};
+	},
+	contains(e, t, n = "CASE_SENSITIVE") {
+		return k(n), {
+			op: "CONTAINS",
+			field: T(e),
+			value: O("CONTAINS value", t),
+			stringComparison: n
+		};
+	},
+	startsWith(e, t, n = "CASE_SENSITIVE") {
+		return k(n), {
+			op: "STARTS_WITH",
+			field: T(e),
+			value: O("STARTS_WITH value", t),
+			stringComparison: n
+		};
+	},
+	endsWith(e, t, n = "CASE_SENSITIVE") {
+		return k(n), {
+			op: "ENDS_WITH",
+			field: T(e),
+			value: O("ENDS_WITH value", t),
+			stringComparison: n
+		};
+	},
+	isIn(e, ...t) {
+		return A("IN values", t), t.forEach((e) => E(e, !1)), {
+			op: "IN",
+			field: T(e),
+			values: t
+		};
+	},
+	notIn(e, ...t) {
+		return A("NOT_IN values", t), t.forEach((e) => E(e, !1)), {
+			op: "NOT_IN",
+			field: T(e),
+			values: t
+		};
+	},
+	containsAll(e, ...t) {
+		return A("CONTAINS_ALL values", t), t.forEach((e) => E(e, !1)), {
+			op: "CONTAINS_ALL",
+			field: T(e),
+			values: t
+		};
+	},
+	between(e, t, n) {
+		return {
+			op: "BETWEEN",
+			field: T(e),
+			lowerBound: E(t, !1),
+			upperBound: E(n, !1)
+		};
+	},
+	isEmpty(e) {
+		return {
+			op: "IS_EMPTY",
+			field: T(e)
+		};
+	},
+	isNull(e) {
+		return {
+			op: "IS_NULL",
+			field: T(e)
+		};
+	},
+	isNotNull(e) {
+		return {
+			op: "IS_NOT_NULL",
+			field: T(e)
+		};
+	},
+	exists(e) {
+		return {
+			op: "EXISTS",
+			field: T(e)
+		};
+	},
+	notExists(e) {
+		return {
+			op: "NOT_EXISTS",
+			field: T(e)
+		};
+	},
+	deletion(e) {
+		if (e !== b.ACTIVE && e !== b.DELETED && e !== b.ALL) throw TypeError(`Deletion state is invalid: [${String(e)}].`);
+		return {
+			op: "DELETION",
+			state: e
+		};
+	},
+	elementMatch(e, t) {
+		return P(t), {
+			op: "ELEMENT_MATCH",
+			field: T(e),
+			predicate: t
+		};
+	},
+	search(e, ...t) {
+		if (typeof e != "string" || !e.trim()) throw TypeError("SEARCH query cannot be blank.");
+		return {
+			op: "SEARCH",
+			query: e,
+			fields: t.map(T)
+		};
+	},
+	today(e, t = {}) {
+		return {
+			...j(t),
+			op: "TODAY",
+			field: T(e)
+		};
+	},
+	beforeToday(e, t, n = {}) {
+		if (typeof t != "string" || !qe.test(t)) throw TypeError("BEFORE_TODAY time is invalid.");
+		return {
+			...j(n),
+			op: "BEFORE_TODAY",
+			field: T(e),
+			time: t
+		};
+	},
+	tomorrow(e, t = {}) {
+		return {
+			...j(t),
+			op: "TOMORROW",
+			field: T(e)
+		};
+	},
+	thisWeek(e, t = {}) {
+		return {
+			...j(t),
+			op: "THIS_WEEK",
+			field: T(e)
+		};
+	},
+	nextWeek(e, t = {}) {
+		return {
+			...j(t),
+			op: "NEXT_WEEK",
+			field: T(e)
+		};
+	},
+	lastWeek(e, t = {}) {
+		return {
+			...j(t),
+			op: "LAST_WEEK",
+			field: T(e)
+		};
+	},
+	thisMonth(e, t = {}) {
+		return {
+			...j(t),
+			op: "THIS_MONTH",
+			field: T(e)
+		};
+	},
+	lastMonth(e, t = {}) {
+		return {
+			...j(t),
+			op: "LAST_MONTH",
+			field: T(e)
+		};
+	},
+	recentDays(e, t, n = {}) {
+		return N("RECENT_DAYS", t), {
+			...j(n),
+			op: "RECENT_DAYS",
+			field: T(e),
+			days: t
+		};
+	},
+	earlierDays(e, t, n = {}) {
+		return N("EARLIER_DAYS", t), {
+			...j(n),
+			op: "EARLIER_DAYS",
+			field: T(e),
+			days: t
+		};
+	}
+}, I = {
 	index: 1,
 	size: 10
 };
-function Fe({ index: e = F.index, size: t = F.size } = F) {
+function it({ index: e = I.index, size: t = I.size } = I) {
 	return {
 		index: e,
 		size: t
@@ -495,11 +943,11 @@ function Fe({ index: e = F.index, size: t = F.size } = F) {
 }
 //#endregion
 //#region src/query/projection.ts
-var I = {};
-function L() {
-	return I;
+var L = {};
+function R() {
+	return L;
 }
-function Ie({ include: e, exclude: t } = L()) {
+function at({ include: e, exclude: t } = R()) {
 	return {
 		include: e,
 		exclude: t
@@ -507,34 +955,49 @@ function Ie({ include: e, exclude: t } = L()) {
 }
 //#endregion
 //#region src/query/queryable.ts
-function R({ condition: e = w(), projection: t, sort: n } = {}) {
+function z({ condition: e, filter: t }) {
+	if (t === null) throw TypeError("filter cannot be null.");
+	if (t !== void 0) return { filter: t };
+	if (e === null) throw TypeError("condition cannot be null.");
+	return { condition: e === void 0 ? w() : e };
+}
+function B({ condition: e, filter: t, projection: n, sort: r } = {}) {
 	return {
-		condition: e,
-		projection: t,
-		sort: n
+		...z({
+			condition: e,
+			filter: t
+		}),
+		projection: n,
+		sort: r
 	};
 }
-function z({ condition: e = w(), projection: t, sort: n, limit: r = F.size } = {}) {
+function V({ condition: e, filter: t, projection: n, sort: r, limit: i } = {}) {
 	return {
-		condition: e,
-		projection: t,
-		sort: n,
-		limit: r
+		...z({
+			condition: e,
+			filter: t
+		}),
+		projection: n,
+		sort: r,
+		limit: i ?? (t === void 0 ? I.size : 0)
 	};
 }
-function Le({ condition: e = w(), projection: t, sort: n, pagination: r = F } = {}) {
+function ot({ condition: e, filter: t, projection: n, sort: r, pagination: i = I } = {}) {
 	return {
-		condition: e,
-		projection: t,
-		sort: n,
-		pagination: r
+		...z({
+			condition: e,
+			filter: t
+		}),
+		projection: n,
+		sort: r,
+		pagination: i
 	};
 }
-var B = {
+var st = {
 	total: 0,
 	list: []
 };
-function Re({ total: e, list: t = [] } = B) {
+function ct({ total: e, list: t = [] } = st) {
 	return e === void 0 && (e = t.length), {
 		total: e,
 		list: t
@@ -542,16 +1005,16 @@ function Re({ total: e, list: t = [] } = B) {
 }
 //#endregion
 //#region src/query/sort.ts
-var V = /* @__PURE__ */ function(e) {
+var H = /* @__PURE__ */ function(e) {
 	return e.ASC = "ASC", e.DESC = "DESC", e;
 }({});
-function ze(e) {
+function lt(e) {
 	return {
 		field: e,
 		direction: "ASC"
 	};
 }
-function Be(e) {
+function ut(e) {
 	return {
 		field: e,
 		direction: "DESC"
@@ -559,7 +1022,7 @@ function Be(e) {
 }
 //#endregion
 //#region src/query/event/domainEventStream.ts
-var Ve = class e {
+var dt = class e {
 	static {
 		this.HEADER = "header";
 	}
@@ -608,7 +1071,7 @@ var Ve = class e {
 	static {
 		this.CREATE_TIME = "createTime";
 	}
-}, H = class e {
+}, U = class e {
 	static {
 		this.EVENT_STREAM_RESOURCE_NAME = "event";
 	}
@@ -621,7 +1084,7 @@ var Ve = class e {
 	static {
 		this.PAGED = `${e.EVENT_STREAM_RESOURCE_NAME}/paged`;
 	}
-}, U = class {
+}, W = class {
 	constructor(e) {
 		this.apiMetadata = e;
 	}
@@ -639,7 +1102,7 @@ var Ve = class e {
 	}
 };
 m([
-	u(H.COUNT),
+	u(U.COUNT),
 	p(0, o()),
 	p(1, i()),
 	f("design:type", Function),
@@ -649,8 +1112,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], U.prototype, "count", null), m([
-	u(H.LIST),
+], W.prototype, "count", null), m([
+	u(U.LIST),
 	p(0, o()),
 	p(1, i()),
 	f("design:type", Function),
@@ -660,8 +1123,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], U.prototype, "list", null), m([
-	u(H.LIST, {
+], W.prototype, "list", null), m([
+	u(U.LIST, {
 		headers: { Accept: e.TEXT_EVENT_STREAM },
 		resultExtractor: n
 	}),
@@ -674,8 +1137,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], U.prototype, "listStream", null), m([
-	u(H.PAGED),
+], W.prototype, "listStream", null), m([
+	u(U.PAGED),
 	p(0, o()),
 	p(1, i()),
 	f("design:type", Function),
@@ -685,10 +1148,10 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], U.prototype, "paged", null), U = m([r(), f("design:paramtypes", [Object])], U);
+], W.prototype, "paged", null), W = m([r(), f("design:paramtypes", [Object])], W);
 //#endregion
 //#region src/query/snapshot/snapshot.ts
-var He = class {
+var ft = class {
 	static {
 		this.VERSION = "version";
 	}
@@ -728,7 +1191,7 @@ var He = class {
 	static {
 		this.STATE = "state";
 	}
-}, W = class e {
+}, G = class e {
 	static {
 		this.SNAPSHOT_RESOURCE_NAME = "snapshot";
 	}
@@ -753,7 +1216,7 @@ var He = class {
 	static {
 		this.SINGLE_STATE = `${e.SINGLE}/state`;
 	}
-}, G = class {
+}, K = class {
 	constructor(e) {
 		this.apiMetadata = e;
 	}
@@ -785,30 +1248,30 @@ var He = class {
 		throw a(e, t, n);
 	}
 	getById(e, t, n) {
-		let r = R({ condition: x(e) });
+		let r = B({ condition: S(e) });
 		return this.single(r, t, n);
 	}
 	getStateById(e, t, n) {
-		let r = R({ condition: x(e) });
+		let r = B({ condition: S(e) });
 		return this.singleState(r, t, n);
 	}
 	getByIds(e, t, n) {
-		let r = z({
-			condition: S(e),
+		let r = V({
+			condition: C(e),
 			limit: e.length
 		});
 		return this.list(r, t, n);
 	}
 	getStateByIds(e, t, n) {
-		let r = z({
-			condition: S(e),
+		let r = V({
+			condition: C(e),
 			limit: e.length
 		});
 		return this.listState(r, t, n);
 	}
 };
 m([
-	u(W.COUNT),
+	u(G.COUNT),
 	p(0, o()),
 	p(1, i()),
 	f("design:type", Function),
@@ -818,8 +1281,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "count", null), m([
-	u(W.LIST),
+], K.prototype, "count", null), m([
+	u(G.LIST),
 	p(0, o()),
 	p(1, i()),
 	f("design:type", Function),
@@ -829,8 +1292,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "list", null), m([
-	u(W.LIST, {
+], K.prototype, "list", null), m([
+	u(G.LIST, {
 		headers: { Accept: e.TEXT_EVENT_STREAM },
 		resultExtractor: n
 	}),
@@ -843,8 +1306,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "listStream", null), m([
-	u(W.LIST_STATE),
+], K.prototype, "listStream", null), m([
+	u(G.LIST_STATE),
 	p(0, o()),
 	p(1, i()),
 	f("design:type", Function),
@@ -854,8 +1317,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "listState", null), m([
-	u(W.LIST_STATE, {
+], K.prototype, "listState", null), m([
+	u(G.LIST_STATE, {
 		headers: { Accept: e.TEXT_EVENT_STREAM },
 		resultExtractor: n
 	}),
@@ -868,8 +1331,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "listStateStream", null), m([
-	u(W.PAGED),
+], K.prototype, "listStateStream", null), m([
+	u(G.PAGED),
 	p(0, o()),
 	p(1, i()),
 	f("design:type", Function),
@@ -879,8 +1342,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "paged", null), m([
-	u(W.PAGED_STATE),
+], K.prototype, "paged", null), m([
+	u(G.PAGED_STATE),
 	p(0, o()),
 	p(1, i()),
 	f("design:type", Function),
@@ -890,8 +1353,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "pagedState", null), m([
-	u(W.SINGLE),
+], K.prototype, "pagedState", null), m([
+	u(G.SINGLE),
 	p(0, o()),
 	p(1, i()),
 	f("design:type", Function),
@@ -901,8 +1364,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "single", null), m([
-	u(W.SINGLE_STATE),
+], K.prototype, "single", null), m([
+	u(G.SINGLE_STATE),
 	p(0, o()),
 	p(1, i()),
 	f("design:type", Function),
@@ -912,7 +1375,7 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "singleState", null), m([
+], K.prototype, "singleState", null), m([
 	p(1, i()),
 	f("design:type", Function),
 	f("design:paramtypes", [
@@ -921,7 +1384,7 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "getById", null), m([
+], K.prototype, "getById", null), m([
 	p(1, i()),
 	f("design:type", Function),
 	f("design:paramtypes", [
@@ -930,7 +1393,7 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "getStateById", null), m([
+], K.prototype, "getStateById", null), m([
 	p(1, i()),
 	f("design:type", Function),
 	f("design:paramtypes", [
@@ -939,7 +1402,7 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "getByIds", null), m([
+], K.prototype, "getByIds", null), m([
 	p(1, i()),
 	f("design:type", Function),
 	f("design:paramtypes", [
@@ -948,10 +1411,10 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], G.prototype, "getStateByIds", null), G = m([r(), f("design:paramtypes", [Object])], G);
+], K.prototype, "getStateByIds", null), K = m([r(), f("design:paramtypes", [Object])], K);
 //#endregion
 //#region src/query/state/loadStateAggregateClient.ts
-var K = class e {
+var q = class e {
 	static {
 		this.LOAD = "{id}/state";
 	}
@@ -961,7 +1424,7 @@ var K = class e {
 	static {
 		this.LOAD_TIME_BASED = `${e.LOAD}/time/{createTime}`;
 	}
-}, q = class {
+}, J = class {
 	constructor(e) {
 		this.apiMetadata = e;
 	}
@@ -976,7 +1439,7 @@ var K = class e {
 	}
 };
 m([
-	c(K.LOAD),
+	c(q.LOAD),
 	p(0, l("id")),
 	p(1, i()),
 	f("design:type", Function),
@@ -986,8 +1449,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], q.prototype, "load", null), m([
-	c(K.LOAD_VERSIONED),
+], J.prototype, "load", null), m([
+	c(q.LOAD_VERSIONED),
 	p(0, l("id")),
 	p(1, l("version")),
 	p(2, i()),
@@ -999,8 +1462,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], q.prototype, "loadVersioned", null), m([
-	c(K.LOAD_TIME_BASED),
+], J.prototype, "loadVersioned", null), m([
+	c(q.LOAD_TIME_BASED),
 	p(0, l("id")),
 	p(1, l("createTime")),
 	p(2, i()),
@@ -1012,10 +1475,10 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], q.prototype, "loadTimeBased", null), q = m([r(), f("design:paramtypes", [Object])], q);
+], J.prototype, "loadTimeBased", null), J = m([r(), f("design:paramtypes", [Object])], J);
 //#endregion
 //#region src/query/state/loadOwnerStateAggregateClient.ts
-var J = class e {
+var Y = class e {
 	static {
 		this.LOAD = "state";
 	}
@@ -1025,7 +1488,7 @@ var J = class e {
 	static {
 		this.LOAD_TIME_BASED = `${e.LOAD}/time/{createTime}`;
 	}
-}, Y = class {
+}, X = class {
 	constructor(e) {
 		this.apiMetadata = e;
 	}
@@ -1040,13 +1503,13 @@ var J = class e {
 	}
 };
 m([
-	c(J.LOAD),
+	c(Y.LOAD),
 	p(0, i()),
 	f("design:type", Function),
 	f("design:paramtypes", [typeof Record > "u" ? Object : Record, typeof AbortController > "u" ? Object : AbortController]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], Y.prototype, "load", null), m([
-	c(J.LOAD_VERSIONED),
+], X.prototype, "load", null), m([
+	c(Y.LOAD_VERSIONED),
 	p(0, l("version")),
 	p(1, i()),
 	f("design:type", Function),
@@ -1056,8 +1519,8 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], Y.prototype, "loadVersioned", null), m([
-	c(J.LOAD_TIME_BASED),
+], X.prototype, "loadVersioned", null), m([
+	c(Y.LOAD_TIME_BASED),
 	p(0, l("createTime")),
 	p(1, i()),
 	f("design:type", Function),
@@ -1067,73 +1530,82 @@ m([
 		typeof AbortController > "u" ? Object : AbortController
 	]),
 	f("design:returntype", typeof Promise > "u" ? Object : Promise)
-], Y.prototype, "loadTimeBased", null), Y = m([r(), f("design:paramtypes", [Object])], Y);
+], X.prototype, "loadTimeBased", null), X = m([r(), f("design:paramtypes", [Object])], X);
 //#endregion
 //#region src/query/cursorQuery.ts
-var Ue = "~";
-function X({ field: e, cursorId: t = "~", direction: n = V.DESC }) {
-	return n === V.ASC ? T(e, t) : E(e, t);
+var pt = "~";
+function mt({ field: e, cursorId: t = "~", direction: n = H.DESC }) {
+	return n === H.ASC ? ge(e, t) : _e(e, t);
+}
+function Z({ field: e, cursorId: t = "~", direction: n = H.DESC }) {
+	return n === H.ASC ? F.gt(e, t) : F.lt(e, t);
 }
-function Z({ field: e, direction: t = V.DESC }) {
+function Q({ field: e, direction: t = H.DESC }) {
 	return {
 		field: e,
 		direction: t
 	};
 }
-function We(e) {
-	let t = e.query, n = b(X(e), t.condition), r = Z(e);
+function ht(e) {
+	let t = e.query, n = Q(e), r = "filter" in t ? t.filter : void 0;
+	if (r !== void 0) return {
+		...t,
+		filter: F.and(Z(e), r),
+		sort: [n]
+	};
+	let i = t;
 	return {
 		...t,
-		condition: n,
-		sort: [r]
+		condition: x(mt(e), i.condition),
+		sort: [n]
 	};
 }
 //#endregion
 //#region src/query/queryClients.ts
-function Q(e) {
+function $(e) {
 	let n = t(e.resourceAttribution ?? "", e.aggregateName ?? "");
 	return e.contextAlias && (n = t(e.contextAlias, n)), {
 		...e,
 		basePath: n
 	};
 }
-var Ge = class {
+var gt = class {
 	constructor(e) {
 		this.defaultOptions = e;
 	}
 	createSnapshotQueryClient(e) {
-		let t = Q({
+		let t = $({
 			...this.defaultOptions,
 			...e
 		});
-		return new G(t);
+		return new K(t);
 	}
 	createLoadStateAggregateClient(e) {
-		let t = Q({
+		let t = $({
 			...this.defaultOptions,
 			...e
 		});
-		return new q(t);
+		return new J(t);
 	}
 	createOwnerLoadStateAggregateClient(e) {
-		let t = Q({
+		let t = $({
 			...this.defaultOptions,
 			...e
 		});
-		return new Y(t);
+		return new X(t);
 	}
 	createEventStreamQueryClient(e) {
-		let t = Q({
+		let t = $({
 			...this.defaultOptions,
 			...e
 		});
-		return new U(t);
+		return new W(t);
 	}
-}, Ke = {}, qe = ["*"], Je = /* @__PURE__ */ function(e) {
+}, _t = {}, vt = ["*"], yt = /* @__PURE__ */ function(e) {
 	return e.NONE = "", e.TENANT = "/tenant/{tenantId}", e.OWNER = "/owner/{ownerId}", e.TENANT_OWNER = "/tenant/{tenantId}/owner/{ownerId}", e;
-}({}), Ye = /* @__PURE__ */ function(e) {
+}({}), bt = /* @__PURE__ */ function(e) {
 	return e.RECOVERABLE = "RECOVERABLE", e.UNKNOWN = "UNKNOWN", e.UNRECOVERABLE = "UNRECOVERABLE", e;
-}({}), $ = class e {
+}({}), xt = class e {
 	static {
 		this.SUCCEEDED = "Ok";
 	}
@@ -1200,14 +1672,14 @@ var Ge = class {
 	static isError(t) {
 		return !e.isSucceeded(t);
 	}
-}, Xe = /* @__PURE__ */ function(e) {
+}, St = /* @__PURE__ */ function(e) {
 	return e.COMMAND = "COMMAND", e.ERROR = "ERROR", e.EVENT = "EVENT", e.SOURCING = "SOURCING", e.STATE_EVENT = "STATE_EVENT", e;
-}({}), Ze = "", Qe = /* @__PURE__ */ function(e) {
+}({}), Ct = "", wt = /* @__PURE__ */ function(e) {
 	return e.MAP = "MAP", e.STRING = "STRING", e;
 }({});
 //#endregion
 //#region src/getPropertyValue.ts
-function $e(e, t, n) {
+function Tt(e, t, n) {
 	if (e == null) return n;
 	let r = Array.isArray(t) ? t : t.split(".").filter(Boolean);
 	if (r.length === 0) return e;
@@ -1224,6 +1696,6 @@ function $e(e, t, n) {
 	return i;
 }
 //#endregion
-export { Ue as CURSOR_ID_START, h as CommandClient, ee as CommandHeaders, te as CommandStage, ie as ConditionOptionKey, Ze as DEFAULT_OWNER_ID, F as DEFAULT_PAGINATION, I as DEFAULT_PROJECTION, ae as DeletionState, Ve as DomainEventStreamMetadataFields, Ke as EMPTY_ABAC_TAGS, B as EMPTY_PAGED_LIST, re as EMPTY_VALUE_OPERATORS, $ as ErrorCodes, U as EventStreamQueryClient, H as EventStreamQueryEndpointPaths, Xe as FunctionKind, ne as LOGICAL_OPERATORS, Y as LoadOwnerStateAggregateClient, J as LoadOwnerStateAggregateEndpointPaths, q as LoadStateAggregateClient, K as LoadStateAggregateEndpointPaths, Qe as MessageHeaderSqlType, g as Operator, Ge as QueryClientFactory, Ye as RecoverableType, Je as ResourceAttributionPathSpec, He as SnapshotMetadataFields, G as SnapshotQueryClient, W as SnapshotQueryEndpointPaths, V as SortDirection, qe as WILDCARD_ABAC_TAG_VALUES, pe as active, x as aggregateId, S as aggregateIds, w as all, k as allIn, b as and, ze as asc, Te as beforeToday, O as between, ve as contains, Q as createQueryApiMetadata, X as cursorCondition, We as cursorQuery, Z as cursorSort, y as dateOptions, L as defaultProjection, C as deleted, Be as desc, Ne as earlierDays, N as elemMatch, M as endsWith, me as eq, Ce as exists, $e as getPropertyValue, T as gt, ge as gte, ce as id, le as ids, v as ignoreCaseOptions, Se as isFalse, ye as isIn, P as isNull, xe as isTrue, _ as isValidateCondition, je as lastMonth, ke as lastWeek, z as listQuery, E as lt, _e as lte, j as match, he as ne, Oe as nextWeek, se as nor, D as notIn, be as notNull, oe as or, de as ownerId, Re as pagedList, Le as pagedQuery, Fe as pagination, Ie as projection, Pe as raw, Me as recentDays, R as singleQuery, fe as spaceId, A as startsWith, ue as tenantId, Ae as thisMonth, De as thisWeek, we as today, Ee as tomorrow };
+export { pt as CURSOR_ID_START, h as CommandClient, ee as CommandHeaders, te as CommandStage, ie as ConditionOptionKey, Ct as DEFAULT_OWNER_ID, I as DEFAULT_PAGINATION, L as DEFAULT_PROJECTION, b as DeletionState, dt as DomainEventStreamMetadataFields, _t as EMPTY_ABAC_TAGS, st as EMPTY_PAGED_LIST, re as EMPTY_VALUE_OPERATORS, xt as ErrorCodes, W as EventStreamQueryClient, U as EventStreamQueryEndpointPaths, Ge as FilterOperator, St as FunctionKind, ne as LOGICAL_OPERATORS, X as LoadOwnerStateAggregateClient, Y as LoadOwnerStateAggregateEndpointPaths, J as LoadStateAggregateClient, q as LoadStateAggregateEndpointPaths, wt as MessageHeaderSqlType, g as Operator, gt as QueryClientFactory, bt as RecoverableType, yt as ResourceAttributionPathSpec, ft as SnapshotMetadataFields, K as SnapshotQueryClient, G as SnapshotQueryEndpointPaths, H as SortDirection, Ke as StringComparison, vt as WILDCARD_ABAC_TAG_VALUES, pe as active, S as aggregateId, C as aggregateIds, w as all, we as allIn, x as and, lt as asc, Fe as beforeToday, Ce as between, be as contains, $ as createQueryApiMetadata, mt as cursorCondition, Z as cursorFilter, ht as cursorQuery, Q as cursorSort, y as dateOptions, R as defaultProjection, fe as deleted, ut as desc, Ue as earlierDays, Oe as elemMatch, De as endsWith, me as eq, Ne as exists, F as filter, Tt as getPropertyValue, ge as gt, ve as gte, se as id, ce as ids, v as ignoreCaseOptions, Me as isFalse, xe as isIn, ke as isNull, je as isTrue, _ as isValidateCondition, Ve as lastMonth, ze as lastWeek, V as listQuery, _e as lt, ye as lte, Ee as match, he as ne, Re as nextWeek, oe as nor, Se as notIn, Ae as notNull, ae as or, ue as ownerId, ct as pagedList, ot as pagedQuery, it as pagination, at as projection, We as raw, He as recentDays, B as singleQuery, de as spaceId, Te as startsWith, le as tenantId, Be as thisMonth, Le as thisWeek, Pe as today, Ie as tomorrow };
 
 //# sourceMappingURL=index.es.js.map