@latlng/sdk 0.1.3 → 0.2.0

package/dist/index.js

@@ -16,31 +16,31 @@ var e = class extends Error {
 	constructor(e, t) {
 		super(e, t), this.status = t.status, this.url = t.url, this.body = t.body;
 	}
-}, r = class extends n {}, i = class extends n {};
+}, r = class extends n {}, i = class extends n {}, a = class extends n {}, o = class extends n {};
 //#endregion
 //#region src/http/routes.ts
-function a(e, t) {
+function s(e, t) {
 	return `${e.endsWith("/") ? e.slice(0, -1) : e}${t}`;
 }
-function o(e) {
+function c(e) {
 	let t = new URLSearchParams();
 	for (let [n, r] of Object.entries(e)) r != null && t.set(n, String(r));
 	let n = t.toString();
 	return n ? `?${n}` : "";
 }
-var s = {
+var l = {
 	ping: () => "/ping",
 	healthz: () => "/healthz",
 	server: () => "/server",
-	info: (e) => `/info${o({ section: e })}`,
+	info: (e) => `/info${c({ section: e })}`,
 	metrics: () => "/metrics",
-	collections: (e) => `/collections${o({ match_pattern: e })}`,
+	collections: (e) => `/collections${c({ match_pattern: e })}`,
 	collection: (e) => `/collections/${encodeURIComponent(e)}`,
 	renameCollection: (e) => `/collections/${encodeURIComponent(e)}/rename`,
 	bounds: (e) => `/collections/${encodeURIComponent(e)}/bounds`,
 	stats: (e) => `/collections/${encodeURIComponent(e)}/stats`,
 	object: (e, t) => `/collections/${encodeURIComponent(e)}/objects/${encodeURIComponent(t)}`,
-	objects: (e, t) => `/collections/${encodeURIComponent(e)}/objects${o({ match_pattern: t })}`,
+	objects: (e, t) => `/collections/${encodeURIComponent(e)}/objects${c({ match_pattern: t })}`,
 	fields: (e, t) => `/collections/${encodeURIComponent(e)}/objects/${encodeURIComponent(t)}/fields`,
 	field: (e, t, n) => `/collections/${encodeURIComponent(e)}/objects/${encodeURIComponent(t)}/fields/${encodeURIComponent(n)}`,
 	expire: (e, t) => `/collections/${encodeURIComponent(e)}/objects/${encodeURIComponent(t)}/expire`,
@@ -52,9 +52,9 @@ var s = {
 	intersects: (e) => `/collections/${encodeURIComponent(e)}/search/intersects`,
 	scan: (e) => `/collections/${encodeURIComponent(e)}/search/scan`,
 	search: (e) => `/collections/${encodeURIComponent(e)}/search/text`,
-	channels: (e) => `/channels${o({ match_pattern: e })}`,
+	channels: (e) => `/channels${c({ match_pattern: e })}`,
 	channel: (e) => `/channels/${encodeURIComponent(e)}`,
-	hooks: (e) => `/hooks${o({ match_pattern: e })}`,
+	hooks: (e) => `/hooks${c({ match_pattern: e })}`,
 	hook: (e) => `/hooks/${encodeURIComponent(e)}`,
 	config: (e) => `/config/${encodeURIComponent(e)}`,
 	flushdb: () => "/admin/flushdb",
@@ -68,12 +68,12 @@ var s = {
 };
 //#endregion
 //#region src/auth/token.ts
-function c(e, t) {
+function u(e, t) {
 	t && e.set("authorization", `Bearer ${t}`);
 }
 //#endregion
 //#region src/internal/json.ts
-async function l(e) {
+async function d(e) {
 	if (e.status === 204) return;
 	let t = await e.text();
 	if (t) try {
@@ -84,7 +84,7 @@ async function l(e) {
 }
 //#endregion
 //#region src/http/transport.ts
-var u = class {
+var f = class {
 	baseUrl;
 	token;
 	timeoutMs;
@@ -94,30 +94,30 @@ var u = class {
 		this.baseUrl = e.baseUrl, this.token = e.token, this.timeoutMs = e.timeoutMs ?? 5e3, this.headers = e.headers, this.fetchImpl = e.fetch ?? globalThis.fetch.bind(globalThis);
 	}
 	async request(e) {
-		let r = a(e.baseUrl ?? this.baseUrl, e.path), i = new AbortController(), o = setTimeout(() => i.abort(), this.timeoutMs), s = new Headers(this.headers);
-		e.body !== void 0 && s.set("content-type", "application/json"), c(s, this.token);
+		let r = s(e.baseUrl ?? this.baseUrl, e.path), i = new AbortController(), a = setTimeout(() => i.abort(), this.timeoutMs), o = new Headers(this.headers);
+		e.body !== void 0 && o.set("content-type", "application/json"), u(o, this.token);
 		try {
 			let t = await this.fetchImpl(r, {
 				method: e.method ?? "GET",
-				headers: s,
+				headers: o,
 				body: e.body === void 0 ? void 0 : JSON.stringify(e.body),
 				signal: i.signal
-			}), n = await l(t);
+			}), n = await d(t);
 			if (!t.ok) throw this.toHttpError(r, t.status, n);
 			return e.parser ? e.parser(n) : n;
 		} catch (e) {
 			throw e instanceof n ? e : e instanceof DOMException && e.name === "AbortError" ? new t(this.timeoutMs, { cause: e }) : e;
 		} finally {
-			clearTimeout(o);
+			clearTimeout(a);
 		}
 	}
 	async requestText(e) {
-		let r = a(e.baseUrl ?? this.baseUrl, e.path), i = new AbortController(), o = setTimeout(() => i.abort(), this.timeoutMs), s = new Headers(this.headers);
-		e.body !== void 0 && s.set("content-type", "application/json"), c(s, this.token);
+		let r = s(e.baseUrl ?? this.baseUrl, e.path), i = new AbortController(), a = setTimeout(() => i.abort(), this.timeoutMs), o = new Headers(this.headers);
+		e.body !== void 0 && o.set("content-type", "application/json"), u(o, this.token);
 		try {
 			let t = await this.fetchImpl(r, {
 				method: e.method ?? "GET",
-				headers: s,
+				headers: o,
 				body: e.body === void 0 ? void 0 : JSON.stringify(e.body),
 				signal: i.signal
 			}), n = await t.text();
@@ -126,29 +126,29 @@ var u = class {
 		} catch (e) {
 			throw e instanceof n ? e : e instanceof DOMException && e.name === "AbortError" ? new t(this.timeoutMs, { cause: e }) : e;
 		} finally {
-			clearTimeout(o);
+			clearTimeout(a);
 		}
 	}
-	toHttpError(e, t, a) {
-		let o = a && typeof a == "object" && "error" in a && typeof a.error == "string" ? a.error : typeof a == "string" && a.length > 0 ? a : `request failed with status ${t}`, s = {
+	toHttpError(e, t, s) {
+		let c = s && typeof s == "object" && "error" in s && typeof s.error == "string" ? s.error : typeof s == "string" && s.length > 0 ? s : `request failed with status ${t}`, l = {
 			status: t,
 			url: e,
-			body: a
+			body: s
 		};
-		return t === 401 ? new r(o, s) : t === 503 ? new i(o, s) : new n(o, s);
+		return t === 400 ? new i(c, l) : t === 401 ? new r(c, l) : t === 404 ? new a(c, l) : t === 503 ? new o(c, l) : new n(c, l);
 	}
 };
 //#endregion
 //#region src/internal/assert.ts
-function d(e, t) {
+function p(e, t) {
 	if (!e) throw Error(t);
 }
-function f(e) {
+function m(e) {
 	return typeof e == "object" && !!e && !Array.isArray(e);
 }
 //#endregion
 //#region src/types/models.ts
-function p(e, t, n) {
+function h(e, t, n) {
 	return {
 		type: "point",
 		lat: e,
@@ -156,55 +156,55 @@ function p(e, t, n) {
 		z: n
 	};
 }
-function ee(e) {
+function g(e) {
 	return {
 		type: "bounds",
 		bounds: e
 	};
 }
-function m(e) {
+function _(e) {
 	return {
 		type: "hash",
 		value: e
 	};
 }
-function h(e) {
+function v(e) {
 	return {
 		type: "geojson",
 		value: e
 	};
 }
-function g(e) {
+function ee(e) {
 	return {
 		type: "string",
 		value: e
 	};
 }
-function _(e) {
+function te(e) {
 	return {
 		type: "number",
 		value: e
 	};
 }
-function te(e) {
+function ne(e) {
 	return {
 		type: "text",
 		value: e
 	};
 }
-function ne(e) {
+function y(e) {
 	return {
 		type: "json",
 		value: e
 	};
 }
-function v(e) {
+function b(e) {
 	return Object.entries(e ?? {}).map(([e, t]) => ({
 		name: e,
 		value: t
 	}));
 }
-function re(e) {
+function x(e) {
 	switch (e.type) {
 		case "number": return {
 			type: "number",
@@ -220,31 +220,31 @@ function re(e) {
 		};
 	}
 }
-function y(e) {
-	d(f(e), "field value must be an object");
+function S(e) {
+	p(m(e), "field value must be an object");
 	let t = e.type, n = e.value;
-	if (d(typeof t == "string", "field value type must be a string"), t === "number") return d(typeof n == "number", "field number value must be a number"), {
+	if (p(typeof t == "string", "field value type must be a string"), t === "number") return p(typeof n == "number", "field number value must be a number"), {
 		type: t,
 		value: n
 	};
-	if (d(typeof n == "string", "field text/json value must be a string"), t === "text" || t === "json") return {
+	if (p(typeof n == "string", "field text/json value must be a string"), t === "text" || t === "json") return {
 		type: t,
 		value: n
 	};
 	throw Error(`unknown field value type: ${t}`);
 }
-function b(e) {
-	return e ? (Array.isArray(e) ? e : v(e)).map((e) => ({
+function C(e) {
+	return e ? (Array.isArray(e) ? e : b(e)).map((e) => ({
 		name: e.name,
-		value: re(e.value)
+		value: x(e.value)
 	})) : [];
 }
-function x(e) {
-	if (!f(e)) return {};
+function w(e) {
+	if (!m(e)) return {};
 	let t = e.values;
-	return f(t) ? Object.fromEntries(Object.entries(t).map(([e, t]) => [e, y(t)])) : {};
+	return m(t) ? Object.fromEntries(Object.entries(t).map(([e, t]) => [e, S(t)])) : {};
 }
-function S(e) {
+function T(e) {
 	switch (e.type) {
 		case "point": return { Point: {
 			lat: e.lat,
@@ -257,10 +257,10 @@ function S(e) {
 		case "string": return { String: e.value };
 	}
 }
-function C(e) {
-	if (d(f(e), "geo object must be an object"), "Point" in e) {
+function E(e) {
+	if (p(m(e), "geo object must be an object"), "Point" in e) {
 		let t = e.Point;
-		return d(f(t), "Point payload must be an object"), d(typeof t.lat == "number", "point lat must be a number"), d(typeof t.lon == "number", "point lon must be a number"), {
+		return p(m(t), "Point payload must be an object"), p(typeof t.lat == "number", "point lat must be a number"), p(typeof t.lon == "number", "point lon must be a number"), {
 			type: "point",
 			lat: t.lat,
 			lon: t.lon,
@@ -269,7 +269,7 @@ function C(e) {
 	}
 	if ("Bounds" in e) {
 		let t = e.Bounds;
-		return d(f(t), "Bounds payload must be an object"), {
+		return p(m(t), "Bounds payload must be an object"), {
 			type: "bounds",
 			bounds: {
 				min_lat: Number(t.min_lat),
@@ -279,7 +279,7 @@ function C(e) {
 			}
 		};
 	}
-	if ("Hash" in e) return d(typeof e.Hash == "string", "Hash payload must be a string"), {
+	if ("Hash" in e) return p(typeof e.Hash == "string", "Hash payload must be a string"), {
 		type: "hash",
 		value: e.Hash
 	};
@@ -287,13 +287,13 @@ function C(e) {
 		type: "geojson",
 		value: e.GeoJson
 	};
-	if ("String" in e) return d(typeof e.String == "string", "String payload must be a string"), {
+	if ("String" in e) return p(typeof e.String == "string", "String payload must be a string"), {
 		type: "string",
 		value: e.String
 	};
 	throw Error("unknown geo object shape");
 }
-function w(e) {
+function D(e) {
 	switch (e.type) {
 		case "circle": return { Circle: {
 			lat: e.lat,
@@ -322,10 +322,10 @@ function w(e) {
 		} };
 	}
 }
-function T(e) {
-	if (d(f(e), "area must be an object"), "Circle" in e) {
+function O(e) {
+	if (p(m(e), "area must be an object"), "Circle" in e) {
 		let t = e.Circle;
-		return d(f(t), "Circle payload must be an object"), d(typeof t.lat == "number", "circle lat must be a number"), d(typeof t.lon == "number", "circle lon must be a number"), d(typeof t.meters == "number", "circle meters must be a number"), {
+		return p(m(t), "Circle payload must be an object"), p(typeof t.lat == "number", "circle lat must be a number"), p(typeof t.lon == "number", "circle lon must be a number"), p(typeof t.meters == "number", "circle meters must be a number"), {
 			type: "circle",
 			lat: t.lat,
 			lon: t.lon,
@@ -334,7 +334,7 @@ function T(e) {
 	}
 	if ("Bounds" in e) {
 		let t = e.Bounds;
-		return d(f(t), "Bounds payload must be an object"), {
+		return p(m(t), "Bounds payload must be an object"), {
 			type: "bounds",
 			bounds: {
 				min_lat: Number(t.min_lat),
@@ -344,7 +344,7 @@ function T(e) {
 			}
 		};
 	}
-	if ("Hash" in e) return d(typeof e.Hash == "string", "Hash payload must be a string"), {
+	if ("Hash" in e) return p(typeof e.Hash == "string", "Hash payload must be a string"), {
 		type: "hash",
 		value: e.Hash
 	};
@@ -354,20 +354,20 @@ function T(e) {
 	};
 	if ("Tile" in e) {
 		let t = e.Tile;
-		return d(f(t), "Tile payload must be an object"), d(typeof t.x == "number", "tile x must be a number"), d(typeof t.y == "number", "tile y must be a number"), d(typeof t.z == "number", "tile z must be a number"), {
+		return p(m(t), "Tile payload must be an object"), p(typeof t.x == "number", "tile x must be a number"), p(typeof t.y == "number", "tile y must be a number"), p(typeof t.z == "number", "tile z must be a number"), {
 			type: "tile",
 			x: t.x,
 			y: t.y,
 			z: t.z
 		};
 	}
-	if ("Quadkey" in e) return d(typeof e.Quadkey == "string", "Quadkey payload must be a string"), {
+	if ("Quadkey" in e) return p(typeof e.Quadkey == "string", "Quadkey payload must be a string"), {
 		type: "quadkey",
 		value: e.Quadkey
 	};
 	if ("Sector" in e) {
 		let t = e.Sector;
-		return d(f(t), "Sector payload must be an object"), d(typeof t.lat == "number", "sector lat must be a number"), d(typeof t.lon == "number", "sector lon must be a number"), d(typeof t.meters == "number", "sector meters must be a number"), d(typeof t.bearing1 == "number", "sector bearing1 must be a number"), d(typeof t.bearing2 == "number", "sector bearing2 must be a number"), {
+		return p(m(t), "Sector payload must be an object"), p(typeof t.lat == "number", "sector lat must be a number"), p(typeof t.lon == "number", "sector lon must be a number"), p(typeof t.meters == "number", "sector meters must be a number"), p(typeof t.bearing1 == "number", "sector bearing1 must be a number"), p(typeof t.bearing2 == "number", "sector bearing2 must be a number"), {
 			type: "sector",
 			lat: t.lat,
 			lon: t.lon,
@@ -378,7 +378,7 @@ function T(e) {
 	}
 	if ("Reference" in e) {
 		let t = e.Reference;
-		return d(f(t), "Reference payload must be an object"), d(typeof t.collection == "string", "reference collection must be a string"), d(typeof t.id == "string", "reference id must be a string"), {
+		return p(m(t), "Reference payload must be an object"), p(typeof t.collection == "string", "reference collection must be a string"), p(typeof t.id == "string", "reference id must be a string"), {
 			type: "reference",
 			collection: t.collection,
 			id: t.id
@@ -386,7 +386,7 @@ function T(e) {
 	}
 	throw Error("unknown area shape");
 }
-function E(e) {
+function re(e) {
 	return e === "desc" ? "Desc" : "Asc";
 }
 function ie(e) {
@@ -402,46 +402,49 @@ function ae(e) {
 		case "regex": return { Regex: e.value };
 	}
 }
-function D(e) {
+function k(e) {
 	let t = e ?? {};
 	return {
 		cursor: t.cursor ?? 0,
 		limit: t.limit ?? 100,
 		nofields: t.nofields ?? !1,
 		match_pattern: t.matchPattern ?? null,
-		sort: E(t.sort),
+		sort: re(t.sort),
 		where_filters: (t.whereFilters ?? []).map((e) => ({
 			field: e.field,
 			comparison: ae(e.comparison)
 		})),
-		where_in_filters: t.whereInFilters ?? [],
-		where_expr_filters: t.whereExprFilters ?? [],
+		where_in_filters: (t.whereInFilters ?? []).map((e) => ({
+			field: e.field,
+			values: e.values
+		})),
+		where_expr_filters: (t.whereExprFilters ?? []).map((e) => ({ expression: e.expression })),
 		clip: t.clip ?? !1,
 		output: ie(t.output)
 	};
 }
 function oe(e) {
-	return e == null ? null : (d(f(e), "object response must be an object"), d(typeof e.id == "string", "object id must be a string"), {
+	return e == null ? null : (p(m(e), "object response must be an object"), p(typeof e.id == "string", "object id must be a string"), {
 		id: e.id,
-		geo: C(e.geo),
-		fields: x(e.fields),
+		geo: E(e.geo),
+		fields: w(e.fields),
 		expires_at: typeof e.expires_at == "number" ? e.expires_at : null
 	});
 }
-function O(e) {
-	return d(f(e), "search results must be an object"), d(Array.isArray(e.results), "search results array is missing"), {
-		results: e.results.map((e) => (d(f(e), "search result item must be an object"), d(typeof e.id == "string", "search result id must be a string"), {
+function A(e) {
+	return p(m(e), "search results must be an object"), p(Array.isArray(e.results), "search results array is missing"), {
+		results: e.results.map((e) => (p(m(e), "search result item must be an object"), p(typeof e.id == "string", "search result id must be a string"), {
 			id: e.id,
-			object: e.object === null || e.object === void 0 ? void 0 : C(e.object),
-			fields: e.fields === null || e.fields === void 0 ? void 0 : x(e.fields),
+			object: e.object === null || e.object === void 0 ? void 0 : E(e.object),
+			fields: e.fields === null || e.fields === void 0 ? void 0 : w(e.fields),
 			distance_meters: typeof e.distance_meters == "number" ? e.distance_meters : null
 		})),
 		cursor: Number(e.cursor ?? 0),
 		count: Number(e.count ?? 0)
 	};
 }
-function k(e) {
-	return d(f(e), "server info must be an object"), {
+function j(e) {
+	return p(m(e), "server info must be an object"), {
 		version: typeof e.version == "string" ? e.version : "",
 		api_version: typeof e.api_version == "string" ? e.api_version : "",
 		protocol_version: typeof e.protocol_version == "string" ? e.protocol_version : "",
@@ -461,7 +464,7 @@ function k(e) {
 }
 //#endregion
 //#region src/types/events.ts
-function A(e) {
+function M(e) {
 	switch (e) {
 		case "set": return "Set";
 		case "del": return "Del";
@@ -469,7 +472,7 @@ function A(e) {
 		case "fset": return "Fset";
 	}
 }
-function j(e) {
+function N(e) {
 	switch (e) {
 		case "inside": return "Inside";
 		case "outside": return "Outside";
@@ -479,7 +482,7 @@ function j(e) {
 		case "roam": return "Roam";
 	}
 }
-function M(e) {
+function P(e) {
 	switch (e) {
 		case "Set":
 		case "set": return "set";
@@ -492,7 +495,7 @@ function M(e) {
 		default: throw Error(`unknown mutation command: ${String(e)}`);
 	}
 }
-function N(e) {
+function F(e) {
 	switch (e) {
 		case "Inside":
 		case "inside": return "inside";
@@ -509,129 +512,129 @@ function N(e) {
 		default: throw Error(`unknown detect type: ${String(e)}`);
 	}
 }
-function P(e) {
+function I(e) {
 	switch (e.type) {
 		case "nearby": return { Nearby: {
 			lat: e.lat,
 			lon: e.lon,
 			meters: e.meters,
-			options: D(e.options)
+			options: k(e.options)
 		} };
 		case "within": return { Within: {
-			area: w(e.area),
-			options: D(e.options)
+			area: D(e.area),
+			options: k(e.options)
 		} };
 		case "intersects": return { Intersects: {
-			area: w(e.area),
-			options: D(e.options)
+			area: D(e.area),
+			options: k(e.options)
 		} };
 		case "roam": return { Roam: {
 			target_collection: e.targetCollection,
 			target_pattern: e.targetPattern,
 			meters: e.meters,
-			options: D(e.options),
+			options: k(e.options),
 			nodwell: e.nodwell ?? !1
 		} };
 	}
 }
-function F(e) {
+function L(e) {
 	return {
 		collection: e.collection,
-		query: P(e.query),
-		detect: e.detect.map(j),
-		commands: e.commands.map(A)
+		query: I(e.query),
+		detect: e.detect.map(N),
+		commands: e.commands.map(M)
 	};
 }
-function I(e) {
-	return d(Array.isArray(e), "hooks response must be an array"), e.map((e) => (d(f(e), "hook info must be an object"), d(typeof e.name == "string", "hook name must be a string"), d(typeof e.endpoint == "string", "hook endpoint must be a string"), d(typeof e.collection == "string", "hook collection must be a string"), {
+function R(e) {
+	return p(Array.isArray(e), "hooks response must be an array"), e.map((e) => (p(m(e), "hook info must be an object"), p(typeof e.name == "string", "hook name must be a string"), p(typeof e.endpoint == "string", "hook endpoint must be a string"), p(typeof e.collection == "string", "hook collection must be a string"), {
 		name: e.name,
 		endpoint: e.endpoint,
 		collection: e.collection
 	}));
 }
-function L(e) {
-	return d(f(e), "channel definition must be an object"), d(typeof e.name == "string", "channel name must be a string"), {
+function z(e) {
+	return p(m(e), "channel definition must be an object"), p(typeof e.name == "string", "channel name must be a string"), {
 		name: e.name,
-		def: B(e.def)
+		def: H(e.def)
 	};
 }
-function R(e) {
-	return d(f(e), "hook definition must be an object"), d(typeof e.name == "string", "hook name must be a string"), d(typeof e.endpoint == "string", "hook endpoint must be a string"), {
+function B(e) {
+	return p(m(e), "hook definition must be an object"), p(typeof e.name == "string", "hook name must be a string"), p(typeof e.endpoint == "string", "hook endpoint must be a string"), {
 		name: e.name,
 		endpoint: e.endpoint,
-		def: B(e.def)
+		def: H(e.def)
 	};
 }
-function z(e) {
-	return d(f(e), "geofence event must be an object"), d(typeof e.collection == "string", "event collection missing"), d(typeof e.id == "string", "event id missing"), d(typeof e.timestamp_ns == "number", "timestamp missing"), {
-		command: M(e.command),
-		detect: N(e.detect),
+function V(e) {
+	return p(m(e), "geofence event must be an object"), p(typeof e.collection == "string", "event collection missing"), p(typeof e.id == "string", "event id missing"), p(typeof e.timestamp_ns == "number", "timestamp missing"), {
+		command: P(e.command),
+		detect: F(e.detect),
 		collection: e.collection,
 		id: e.id,
-		object: C(e.object),
-		fields: x(e.fields),
+		object: E(e.object),
+		fields: w(e.fields),
 		timestamp_ns: e.timestamp_ns,
 		event_id: typeof e.event_id == "string" ? e.event_id : null,
 		job_id: typeof e.job_id == "string" ? e.job_id : null,
 		hook: typeof e.hook == "string" ? e.hook : null,
 		group: typeof e.group == "string" ? e.group : null,
-		nearby: f(e.nearby) && typeof e.nearby.collection == "string" && typeof e.nearby.id == "string" && typeof e.nearby.meters == "number" ? {
+		nearby: m(e.nearby) && typeof e.nearby.collection == "string" && typeof e.nearby.id == "string" && typeof e.nearby.meters == "number" ? {
 			collection: e.nearby.collection,
 			id: e.nearby.id,
 			meters: e.nearby.meters
 		} : null
 	};
 }
-function B(e) {
-	return d(f(e), "geofence definition must be an object"), d(typeof e.collection == "string", "geofence collection must be a string"), d(Array.isArray(e.detect), "geofence detect must be an array"), d(Array.isArray(e.commands), "geofence commands must be an array"), {
+function H(e) {
+	return p(m(e), "geofence definition must be an object"), p(typeof e.collection == "string", "geofence collection must be a string"), p(Array.isArray(e.detect), "geofence detect must be an array"), p(Array.isArray(e.commands), "geofence commands must be an array"), {
 		collection: e.collection,
-		query: V(e.query),
-		detect: e.detect.map(N),
-		commands: e.commands.map(M)
+		query: U(e.query),
+		detect: e.detect.map(F),
+		commands: e.commands.map(P)
 	};
 }
-function V(e) {
-	if (d(f(e), "geofence query must be an object"), "Nearby" in e) {
+function U(e) {
+	if (p(m(e), "geofence query must be an object"), "Nearby" in e) {
 		let t = e.Nearby;
-		return d(f(t), "Nearby payload must be an object"), d(typeof t.lat == "number", "nearby lat must be a number"), d(typeof t.lon == "number", "nearby lon must be a number"), d(typeof t.meters == "number", "nearby meters must be a number"), {
+		return p(m(t), "Nearby payload must be an object"), p(typeof t.lat == "number", "nearby lat must be a number"), p(typeof t.lon == "number", "nearby lon must be a number"), p(typeof t.meters == "number", "nearby meters must be a number"), {
 			type: "nearby",
 			lat: t.lat,
 			lon: t.lon,
 			meters: t.meters,
-			options: H(t.options)
+			options: W(t.options)
 		};
 	}
 	if ("Within" in e) {
 		let t = e.Within;
-		return d(f(t), "Within payload must be an object"), {
+		return p(m(t), "Within payload must be an object"), {
 			type: "within",
-			area: T(t.area),
-			options: H(t.options)
+			area: O(t.area),
+			options: W(t.options)
 		};
 	}
 	if ("Intersects" in e) {
 		let t = e.Intersects;
-		return d(f(t), "Intersects payload must be an object"), {
+		return p(m(t), "Intersects payload must be an object"), {
 			type: "intersects",
-			area: T(t.area),
-			options: H(t.options)
+			area: O(t.area),
+			options: W(t.options)
 		};
 	}
 	if ("Roam" in e) {
 		let t = e.Roam;
-		return d(f(t), "Roam payload must be an object"), d(typeof t.target_collection == "string", "roam target_collection must be a string"), d(typeof t.target_pattern == "string", "roam target_pattern must be a string"), d(typeof t.meters == "number", "roam meters must be a number"), {
+		return p(m(t), "Roam payload must be an object"), p(typeof t.target_collection == "string", "roam target_collection must be a string"), p(typeof t.target_pattern == "string", "roam target_pattern must be a string"), p(typeof t.meters == "number", "roam meters must be a number"), {
 			type: "roam",
 			targetCollection: t.target_collection,
 			targetPattern: t.target_pattern,
 			meters: t.meters,
-			options: H(t.options),
+			options: W(t.options),
 			nodwell: typeof t.nodwell == "boolean" ? t.nodwell : void 0
 		};
 	}
 	throw Error("unknown geofence query shape");
 }
-function H(e) {
-	if (!f(e)) return;
+function W(e) {
+	if (!m(e)) return;
 	let t = typeof e.limit == "number" ? e.limit : void 0, n = typeof e.cursor == "number" ? e.cursor : void 0, r = typeof e.nofields == "boolean" ? e.nofields : void 0, i = typeof e.match_pattern == "string" ? e.match_pattern : void 0, a = typeof e.clip == "boolean" ? e.clip : void 0, o;
 	return e.sort === "Desc" ? o = "desc" : e.sort === "Asc" && (o = "asc"), {
 		cursor: n,
@@ -644,40 +647,40 @@ function H(e) {
 }
 //#endregion
 //#region src/internal/response-parsers.ts
-function U(t) {
+function G(t) {
 	if (t && typeof t == "object" && "collections" in t && Array.isArray(t.collections)) return t.collections.filter((e) => typeof e == "string");
 	throw new e("invalid collections response");
 }
-function W(t) {
+function K(t) {
 	if (t && typeof t == "object" && "channels" in t && Array.isArray(t.channels)) return t.channels.filter((e) => typeof e == "string");
 	throw new e("invalid channels response");
 }
-function G(t) {
+function q(t) {
 	if (!Array.isArray(t)) throw new e("invalid stats response");
 	return t;
 }
-function K(t) {
+function se(t) {
 	if (!t || typeof t != "object" || !("server" in t)) throw new e("invalid info response");
 	let n = t;
 	return {
-		server: k(n.server),
+		server: j(n.server),
 		metrics: n.metrics && typeof n.metrics == "object" ? n.metrics : void 0,
 		section: typeof n.section == "string" ? n.section : void 0
 	};
 }
-function q(t) {
+function ce(t) {
 	if (t && typeof t == "object" && "bounds" in t && t.bounds && typeof t.bounds == "object") return t.bounds;
 	throw new e("invalid bounds response");
 }
-function se(t) {
+function le(t) {
 	if (!t || typeof t != "object" || !("name" in t) || typeof t.name != "string" || !("stats" in t) || !t.stats || typeof t.stats != "object") throw new e("invalid collection info response");
 	return t;
 }
-function ce(t) {
+function ue(t) {
 	if (!t || typeof t != "object") throw new e("invalid webhook queue response");
 	return t;
 }
-function le(t) {
+function de(t) {
 	if (!t || typeof t != "object") throw new e("invalid compaction response");
 	return t;
 }
@@ -685,41 +688,41 @@ function J(t) {
 	if (!t || typeof t != "object" || !("deleted" in t)) throw new e("invalid delete response");
 	return !!t.deleted;
 }
-function ue(t) {
+function fe(t) {
 	if (!t || typeof t != "object" || !("deleted" in t)) throw new e("invalid delete response");
 	return Number(t.deleted ?? 0);
 }
-function de(t) {
+function pe(t) {
 	if (!t || typeof t != "object" || !("stored" in t)) throw new e("invalid set response");
 	return !!t.stored;
 }
-function fe(t) {
+function me(t) {
 	if (!t || typeof t != "object" || !("updated" in t)) throw new e("invalid update response");
 	return !!t.updated;
 }
-function pe(t) {
+function he(t) {
 	if (!t || typeof t != "object" || !("renamed" in t)) throw new e("invalid rename response");
 	return !!t.renamed;
 }
-function me(t) {
+function ge(t) {
 	if (!t || typeof t != "object" || !("dropped" in t)) throw new e("invalid drop response");
 	return !!t.dropped;
 }
-function he(e) {
+function _e(e) {
 	if (e === null) return null;
-	if (e && typeof e == "object" && "type" in e) return y(e);
+	if (e && typeof e == "object" && "type" in e) return S(e);
 	if (e && typeof e == "object" && "value" in e) {
 		let t = e.value;
-		return t == null ? null : y(t);
+		return t == null ? null : S(t);
 	}
-	return y(e);
+	return S(e);
 }
-function ge(t) {
+function ve(t) {
 	if (!t || typeof t != "object" || !("ttl" in t)) throw new e("invalid ttl response");
 	let n = t.ttl;
 	return typeof n == "number" ? n : null;
 }
-function _e(e) {
+function ye(e) {
 	if (e === null) return null;
 	let t = e && typeof e == "object" && "value" in e ? e.value : e;
 	if (t == null) return null;
@@ -734,23 +737,23 @@ function Y(t, n) {
 	if (!t || typeof t != "object" || !(n in t)) throw new e(`invalid ${n} response`);
 	return !!t[n];
 }
-function ve(t) {
+function be(t) {
 	if (!t || typeof t != "object" || !("seconds" in t)) throw new e("invalid timeout response");
 	let n = t.seconds;
 	return typeof n == "number" ? n : null;
 }
-function ye(e) {
-	return L(e);
+function xe(e) {
+	return z(e);
 }
-function X(e) {
-	return R(e);
+function Se(e) {
+	return B(e);
 }
-function be(e) {
-	return I(e);
+function Ce(e) {
+	return R(e);
 }
 //#endregion
 //#region src/routing/read-preference.ts
-function xe(e, t, n) {
+function X(e, t, n) {
 	let r = e.filter((e) => e.eligible).map((e) => e.url);
 	if (r.length === 0) return [];
 	if (t === "roundRobinFollowers") {
@@ -761,7 +764,7 @@ function xe(e, t, n) {
 }
 //#endregion
 //#region src/routing/replicas.ts
-var Se = class {
+var we = class {
 	leaderUrl;
 	readReplicas;
 	readPreference;
@@ -775,7 +778,7 @@ var Se = class {
 		return this.leaderUrl;
 	}
 	async getReadCandidates(e) {
-		let t = xe(await Promise.all(this.readReplicas.map(async (t) => ({
+		let t = X(await Promise.all(this.readReplicas.map(async (t) => ({
 			url: t,
 			eligible: await this.isEligibleReplica(t, e)
 		}))), this.readPreference, this.roundRobinCursor);
@@ -790,8 +793,8 @@ var Se = class {
 		try {
 			let r = await t.request({
 				baseUrl: e,
-				path: s.server(),
-				parser: k
+				path: l.server(),
+				parser: j
 			});
 			return this.statusCache.set(e, {
 				expiresAt: n + this.statusTtlMs,
@@ -801,7 +804,7 @@ var Se = class {
 			return this.statusCache.set(e, { expiresAt: n + this.statusTtlMs }), !1;
 		}
 	}
-}, Ce = class {
+}, Te = class {
 	values = [];
 	resolvers = [];
 	closed = !1;
@@ -836,7 +839,7 @@ var Se = class {
 		});
 	}
 }, Z = class {
-	events = new Ce();
+	events = new Te();
 	eventHandlers = /* @__PURE__ */ new Set();
 	closeHandlers = /* @__PURE__ */ new Set();
 	errorHandlers = /* @__PURE__ */ new Set();
@@ -972,7 +975,7 @@ var Se = class {
 	}
 	tryParseEvent(e) {
 		try {
-			return z(e);
+			return V(e);
 		} catch {
 			return null;
 		}
@@ -980,32 +983,32 @@ var Se = class {
 };
 //#endregion
 //#region src/client.ts
-function we(e) {
+function Ee(e) {
 	switch (e) {
 		case "nx": return "Nx";
 		case "xx": return "Xx";
 		default: return "Always";
 	}
 }
-function Te(e) {
+function De(e) {
 	return !e || e === "objects" ? { format: "objects" } : e === "points" || e === "bounds" ? { format: e } : "hashes" in e ? {
 		format: "hashes",
 		hash_precision: e.hashes.precision
 	} : { format: "objects" };
 }
-var Ee = class {
+var Oe = class {
 	transport;
 	replicaRouter;
 	token;
 	webSocketFactory;
 	constructor(e) {
-		this.transport = new u({
+		this.transport = new f({
 			baseUrl: e.leaderUrl,
 			token: e.token,
 			timeoutMs: e.timeoutMs,
 			headers: e.headers,
 			fetch: e.fetch
-		}), this.replicaRouter = new Se({
+		}), this.replicaRouter = new we({
 			leaderUrl: e.leaderUrl,
 			readReplicas: e.readReplicas,
 			readPreference: e.readPreference,
@@ -1014,49 +1017,49 @@ var Ee = class {
 	}
 	async ping() {
 		return this.requestLeader({
-			path: s.ping(),
+			path: l.ping(),
 			parser: (e) => e
 		});
 	}
 	async healthz() {
 		return this.requestLeader({
-			path: s.healthz(),
+			path: l.healthz(),
 			parser: (e) => e
 		});
 	}
 	async server() {
 		return this.requestLeader({
-			path: s.server(),
-			parser: k
+			path: l.server(),
+			parser: j
 		});
 	}
 	async info(e) {
 		return this.requestLeader({
-			path: s.info(e),
-			parser: K
+			path: l.info(e),
+			parser: se
 		});
 	}
 	async metrics() {
-		return this.transport.requestText({ path: s.metrics() });
+		return this.transport.requestText({ path: l.metrics() });
 	}
 	async collections(e) {
 		return this.requestRead({
-			path: s.collections(e),
-			parser: U
+			path: l.collections(e),
+			parser: G
 		});
 	}
 	async createCollection(e) {
 		return this.requestWrite({
 			method: "POST",
-			path: s.collection(e),
+			path: l.collection(e),
 			parser: (e) => Y(e, "created")
 		});
 	}
 	async getCollection(e) {
 		try {
 			return await this.requestRead({
-				path: s.collection(e),
-				parser: se
+				path: l.collection(e),
+				parser: le
 			});
 		} catch (e) {
 			if (e instanceof n && e.status === 404) return null;
@@ -1066,88 +1069,93 @@ var Ee = class {
 	async rename(e, t, n) {
 		return this.requestWrite({
 			method: "POST",
-			path: s.renameCollection(e),
+			path: l.renameCollection(e),
 			body: {
 				new_name: t,
 				nx: n?.nx ?? !1
 			},
-			parser: pe
+			parser: he
 		});
 	}
 	async bounds(e) {
 		return this.requestRead({
-			path: s.bounds(e),
-			parser: q
+			path: l.bounds(e),
+			parser: ce
 		});
 	}
 	async stats(e) {
 		return this.requestRead({
-			path: s.stats(e),
-			parser: G
+			path: l.stats(e),
+			parser: q
 		});
 	}
 	async setObject(e, t, n, r) {
 		return this.requestWrite({
 			method: "POST",
-			path: s.object(e, t),
+			path: l.object(e, t),
 			body: {
-				object: S(n),
-				fields: b(r?.fields),
+				object: T(n),
+				fields: C(r?.fields),
 				expire_seconds: r?.expireSeconds,
-				condition: we(r?.condition)
+				condition: Ee(r?.condition)
 			},
-			parser: de
+			parser: pe
 		});
 	}
 	async setPoint(e, t, n, r) {
-		return this.setObject(e, t, p(n.lat, n.lon, n.z), r);
+		return this.setObject(e, t, h(n.lat, n.lon, n.z), r);
 	}
-	async get(e, t, n) {
-		let r = Te(n?.format);
-		return this.requestRead({
-			path: `${s.object(e, t)}${De({
-				with_fields: n?.withFields ?? !1,
-				format: r.format,
-				hash_precision: r.hash_precision
-			})}`,
-			parser: oe
-		});
+	async get(e, t, r) {
+		let i = De(r?.format);
+		try {
+			return await this.requestRead({
+				path: `${l.object(e, t)}${ke({
+					with_fields: r?.withFields ?? !1,
+					format: i.format,
+					hash_precision: i.hash_precision
+				})}`,
+				parser: oe
+			});
+		} catch (e) {
+			if (e instanceof n && e.status === 404) return null;
+			throw e;
+		}
 	}
 	async delete(e, t) {
 		return this.requestWrite({
 			method: "DELETE",
-			path: s.object(e, t),
+			path: l.object(e, t),
 			parser: J
 		});
 	}
 	async deleteMatching(e, t) {
 		return this.requestWrite({
 			method: "DELETE",
-			path: s.objects(e, t?.matchPattern),
-			parser: ue
+			path: l.objects(e, t?.matchPattern),
+			parser: fe
 		});
 	}
 	async setFields(e, t, n, r) {
 		return this.requestWrite({
 			method: "POST",
-			path: s.fields(e, t),
+			path: l.fields(e, t),
 			body: {
-				fields: b(n),
+				fields: C(n),
 				xx: r?.xx ?? !1
 			},
-			parser: fe
+			parser: me
 		});
 	}
 	async getField(e, t, n) {
 		return this.requestRead({
-			path: s.field(e, t, n),
-			parser: he
+			path: l.field(e, t, n),
+			parser: _e
 		});
 	}
 	async expire(e, t, n) {
 		await this.requestWrite({
 			method: "POST",
-			path: s.expire(e, t),
+			path: l.expire(e, t),
 			body: { seconds: n },
 			parser: () => void 0
 		});
@@ -1155,20 +1163,20 @@ var Ee = class {
 	async persist(e, t) {
 		await this.requestWrite({
 			method: "DELETE",
-			path: s.expire(e, t),
+			path: l.expire(e, t),
 			parser: () => void 0
 		});
 	}
 	async ttl(e, t) {
 		return this.requestRead({
-			path: s.ttl(e, t),
-			parser: ge
+			path: l.ttl(e, t),
+			parser: ve
 		});
 	}
 	async setJson(e, t, n, r, i) {
 		await this.requestWrite({
 			method: "POST",
-			path: s.jsonRoot(e, t),
+			path: l.jsonRoot(e, t),
 			body: {
 				path: n,
 				value: r,
@@ -1179,75 +1187,75 @@ var Ee = class {
 	}
 	async getJson(e, t, n) {
 		return this.requestRead({
-			path: s.jsonPath(e, t, n),
-			parser: _e
+			path: l.jsonPath(e, t, n),
+			parser: ye
 		});
 	}
 	async deleteJson(e, t, n) {
 		return this.requestWrite({
 			method: "DELETE",
-			path: s.jsonPath(e, t, n),
+			path: l.jsonPath(e, t, n),
 			parser: (e) => Y(e, "deleted")
 		});
 	}
 	async nearby(e, t) {
 		return this.requestRead({
 			method: "POST",
-			path: s.nearby(e),
+			path: l.nearby(e),
 			body: {
 				lat: t.lat,
 				lon: t.lon,
 				meters: t.meters,
-				options: D(t.options)
+				options: k(t.options)
 			},
-			parser: O
+			parser: A
 		});
 	}
 	async within(e, t) {
 		return this.requestRead({
 			method: "POST",
-			path: s.within(e),
+			path: l.within(e),
 			body: {
-				area: w(t.area),
-				options: D(t.options)
+				area: D(t.area),
+				options: k(t.options)
 			},
-			parser: O
+			parser: A
 		});
 	}
 	async intersects(e, t) {
 		return this.requestRead({
 			method: "POST",
-			path: s.intersects(e),
+			path: l.intersects(e),
 			body: {
-				area: w(t.area),
-				options: D(t.options)
+				area: D(t.area),
+				options: k(t.options)
 			},
-			parser: O
+			parser: A
 		});
 	}
 	async scan(e, t) {
 		return this.requestRead({
 			method: "POST",
-			path: s.scan(e),
-			body: D(t),
-			parser: O
+			path: l.scan(e),
+			body: k(t),
+			parser: A
 		});
 	}
 	async search(e, t) {
 		return this.requestRead({
 			method: "POST",
-			path: s.search(e),
-			body: D(t),
-			parser: O
+			path: l.search(e),
+			body: k(t),
+			parser: A
 		});
 	}
 	async setChannel(t) {
 		return this.requestWrite({
 			method: "POST",
-			path: s.channels(),
+			path: l.channels(),
 			body: {
 				name: t.name,
-				def: F(t.def)
+				def: L(t.def)
 			},
 			parser: (t) => {
 				if (!t || typeof t != "object" || !("name" in t)) throw new e("invalid set channel response");
@@ -1258,21 +1266,21 @@ var Ee = class {
 	async deleteChannel(e) {
 		return this.requestWrite({
 			method: "DELETE",
-			path: s.channel(e),
+			path: l.channel(e),
 			parser: J
 		});
 	}
 	async channels(e) {
 		return this.requestRead({
-			path: s.channels(e),
-			parser: W
+			path: l.channels(e),
+			parser: K
 		});
 	}
 	async getChannel(e) {
 		try {
 			return await this.requestRead({
-				path: s.channel(e),
-				parser: ye
+				path: l.channel(e),
+				parser: xe
 			});
 		} catch (e) {
 			if (e instanceof n && e.status === 404) return null;
@@ -1282,11 +1290,11 @@ var Ee = class {
 	async setHook(e) {
 		await this.requestWrite({
 			method: "POST",
-			path: s.hooks(),
+			path: l.hooks(),
 			body: {
 				name: e.name,
 				endpoint: e.endpoint,
-				def: F(e.def)
+				def: L(e.def)
 			},
 			parser: () => void 0
 		});
@@ -1294,21 +1302,21 @@ var Ee = class {
 	async deleteHook(e) {
 		return this.requestWrite({
 			method: "DELETE",
-			path: s.hook(e),
+			path: l.hook(e),
 			parser: J
 		});
 	}
 	async hooks(e) {
 		return this.requestRead({
-			path: s.hooks(e),
-			parser: be
+			path: l.hooks(e),
+			parser: Ce
 		});
 	}
 	async getHook(e) {
 		try {
 			return await this.requestRead({
-				path: s.hook(e),
-				parser: X
+				path: l.hook(e),
+				parser: Se
 			});
 		} catch (e) {
 			if (e instanceof n && e.status === 404) return null;
@@ -1317,7 +1325,7 @@ var Ee = class {
 	}
 	async configGet(t) {
 		return this.requestLeader({
-			path: s.config(t),
+			path: l.config(t),
 			parser: (t) => {
 				if (!t || typeof t != "object" || !("value" in t)) throw new e("invalid config response");
 				return String(t.value ?? "");
@@ -1327,7 +1335,7 @@ var Ee = class {
 	async configSet(e, t) {
 		await this.requestWrite({
 			method: "POST",
-			path: s.config(e),
+			path: l.config(e),
 			body: { value: t },
 			parser: () => void 0
 		});
@@ -1335,41 +1343,41 @@ var Ee = class {
 	async configRewrite() {
 		await this.requestWrite({
 			method: "POST",
-			path: s.configRewrite(),
+			path: l.configRewrite(),
 			parser: () => void 0
 		});
 	}
 	async flushdb() {
 		await this.requestWrite({
 			method: "POST",
-			path: s.flushdb(),
+			path: l.flushdb(),
 			parser: () => void 0
 		});
 	}
 	async gc() {
 		await this.requestWrite({
 			method: "POST",
-			path: s.gc(),
+			path: l.gc(),
 			parser: () => void 0
 		});
 	}
 	async aofshrink() {
 		return this.requestWrite({
 			method: "POST",
-			path: s.aofshrink(),
-			parser: le
+			path: l.aofshrink(),
+			parser: de
 		});
 	}
 	async webhookQueue() {
 		return this.requestLeader({
-			path: s.webhookQueue(),
-			parser: ce
+			path: l.webhookQueue(),
+			parser: ue
 		});
 	}
 	async readonly(t) {
 		return this.requestWrite({
 			method: "POST",
-			path: s.readonly(),
+			path: l.readonly(),
 			body: { enabled: t },
 			parser: (t) => {
 				if (!t || typeof t != "object" || !("read_only" in t)) throw new e("invalid readonly response");
@@ -1380,21 +1388,21 @@ var Ee = class {
 	async timeout(e) {
 		return this.requestWrite({
 			method: "POST",
-			path: s.timeout(),
+			path: l.timeout(),
 			body: e,
-			parser: ve
+			parser: be
 		});
 	}
 	async dropCollection(e) {
 		return this.requestWrite({
 			method: "DELETE",
-			path: s.collection(e),
-			parser: me
+			path: l.collection(e),
+			parser: ge
 		});
 	}
 	async connectWebSocket(e) {
 		return Q.connect({
-			url: e?.url ?? Oe(this.replicaRouter.getLeaderUrl()),
+			url: e?.url ?? Ae(this.replicaRouter.getLeaderUrl()),
 			token: this.token,
 			webSocketFactory: this.webSocketFactory
 		});
@@ -1437,17 +1445,17 @@ var Ee = class {
 	}
 };
 function $(e) {
-	return e instanceof i || e instanceof t || !(e instanceof n);
+	return e instanceof o || e instanceof t || !(e instanceof n);
 }
-function De(e) {
+function ke(e) {
 	let t = new URLSearchParams();
 	for (let [n, r] of Object.entries(e)) r !== void 0 && t.set(n, String(r));
 	let n = t.toString();
 	return n ? `?${n}` : "";
 }
-function Oe(e) {
+function Ae(e) {
 	let t = new URL(e);
-	return t.protocol = t.protocol === "https:" ? "wss:" : "ws:", t.pathname = s.ws(), t.search = "", t.hash = "", t.toString();
+	return t.protocol = t.protocol === "https:" ? "wss:" : "ws:", t.pathname = l.ws(), t.search = "", t.hash = "", t.toString();
 }
 //#endregion
-export { r as AuthError, n as HttpError, Ee as LatLngClient, e as LatLngError, Z as LatLngSubscription, Q as LatLngWebSocketClient, i as ServerUnavailableError, t as TimeoutError, ee as bounds, v as fieldEntries, h as geojson, m as hash, ne as jsonField, _ as numberField, z as parseGeofenceEvent, p as point, g as stringObject, te as textField };
+export { r as AuthError, i as BadRequestError, n as HttpError, Oe as LatLngClient, e as LatLngError, Z as LatLngSubscription, Q as LatLngWebSocketClient, a as NotFoundError, o as ServerUnavailableError, t as TimeoutError, g as bounds, b as fieldEntries, v as geojson, _ as hash, y as jsonField, te as numberField, V as parseGeofenceEvent, h as point, ee as stringObject, ne as textField };