@alphacharts/drawings 0.1.0 → 0.1.1

package/dist/index.js

@@ -303,13 +303,13 @@ function S(e, r) {
 	}
 	return a;
 }
-var se = /* @__PURE__ */ new Map();
-function ce(e, t) {
-	let n = t ?? e.fontSize, r = `${e.italic ? "i" : ""}${e.bold ? "b" : ""}${n}`, i = se.get(r);
-	return i === void 0 && (se.size > 512 && se.clear(), i = `${e.italic ? "italic " : ""}${e.bold ? "bold " : ""}${n}px system-ui, -apple-system, 'Segoe UI', Roboto, sans-serif`, se.set(r, i)), i;
+var C = /* @__PURE__ */ new Map();
+function se(e, t) {
+	let n = t ?? e.fontSize, r = `${e.italic ? "i" : ""}${e.bold ? "b" : ""}${n}`, i = C.get(r);
+	return i === void 0 && (C.size > 512 && C.clear(), i = `${e.italic ? "italic " : ""}${e.bold ? "bold " : ""}${n}px system-ui, -apple-system, 'Segoe UI', Roboto, sans-serif`, C.set(r, i)), i;
 }
-function le(e, t, n) {
-	let r = e.size ?? t.fontSize, i = e.pad ?? (e.bg || e.border ? 4 : 0), a = ce(t, r), o, s;
+function ce(e, t, n) {
+	let r = e.size ?? t.fontSize, i = e.pad ?? (e.bg || e.border ? 4 : 0), a = se(t, r), o, s;
 	if (e.text.indexOf("\n") < 0) o = n(e.text, a) + 2 * i, s = 1;
 	else {
 		let t = e.text.split("\n");
@@ -323,6 +323,25 @@ function le(e, t, n) {
 		h: c
 	};
 }
+function le(e, t) {
+	let n = [], r = e.map((e) => ({
+		it: e,
+		b: ce(e.s, e.style, t)
+	})).sort((e, t) => e.b.y - t.b.y);
+	for (let { it: e, b: t } of r) {
+		let r = t.y;
+		for (let e = !0, i = 0; e && i < 64; i++) {
+			e = !1;
+			for (let i of n) t.x < i.x + i.w && i.x < t.x + t.w && r < i.y + i.h && i.y < r + t.h && (r = i.y + i.h + 1, e = !0);
+		}
+		r !== t.y && (e.s.y += r - t.y), n.push({
+			x: t.x,
+			y: r,
+			w: t.w,
+			h: t.h
+		});
+	}
+}
 var ue = /* @__PURE__ */ new Map(), de = 0;
 function fe(e, t, n) {
 	let r = ue.get(n);
@@ -330,7 +349,7 @@ function fe(e, t, n) {
 	let i = r.get(t);
 	return i === void 0 && (de > 4096 && (ue.clear(), de = 0, ue.set(n, r = /* @__PURE__ */ new Map())), e.font = n, r.set(t, i = e.measureText(t).width), de++), i;
 }
-function C(e, t, n, r, i, a, o) {
+function w(e, t, n, r, i, a, o) {
 	return n < -o || e > i + o || r < -o || t > a + o;
 }
 function pe(e, t, n, r, i, a = {}) {
@@ -363,7 +382,7 @@ function pe(e, t, n, r, i, a = {}) {
 					let t = a.pts[e], n = a.pts[e + 1];
 					t < o && (o = t), t > c && (c = t), n < s && (s = n), n > l && (l = n);
 				}
-				if (C(o, s, c, l, r, i, t)) break;
+				if (w(o, s, c, l, r, i, t)) break;
 				e.beginPath(), e.moveTo(a.pts[0], a.pts[1]);
 				for (let t = 1; t < n; t++) e.lineTo(a.pts[2 * t], a.pts[2 * t + 1]);
 				a.close && e.closePath(), a.fill && (p(a.fill), e.fill()), f(a) && e.stroke();
@@ -371,18 +390,18 @@ function pe(e, t, n, r, i, a = {}) {
 			}
 			case "ellipse": {
 				let n = Math.max(Math.abs(a.rx), Math.abs(a.ry));
-				if (C(a.cx - n, a.cy - n, a.cx + n, a.cy + n, r, i, t)) break;
+				if (w(a.cx - n, a.cy - n, a.cx + n, a.cy + n, r, i, t)) break;
 				e.beginPath(), e.ellipse(a.cx, a.cy, Math.max(0, a.rx), Math.max(0, a.ry), a.rot ?? 0, 0, Math.PI * 2), a.fill && (p(a.fill), e.fill()), f(a) && e.stroke();
 				break;
 			}
 			case "arc":
-				if (C(a.cx - Math.abs(a.r), a.cy - Math.abs(a.r), a.cx + Math.abs(a.r), a.cy + Math.abs(a.r), r, i, t)) break;
+				if (w(a.cx - Math.abs(a.r), a.cy - Math.abs(a.r), a.cx + Math.abs(a.r), a.cy + Math.abs(a.r), r, i, t)) break;
 				e.beginPath(), a.fill && e.moveTo(a.cx, a.cy), e.arc(a.cx, a.cy, Math.max(0, a.r), a.a0, a.a1, a.a1 < a.a0), a.fill && (e.closePath(), p(a.fill), e.fill()), f(a) && e.stroke();
 				break;
 			case "text": {
-				let t = a.size ?? n.fontSize, o = le(a, n, (t, n) => fe(e, t, n));
-				if (C(o.x, o.y, o.x + o.w, o.y + o.h, r, i, 2)) break;
-				e.font = ce(n, t), a.bg && (p(a.bg), e.fillRect(o.x, o.y, o.w, o.h)), a.border && (e.strokeStyle = s = a.border, e.lineWidth = u = 1, e.setLineDash([]), d = "", e.strokeRect(o.x + .5, o.y + .5, o.w - 1, o.h - 1)), p(a.textColor ?? n.textColor), e.textAlign = "left", e.textBaseline = "top";
+				let t = a.size ?? n.fontSize, o = ce(a, n, (t, n) => fe(e, t, n));
+				if (w(o.x, o.y, o.x + o.w, o.y + o.h, r, i, 2)) break;
+				e.font = se(n, t), a.bg && (p(a.bg), e.fillRect(o.x, o.y, o.w, o.h)), a.border && (e.strokeStyle = s = a.border, e.lineWidth = u = 1, e.setLineDash([]), d = "", e.strokeRect(o.x + .5, o.y + .5, o.w - 1, o.h - 1)), p(a.textColor ?? n.textColor), e.textAlign = "left", e.textBaseline = "top";
 				let c = a.pad ?? (a.bg || a.border ? 4 : 0);
 				a.text.indexOf("\n") < 0 ? e.fillText(a.text, o.x + c, o.y + c + t * .125) : a.text.split("\n").forEach((n, r) => e.fillText(n, o.x + c, o.y + c + r * t * 1.25 + t * .125));
 				break;
@@ -429,7 +448,7 @@ function me(e, t, n) {
 function he(e, t, n, r, i, a, o) {
 	if (e.hit === !1) return Infinity;
 	if (e.k === "text") {
-		let r = le(e, a, o), i = Math.max(r.x - t, 0, t - (r.x + r.w)), s = Math.max(r.y - n, 0, n - (r.y + r.h));
+		let r = ce(e, a, o), i = Math.max(r.x - t, 0, t - (r.x + r.w)), s = Math.max(r.y - n, 0, n - (r.y + r.h));
 		return Math.hypot(i, s);
 	}
 	if (e.k === "line") {
@@ -506,7 +525,7 @@ var ve = class {
 		let n = await this.favourites(), r = t ? n.includes(e) ? n : [...n, e] : n.filter((t) => t !== e);
 		return await this.store.save(`${this.prefix}favourites`, r), r;
 	}
-}, ye = {
+}, T = {
 	color: "#2962ff",
 	width: 1.5,
 	dash: "solid",
@@ -518,11 +537,11 @@ var ve = class {
 	text: "",
 	extendLeft: !1,
 	extendRight: !1
-}, be = 1, xe = 4, Se = {
+}, ye = 1, be = 4, xe = {
 	mouse: 5,
 	pen: 8,
 	touch: 14
-}, Ce = 16, we = 5, Te = class {
+}, Se = 16, Ce = 5, we = class {
 	options;
 	id;
 	events = new a();
@@ -625,7 +644,7 @@ var ve = class {
 				price: e.price
 			})),
 			style: {
-				...ye,
+				...T,
 				...i.style,
 				...e.style
 			},
@@ -648,7 +667,7 @@ var ve = class {
 		e.anchors.forEach((t, n) => {
 			if (typeof t?.time != "number" || typeof t?.price != "number" || !Number.isFinite(t.time) || !Number.isFinite(t.price)) throw TypeError(`drawings: ${e.tool} "${e.id}" anchor ${n} must be {time, price} with finite numbers`);
 		});
-		for (let t of Object.keys(ye)) if (typeof e.style?.[t] != typeof ye[t] && (t !== "fill" || e.style?.fill !== null && typeof e.style?.fill != "string")) throw TypeError(`drawings: ${e.tool} "${e.id}" style.${t} has the wrong type`);
+		for (let t of Object.keys(T)) if (typeof e.style?.[t] != typeof T[t] && (t !== "fill" || e.style?.fill !== null && typeof e.style?.fill != "string")) throw TypeError(`drawings: ${e.tool} "${e.id}" style.${t} has the wrong type`);
 		if (e.intervals !== null && (!Array.isArray(e.intervals) || e.intervals.some((e) => !(e > 0)))) throw TypeError(`drawings: ${e.tool} "${e.id}" intervals must be null or positive numbers`);
 		if (t.needsSource && !this.source) throw Error(`drawings: ${e.tool} needs a BarSource; pass \`source\` to DrawingsPlugin`);
 		if (t.screen && (typeof e.props.fx != "number" || typeof e.props.fy != "number")) throw TypeError(`drawings: ${e.tool} "${e.id}" needs numeric props fx and fy`);
@@ -736,6 +755,7 @@ var ve = class {
 		this.select(this.store.list.filter((e) => !e.hidden).map((e) => e.id));
 	}
 	setTool(e) {
+		if (e !== null && this.options.readOnly) throw Error("drawings: a read-only plugin takes no tool");
 		e !== null && this.toolDef(e), this.creating = null, this.tool !== e && (this.tool = e, e !== null && this.select([]), this.events.emit("tool", e), this.render());
 	}
 	anchorAt(e, t, n) {
@@ -918,7 +938,7 @@ var ve = class {
 		}
 	}
 	tolerance(e) {
-		return Se[e ?? this.last?.pointerType ?? "mouse"] ?? Se.mouse;
+		return xe[e ?? this.last?.pointerType ?? "mouse"] ?? xe.mouse;
 	}
 	hitTest(e, t, n, r = this.tolerance()) {
 		if (!this.api) throw Error("drawings: the plugin is not installed on a chart");
@@ -970,23 +990,32 @@ var ve = class {
 		};
 	}
 	drawPane(e, t) {
-		let n = this.ctxFor(t);
-		for (let r of this.store.list) {
-			if (r.pane !== t.pane || !this.visible(r)) continue;
-			let i = this.selected.has(r.id);
-			pe(e, this.shapesOf(r, n), r.style, n.W, n.H, { widthBoost: i || r.id === this.hover ? .5 : 0 });
+		let n = this.ctxFor(t), r = [];
+		for (let e of this.store.list) e.pane === t.pane && this.visible(e) && r.push({
+			d: e,
+			shapes: this.shapesOf(e, n)
+		});
+		let i = [];
+		for (let { d: e, shapes: t } of r) for (let n of t) n.k === "text" && n.stack && i.push({
+			s: n,
+			style: e.style
+		});
+		i.length > 1 && le(i, this.measure);
+		for (let { d: t, shapes: i } of r) {
+			let r = this.selected.has(t.id);
+			pe(e, i, t.style, n.W, n.H, { widthBoost: r || t.id === this.hover ? .5 : 0 });
 		}
 		for (let r of this.store.list) if (r.pane === t.pane && this.selected.has(r.id) && this.visible(r)) for (let t of this.handlePoints(r, n)) e.beginPath(), e.arc(t.x, t.y, 4, 0, Math.PI * 2), e.fillStyle = "#ffffff", e.fill(), e.lineWidth = 1.5, e.strokeStyle = r.style.color, e.stroke();
-		let r = this.creating;
-		if (r && r.pane === t.pane) {
-			let t = this.previewDrawing(r);
+		let a = this.creating;
+		if (a && a.pane === t.pane) {
+			let t = this.previewDrawing(a);
 			if (t) {
 				e.save(), pe(e, this.shapesOf(t, n), t.style, n.W, n.H), e.restore();
-				for (let i of r.anchors) e.beginPath(), e.arc(n.X(i.time), n.Y(i.price), 3.5, 0, Math.PI * 2), e.fillStyle = t.style.color, e.fill();
+				for (let r of a.anchors) e.beginPath(), e.arc(n.X(r.time), n.Y(r.price), 3.5, 0, Math.PI * 2), e.fillStyle = t.style.color, e.fill();
 			}
 		}
-		let i = this.drag;
-		i?.kind === "box" && i.pane === t.pane && (e.save(), e.strokeStyle = "#2962ff", e.fillStyle = "rgba(41,98,255,0.12)", e.lineWidth = 1, e.setLineDash([4, 3]), e.fillRect(Math.min(i.x0, i.x1), Math.min(i.y0, i.y1), Math.abs(i.x1 - i.x0), Math.abs(i.y1 - i.y0)), e.strokeRect(Math.min(i.x0, i.x1) + .5, Math.min(i.y0, i.y1) + .5, Math.abs(i.x1 - i.x0), Math.abs(i.y1 - i.y0)), e.restore());
+		let o = this.drag;
+		o?.kind === "box" && o.pane === t.pane && (e.save(), e.strokeStyle = "#2962ff", e.fillStyle = "rgba(41,98,255,0.12)", e.lineWidth = 1, e.setLineDash([4, 3]), e.fillRect(Math.min(o.x0, o.x1), Math.min(o.y0, o.y1), Math.abs(o.x1 - o.x0), Math.abs(o.y1 - o.y0)), e.strokeRect(Math.min(o.x0, o.x1) + .5, Math.min(o.y0, o.y1) + .5, Math.abs(o.x1 - o.x0), Math.abs(o.y1 - o.y0)), e.restore());
 	}
 	previewDrawing(e) {
 		let t = e.def, n = [...e.anchors];
@@ -1014,6 +1043,7 @@ var ve = class {
 		if (t.constrain) for (let n = 0; n < e.anchors.length; n++) t.constrain(e, n);
 	}
 	pointer(e) {
+		if (this.options.readOnly) return !1;
 		switch (this.last = {
 			pane: e.pane,
 			x: e.x,
@@ -1228,6 +1258,7 @@ var ve = class {
 		}
 	}
 	cursor(e, t, n) {
+		if (this.options.readOnly) return null;
 		if (this.tool || this.creating) return "crosshair";
 		if (this.drag) return this.drag.kind === "move" ? "move" : "pointer";
 		if (!this.api) return null;
@@ -1235,6 +1266,7 @@ var ve = class {
 		return r ? r.handle === null ? this.store.require(r.id).locked ? "default" : "move" : "pointer" : null;
 	}
 	key(e) {
+		if (this.options.readOnly) return !1;
 		let t = e.metaKey || e.ctrlKey, n = e.key;
 		if (n === "Escape") return this.drag ? (this.cancelDrag(), !0) : this.creating ? (this.cancelCreate(), !0) : this.tool ? (this.setTool(null), !0) : this.selected.size ? (this.select([]), !0) : !1;
 		if (n === "Enter" && this.creating?.def.variable) return this.finishVariable(this.creating), !0;
@@ -1254,7 +1286,7 @@ var ve = class {
 		else for (let t of e.before) Object.assign(this.store.require(t.id), v(t));
 		this.render();
 	}
-}, Ee = class e {
+}, Te = class e {
 	t = [];
 	o = [];
 	h = [];
@@ -1358,25 +1390,25 @@ var ve = class {
 };
 //#endregion
 //#region src/tools/util.ts
-function w(e, t) {
+function E(e, t) {
 	let n = e.anchors[t];
 	if (!n) throw Error(`drawings: ${e.tool} "${e.id}" has no anchor ${t} (has ${e.anchors.length})`);
 	return n;
 }
-var T = (e, t) => ({
+var D = (e, t) => ({
 	x: e.X(t.time),
 	y: e.Y(t.price)
-}), E = (e, t) => t.anchors.map((t) => T(e, t));
-function De(e, t) {
+}), O = (e, t) => t.anchors.map((t) => D(e, t));
+function Ee(e, t) {
 	if (!(t in e.props)) throw Error(`drawings: ${e.tool} "${e.id}" is missing prop "${t}"`);
 	return e.props[t];
 }
-function D(e) {
-	let t = De(e, "levels");
+function k(e) {
+	let t = Ee(e, "levels");
 	if (!Array.isArray(t) || t.some((e) => typeof e != "number" || !Number.isFinite(e))) throw TypeError(`drawings: ${e.tool} "${e.id}" prop "levels" must be an array of finite numbers`);
 	return t;
 }
-function O(e, t, n = {}) {
+function A(e, t, n = {}) {
 	return {
 		k: "line",
 		x1: e.x,
@@ -1386,7 +1418,7 @@ function O(e, t, n = {}) {
 		...n
 	};
 }
-function k(e, t = {}) {
+function j(e, t = {}) {
 	let n = [];
 	for (let t of e) n.push(t.x, t.y);
 	return {
@@ -1395,15 +1427,15 @@ function k(e, t = {}) {
 		...t
 	};
 }
-function A(e, t) {
-	return k(e, {
+function M(e, t) {
+	return j(e, {
 		close: !0,
 		fill: t,
 		width: 0,
 		hit: !1
 	});
 }
-function j(e, t, n, r = {}) {
+function N(e, t, n, r = {}) {
 	return {
 		k: "text",
 		x: e,
@@ -1412,9 +1444,9 @@ function j(e, t, n, r = {}) {
 		...r
 	};
 }
-function M(e, t, n, r) {
+function P(e, t, n, r) {
 	let i = Math.atan2(t.y - e.y, t.x - e.x), a = .45;
-	return k([
+	return j([
 		t,
 		{
 			x: t.x - n * Math.cos(i - a),
@@ -1432,21 +1464,21 @@ function M(e, t, n, r) {
 		hit: !1
 	});
 }
-function Oe(e, t, n) {
+function De(e, t, n) {
 	let r = t.x <= n.x;
 	return {
 		extA: r ? e.extendLeft : e.extendRight,
 		extB: r ? e.extendRight : e.extendLeft
 	};
 }
-var ke = (e, t, n) => ({
+var Oe = (e, t, n) => ({
 	x: e.x + (t.x - e.x) * n,
 	y: e.y + (t.y - e.y) * n
-}), N = (e, t) => ke(e, t, .5);
-function P(e, t = .15) {
+}), F = (e, t) => Oe(e, t, .5);
+function ke(e, t = .15) {
 	return e.fill ?? S(e.color, t);
 }
-function F(e) {
+function I(e) {
 	if (!Number.isFinite(e)) throw RangeError(`fmtTime: ${e}`);
 	return new Date(e).toISOString().slice(0, 16).replace("T", " ");
 }
@@ -1460,7 +1492,7 @@ function Ae(e) {
 		i ? `${i}m` : ""
 	].filter(Boolean).join(" ");
 }
-function I(e, t, n) {
+function L(e, t, n) {
 	let r = t.price - e.price;
 	return {
 		dPrice: r,
@@ -1478,7 +1510,7 @@ function Ne(e, t) {
 	let n = e.pct === null ? "" : ` (${je(e.pct)}${Math.abs(e.pct).toFixed(2)}%)`, r = [`${je(e.dPrice)}${t.fmt(Math.abs(e.dPrice))}${n}`], i = [e.bars === null ? "" : `${Me(e.bars)} bars`, Ae(e.dTime)].filter(Boolean).join(", ");
 	return r.push(i), r;
 }
-function L(e, t) {
+function R(e, t) {
 	return t === 0 ? null : e / t;
 }
 function Pe(e) {
@@ -1498,7 +1530,7 @@ var Fe = {
 	"2.618": "#f23645",
 	"3.618": "#9c27b0",
 	"4.236": "#e91e63"
-}, R = (e) => Fe[String(e)] ?? "#787b86", Ie = [
+}, z = (e) => Fe[String(e)] ?? "#787b86", Ie = [
 	0,
 	.236,
 	.382,
@@ -1519,24 +1551,24 @@ var Fe = {
 	.786,
 	1
 ];
-function z(e) {
+function B(e) {
 	return e;
 }
-function B(e, t, n) {
-	if (w(e, t).time === w(e, n).time) throw RangeError(`drawings: ${e.tool} "${e.id}" needs anchors ${t} and ${n} at different times`);
+function V(e, t, n) {
+	if (E(e, t).time === E(e, n).time) throw RangeError(`drawings: ${e.tool} "${e.id}" needs anchors ${t} and ${n} at different times`);
 }
-function V(e) {
+function H(e) {
 	e.anchors.forEach((t, n) => {
 		if (!Number.isFinite(t.time) || !Number.isFinite(t.price)) throw TypeError(`drawings: ${e.tool} "${e.id}" anchor ${n} is not finite (${t.time}, ${t.price})`);
 	});
 }
 //#endregion
 //#region src/tools/annotations.ts
-var H = {
+var U = {
 	border: null,
 	pad: 5
 };
-function U(e, t) {
+function W(e, t) {
 	return e.style.text || t;
 }
 function Re(e, t) {
@@ -1547,23 +1579,23 @@ function Re(e, t) {
 		y: r * t.H
 	};
 }
-var ze = z({
+var ze = B({
 	id: "text",
 	label: "Text",
 	family: "annotations",
 	gesture: "single",
 	anchors: 1,
 	defaults: () => ({ style: { text: "Text" } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let n = T(t, w(e, 0));
-		return [j(n.x, n.y, U(e, "Text"), {
+		let n = D(t, E(e, 0));
+		return [N(n.x, n.y, W(e, "Text"), {
 			align: "left",
 			base: "middle",
 			textColor: e.style.color
 		})];
 	}
-}), Be = z({
+}), Be = B({
 	id: "anchoredText",
 	label: "Anchored text",
 	family: "annotations",
@@ -1579,7 +1611,7 @@ var ze = z({
 	}),
 	shapes(e, t) {
 		let n = Re(e, t);
-		return [j(n.x, n.y, U(e, "Text"), {
+		return [N(n.x, n.y, W(e, "Text"), {
 			align: "left",
 			base: "middle",
 			textColor: e.style.color
@@ -1588,7 +1620,7 @@ var ze = z({
 });
 function Ve(e, t) {
 	return [
-		O(t, {
+		A(t, {
 			x: t.x + 14,
 			y: t.y - 14
 		}, { width: 1 }),
@@ -1601,25 +1633,25 @@ function Ve(e, t) {
 			fill: e.style.color,
 			width: 1
 		},
-		j(t.x + 14, t.y - 14, U(e, "Note"), {
+		N(t.x + 14, t.y - 14, W(e, "Note"), {
 			align: "left",
 			base: "bottom",
 			bg: S(e.style.color, .9),
 			textColor: "#ffffff",
-			...H
+			...U
 		})
 	];
 }
-var He = z({
+var He = B({
 	id: "note",
 	label: "Note",
 	family: "annotations",
 	gesture: "single",
 	anchors: 1,
 	defaults: () => ({ style: { text: "Note" } }),
-	validate: V,
-	shapes: (e, t) => Ve(e, T(t, w(e, 0)))
-}), Ue = z({
+	validate: H,
+	shapes: (e, t) => Ve(e, D(t, E(e, 0)))
+}), Ue = B({
 	id: "anchoredNote",
 	label: "Anchored note",
 	family: "annotations",
@@ -1634,18 +1666,18 @@ var He = z({
 		}
 	}),
 	shapes: (e, t) => Ve(e, Re(e, t))
-}), We = z({
+}), We = B({
 	id: "callout",
 	label: "Callout",
 	family: "annotations",
 	gesture: "drag",
 	anchors: 2,
 	defaults: () => ({ style: { text: "Callout" } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = E(t, e);
+		let [n, r] = O(t, e);
 		return [
-			O(r, n, { width: 1 }),
+			A(r, n, { width: 1 }),
 			{
 				k: "ellipse",
 				cx: n.x,
@@ -1655,26 +1687,26 @@ var He = z({
 				fill: e.style.color,
 				width: 1
 			},
-			j(r.x, r.y, U(e, "Callout"), {
+			N(r.x, r.y, W(e, "Callout"), {
 				align: "center",
 				base: "middle",
 				bg: S(e.style.color, .9),
 				textColor: "#ffffff",
-				...H
+				...U
 			})
 		];
 	}
-}), Ge = z({
+}), Ge = B({
 	id: "comment",
 	label: "Comment",
 	family: "annotations",
 	gesture: "single",
 	anchors: 1,
 	defaults: () => ({ style: { text: "Comment" } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let n = T(t, w(e, 0));
-		return [k([
+		let n = D(t, E(e, 0));
+		return [j([
 			n,
 			{
 				x: n.x - 6,
@@ -1689,25 +1721,25 @@ var He = z({
 			fill: S(e.style.color, .9),
 			width: 0,
 			hit: !1
-		}), j(n.x, n.y - 14, U(e, "Comment"), {
+		}), N(n.x, n.y - 14, W(e, "Comment"), {
 			align: "center",
 			base: "bottom",
 			bg: S(e.style.color, .9),
 			textColor: "#ffffff",
-			...H
+			...U
 		})];
 	}
-}), Ke = z({
+}), Ke = B({
 	id: "priceLabel",
 	label: "Price label",
 	family: "annotations",
 	gesture: "single",
 	anchors: 1,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let n = T(t, w(e, 0)), r = `${e.style.text ? e.style.text + " " : ""}${t.fmt(w(e, 0).price)}`;
-		return [k([
+		let n = D(t, E(e, 0)), r = `${e.style.text ? e.style.text + " " : ""}${t.fmt(E(e, 0).price)}`;
+		return [j([
 			n,
 			{
 				x: n.x + 8,
@@ -1722,33 +1754,33 @@ var He = z({
 			fill: e.style.color,
 			width: 0,
 			hit: !1
-		}), j(n.x + 8, n.y, r, {
+		}), N(n.x + 8, n.y, r, {
 			align: "left",
 			base: "middle",
 			bg: e.style.color,
 			textColor: "#ffffff",
-			...H
+			...U
 		})];
 	}
-}), qe = z({
+}), qe = B({
 	id: "priceNote",
 	label: "Price note",
 	family: "annotations",
 	gesture: "drag",
 	anchors: 2,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let n = T(t, w(e, 0)), r = T(t, w(e, 1)), i = `${e.style.text ? e.style.text + " " : ""}${t.fmt(w(e, 0).price)}`;
+		let n = D(t, E(e, 0)), r = D(t, E(e, 1)), i = `${e.style.text ? e.style.text + " " : ""}${t.fmt(E(e, 0).price)}`;
 		return [
-			O(n, {
+			A(n, {
 				x: r.x,
 				y: n.y
 			}, {
 				dash: "dashed",
 				width: 1
 			}),
-			O({
+			A({
 				x: r.x,
 				y: n.y
 			}, r, { width: 1 }),
@@ -1761,30 +1793,30 @@ var He = z({
 				fill: e.style.color,
 				width: 1
 			},
-			j(r.x, r.y, i, {
+			N(r.x, r.y, i, {
 				align: "center",
 				base: "middle",
 				bg: e.style.color,
 				textColor: "#ffffff",
-				...H
+				...U
 			})
 		];
 	}
-}), Je = z({
+}), Je = B({
 	id: "signpost",
 	label: "Signpost",
 	family: "annotations",
 	gesture: "single",
 	anchors: 1,
 	defaults: () => ({ style: { text: "Sign" } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let n = T(t, w(e, 0)), r = {
+		let n = D(t, E(e, 0)), r = {
 			x: n.x,
 			y: n.y - 44
 		};
 		return [
-			O(n, r),
+			A(n, r),
 			{
 				k: "ellipse",
 				cx: n.x,
@@ -1794,29 +1826,29 @@ var He = z({
 				fill: e.style.color,
 				width: 1
 			},
-			j(r.x, r.y, U(e, "Sign"), {
+			N(r.x, r.y, W(e, "Sign"), {
 				align: "left",
 				base: "bottom",
 				bg: e.style.color,
 				textColor: "#ffffff",
-				...H
+				...U
 			})
 		];
 	}
-}), Ye = z({
+}), Ye = B({
 	id: "flagMark",
 	label: "Flag mark",
 	family: "annotations",
 	gesture: "single",
 	anchors: 1,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let n = T(t, w(e, 0));
-		return [O(n, {
+		let n = D(t, E(e, 0));
+		return [A(n, {
 			x: n.x,
 			y: n.y - 28
-		}), k([
+		}), j([
 			{
 				x: n.x,
 				y: n.y - 28
@@ -1834,34 +1866,34 @@ var He = z({
 			fill: e.style.color
 		})];
 	}
-}), Xe = z({
+}), Xe = B({
 	id: "arrow",
 	label: "Arrow",
 	family: "annotations",
 	gesture: "drag",
 	anchors: 2,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = E(t, e);
-		return [O(n, r), M(n, r, 6 + e.style.width * 2, e.style.color)];
+		let [n, r] = O(t, e);
+		return [A(n, r), P(n, r, 6 + e.style.width * 2, e.style.color)];
 	}
-}), Ze = z({
+}), Ze = B({
 	id: "arrowMarker",
 	label: "Arrow marker",
 	family: "annotations",
 	gesture: "drag",
 	anchors: 2,
 	defaults: () => ({ style: { fill: "#2962ff" } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = Math.hypot(r.x - n.x, r.y - n.y);
-		if (i === 0) return [O(n, r)];
+		let [n, r] = O(t, e), i = Math.hypot(r.x - n.x, r.y - n.y);
+		if (i === 0) return [A(n, r)];
 		let a = (r.x - n.x) / i, o = (r.y - n.y) / i, s = -o, c = a, l = Math.min(i * .45, 20), u = (e, t) => ({
 			x: n.x + a * e + s * t,
 			y: n.y + o * e + c * t
 		});
-		return [k([
+		return [j([
 			u(0, 4),
 			u(i - l, 4),
 			u(i - l, 10),
@@ -1877,7 +1909,7 @@ var He = z({
 });
 function Qe(e, t, n) {
 	let r = n ? 1 : -1;
-	return [k([
+	return [j([
 		t,
 		{
 			x: t.x - 9,
@@ -1909,24 +1941,24 @@ function Qe(e, t, n) {
 		width: 1
 	})];
 }
-var $e = z({
+var $e = B({
 	id: "arrowMarkUp",
 	label: "Arrow mark up",
 	family: "annotations",
 	gesture: "single",
 	anchors: 1,
 	defaults: () => ({ style: { color: "#26a69a" } }),
-	validate: V,
-	shapes: (e, t) => Qe(e, T(t, w(e, 0)), !0)
-}), et = z({
+	validate: H,
+	shapes: (e, t) => Qe(e, D(t, E(e, 0)), !0)
+}), et = B({
 	id: "arrowMarkDown",
 	label: "Arrow mark down",
 	family: "annotations",
 	gesture: "single",
 	anchors: 1,
 	defaults: () => ({ style: { color: "#ef5350" } }),
-	validate: V,
-	shapes: (e, t) => Qe(e, T(t, w(e, 0)), !1)
+	validate: H,
+	shapes: (e, t) => Qe(e, D(t, E(e, 0)), !1)
 }), tt = [
 	ze,
 	Be,
@@ -1947,7 +1979,7 @@ function rt(e, t, n, r) {
 	let i = Math.min(t.x, n.x), a = Math.max(t.x, n.x);
 	return [e.style.extendLeft ? -10 : i, e.style.extendRight ? r.W + 10 : a];
 }
-var it = z({
+var it = B({
 	id: "parallelChannel",
 	label: "Parallel channel",
 	family: "channels",
@@ -1958,28 +1990,28 @@ var it = z({
 		props: { midline: !0 }
 	}),
 	validate(e) {
-		V(e), B(e, 0, 1);
+		H(e), V(e, 0, 1);
 	},
 	shapes(e, t) {
-		let [n, r, i] = E(t, e), a = i.y - nt(n, r, i.x), [o, s] = rt(e, n, r, t), c = (e) => [{
+		let [n, r, i] = O(t, e), a = i.y - nt(n, r, i.x), [o, s] = rt(e, n, r, t), c = (e) => [{
 			x: o,
 			y: nt(n, r, o) + e
 		}, {
 			x: s,
 			y: nt(n, r, s) + e
 		}], [l, u] = c(0), [d, f] = c(a), p = [
-			A([
+			M([
 				l,
 				u,
 				f,
 				d
-			], P(e.style, .12)),
-			O(l, u),
-			O(d, f)
+			], ke(e.style, .12)),
+			A(l, u),
+			A(d, f)
 		];
 		if (e.props.midline !== !1) {
 			let [t, n] = c(a / 2);
-			p.push(O(t, n, {
+			p.push(A(t, n, {
 				dash: "dashed",
 				width: Math.max(1, e.style.width * .66)
 			}));
@@ -2018,7 +2050,7 @@ function ot(e, t, n) {
 		hi: i
 	};
 }
-var st = z({
+var st = B({
 	id: "regressionTrendChannel",
 	label: "Regression trend channel",
 	family: "channels",
@@ -2027,13 +2059,13 @@ var st = z({
 	needsSource: !0,
 	defaults: () => ({ props: { deviations: 2 } }),
 	validate(e) {
-		V(e), B(e, 0, 1);
+		H(e), V(e, 0, 1);
 		let t = e.props.deviations;
 		if (typeof t != "number" || !(t > 0)) throw RangeError(`drawings: regressionTrendChannel "${e.id}" prop "deviations" must be > 0`);
 	},
 	shapes(e, t) {
 		if (!t.source) throw Error("regressionTrendChannel needs a BarSource");
-		let { reg: n, lo: r, hi: i } = ot(t.source, w(e, 0).time, w(e, 1).time), a = e.props.deviations, o = t.source.at(r).time, s = t.source.at(i - 1).time, c = (e, r) => ({
+		let { reg: n, lo: r, hi: i } = ot(t.source, E(e, 0).time, E(e, 1).time), a = e.props.deviations, o = t.source.at(r).time, s = t.source.at(i - 1).time, c = (e, r) => ({
 			x: 0,
 			y: t.Y(n.intercept + n.slope * e + r * n.sigma)
 		}), l = t.X(o), u = t.X(s), d = (e) => [{
@@ -2044,18 +2076,18 @@ var st = z({
 			y: c(i - r - 1, e).y
 		}], [f, p] = d(a), [m, h] = d(0), [g, _] = d(-a);
 		return [
-			A([
+			M([
 				f,
 				p,
 				_,
 				g
-			], P(e.style, .1)),
-			O(f, p),
-			O(g, _),
-			O(m, h, { dash: "dashed" })
+			], ke(e.style, .1)),
+			A(f, p),
+			A(g, _),
+			A(m, h, { dash: "dashed" })
 		];
 	}
-}), ct = z({
+}), ct = B({
 	id: "flatTopBottom",
 	label: "Flat top/bottom",
 	family: "channels",
@@ -2063,12 +2095,12 @@ var st = z({
 	anchors: 3,
 	defaults: () => ({}),
 	validate(e) {
-		V(e), B(e, 0, 1);
+		H(e), V(e, 0, 1);
 	},
 	shapes(e, t) {
-		let [n, r, i] = E(t, e), a = i.y;
+		let [n, r, i] = O(t, e), a = i.y;
 		return [
-			A([
+			M([
 				n,
 				r,
 				{
@@ -2079,9 +2111,9 @@ var st = z({
 					x: n.x,
 					y: a
 				}
-			], P(e.style, .12)),
-			O(n, r),
-			O({
+			], ke(e.style, .12)),
+			A(n, r),
+			A({
 				x: n.x,
 				y: a
 			}, {
@@ -2090,7 +2122,7 @@ var st = z({
 			})
 		];
 	}
-}), lt = z({
+}), lt = B({
 	id: "disjointChannel",
 	label: "Disjoint channel",
 	family: "channels",
@@ -2098,24 +2130,24 @@ var st = z({
 	anchors: 4,
 	defaults: () => ({}),
 	validate(e) {
-		V(e), B(e, 0, 1);
+		H(e), V(e, 0, 1);
 	},
 	shapes(e, t) {
-		let [n, r, i, a] = E(t, e);
+		let [n, r, i, a] = O(t, e);
 		return [
-			A([
+			M([
 				n,
 				r,
 				a,
 				i
-			], P(e.style, .12)),
-			O(n, r),
-			O(i, a)
+			], ke(e.style, .12)),
+			A(n, r),
+			A(i, a)
 		];
 	}
 });
 function ut(e, t, n, r) {
-	let i = N(n, r);
+	let i = F(n, r);
 	switch (e) {
 		case "standard": return {
 			origin: t,
@@ -2133,7 +2165,7 @@ function ut(e, t, n, r) {
 			t2: r
 		};
 		case "modifiedSchiff": return {
-			origin: N(t, n),
+			origin: F(t, n),
 			m: i,
 			t1: n,
 			t2: r
@@ -2141,22 +2173,22 @@ function ut(e, t, n, r) {
 		case "inside": return {
 			origin: t,
 			m: i,
-			t1: N(t, n),
-			t2: N(t, r)
+			t1: F(t, n),
+			t2: F(t, r)
 		};
 	}
 }
-function W(e, t, n) {
-	return z({
+function G(e, t, n) {
+	return B({
 		id: e,
 		label: t,
 		family: "pitchforks",
 		gesture: "clicks",
 		anchors: 3,
 		defaults: () => ({}),
-		validate: V,
+		validate: H,
 		shapes(t, r) {
-			let [i, a, o] = E(r, t), s = ut(n, i, a, o), c = {
+			let [i, a, o] = O(r, t), s = ut(n, i, a, o), c = {
 				x: s.m.x - s.origin.x,
 				y: s.m.y - s.origin.y
 			};
@@ -2172,26 +2204,26 @@ function W(e, t, n) {
 				};
 			}, d = u(s.origin);
 			return [
-				A([
+				M([
 					s.origin,
 					s.t1,
 					u(s.t1),
 					d
 				], S(t.style.color, .08)),
-				A([
+				M([
 					s.origin,
 					s.t2,
 					u(s.t2),
 					d
 				], S(t.style.color, .08)),
-				O(s.origin, l(s.origin), { extB: !0 }),
-				O(s.t1, l(s.t1), { extB: !0 }),
-				O(s.t2, l(s.t2), { extB: !0 }),
-				O(a, o, {
+				A(s.origin, l(s.origin), { extB: !0 }),
+				A(s.t1, l(s.t1), { extB: !0 }),
+				A(s.t2, l(s.t2), { extB: !0 }),
+				A(a, o, {
 					dash: "dashed",
 					width: 1
 				}),
-				O(i, a, {
+				A(i, a, {
 					dash: "dotted",
 					width: 1,
 					hit: !1
@@ -2200,21 +2232,21 @@ function W(e, t, n) {
 		}
 	});
 }
-var dt = W("pitchfork", "Pitchfork", "standard"), ft = W("schiffPitchfork", "Schiff pitchfork", "schiff"), pt = W("modifiedSchiffPitchfork", "Modified Schiff pitchfork", "modifiedSchiff"), mt = W("insidePitchfork", "Inside pitchfork", "inside"), ht = z({
+var dt = G("pitchfork", "Pitchfork", "standard"), ft = G("schiffPitchfork", "Schiff pitchfork", "schiff"), pt = G("modifiedSchiffPitchfork", "Modified Schiff pitchfork", "modifiedSchiff"), mt = G("insidePitchfork", "Inside pitchfork", "inside"), ht = B({
 	id: "pitchfan",
 	label: "Pitchfan",
 	family: "pitchforks",
 	gesture: "clicks",
 	anchors: 3,
 	defaults: () => ({ props: { levels: Le } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r, i] = E(t, e), a = e.props.levels, o = [O(r, i, {
+		let [n, r, i] = O(t, e), a = e.props.levels, o = [A(r, i, {
 			dash: "dashed",
 			width: 1
 		})], s = a.map((e) => ({
 			r: e,
-			p: ke(r, i, e)
+			p: Oe(r, i, e)
 		}));
 		for (let e = 0; e + 1 < s.length; e++) {
 			let r = s[e].p, i = s[e + 1].p, a = (e) => {
@@ -2224,18 +2256,18 @@ var dt = W("pitchfork", "Pitchfork", "standard"), ft = W("schiffPitchfork", "Sch
 					y: n.y + i * a
 				};
 			};
-			o.push(A([
+			o.push(M([
 				n,
 				a(r),
 				a(i)
-			], S(R(s[e].r), .07)));
+			], S(z(s[e].r), .07)));
 		}
-		for (let { r: t, p: r } of s) o.push(O(n, r, {
+		for (let { r: t, p: r } of s) o.push(A(n, r, {
 			extB: !0,
-			color: R(t),
+			color: z(t),
 			width: t === .5 ? e.style.width : 1
-		}), j(r.x, r.y, String(t), {
-			textColor: R(t),
+		}), N(r.x, r.y, String(t), {
+			textColor: z(t),
 			size: 10,
 			hit: !1
 		}));
@@ -2255,7 +2287,7 @@ var dt = W("pitchfork", "Pitchfork", "standard"), ft = W("schiffPitchfork", "Sch
 function yt(e, t) {
 	return Math.abs(t.x - e.x);
 }
-var bt = z({
+var bt = B({
 	id: "cyclicLines",
 	label: "Cyclic lines",
 	family: "cycles",
@@ -2263,15 +2295,15 @@ var bt = z({
 	anchors: 2,
 	defaults: () => ({}),
 	validate: (e) => {
-		V(e), B(e, 0, 1);
+		H(e), V(e, 0, 1);
 	},
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = yt(n, r);
-		if (i < vt) return [O(n, r)];
+		let [n, r] = O(t, e), i = yt(n, r);
+		if (i < vt) return [A(n, r)];
 		let a = Math.ceil((-50 - n.x) / i), o = Math.floor((t.W + 50 - n.x) / i), s = [];
 		for (let e = a; e <= o && s.length < _t; e++) {
 			let r = n.x + e * i;
-			s.push(O({
+			s.push(A({
 				x: r,
 				y: 0
 			}, {
@@ -2284,7 +2316,7 @@ var bt = z({
 		}
 		return s;
 	}
-}), xt = z({
+}), xt = B({
 	id: "timeCycles",
 	label: "Time cycles",
 	family: "cycles",
@@ -2292,11 +2324,11 @@ var bt = z({
 	anchors: 2,
 	defaults: () => ({ style: { fill: "rgba(41,98,255,0.1)" } }),
 	validate: (e) => {
-		V(e), B(e, 0, 1);
+		H(e), V(e, 0, 1);
 	},
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = yt(n, r);
-		if (i < vt) return [O(n, r)];
+		let [n, r] = O(t, e), i = yt(n, r);
+		if (i < vt) return [A(n, r)];
 		let a = [], o = r.x >= n.x ? 1 : -1;
 		for (let r = 0; r < _t; r++) {
 			let s = n.x + o * r * i;
@@ -2318,7 +2350,7 @@ function St(e, t, n, r, i) {
 	let a = (t + r) / 2;
 	return a + (t - a) * Math.cos(Math.PI * (i - e) / (n - e));
 }
-var Ct = z({
+var Ct = B({
 	id: "sineLine",
 	label: "Sine line",
 	family: "cycles",
@@ -2326,11 +2358,11 @@ var Ct = z({
 	anchors: 2,
 	defaults: () => ({}),
 	validate: (e) => {
-		V(e), B(e, 0, 1);
+		H(e), V(e, 0, 1);
 	},
 	shapes(e, t) {
-		let [n, r] = E(t, e);
-		if (Math.abs(r.x - n.x) < vt) return [O(n, r)];
+		let [n, r] = O(t, e);
+		if (Math.abs(r.x - n.x) < vt) return [A(n, r)];
 		let i = [];
 		for (let e = -4; e <= t.W + 4; e += 2) i.push(e, St(n.x, n.y, r.x, r.y, e));
 		return [{
@@ -2354,23 +2386,23 @@ var Ct = z({
 	34,
 	55,
 	89
-], Ot = (1 + Math.sqrt(5)) / 2, G = (e) => ({ props: { levels: e } }), kt = z({
+], Ot = (1 + Math.sqrt(5)) / 2, K = (e) => ({ props: { levels: e } }), kt = B({
 	id: "fibRetracement",
 	label: "Fib retracement",
 	family: "fibonacci",
 	gesture: "drag",
 	anchors: 2,
-	defaults: () => G(Ie),
+	defaults: () => K(Ie),
 	validate: (e) => {
-		V(e), D(e);
+		H(e), k(e);
 	},
 	shapes(e, t) {
-		let n = w(e, 0), r = w(e, 1), i = T(t, n), a = T(t, r), o = Math.min(i.x, a.x), s = e.style.extendRight ? t.W + 10 : Math.max(i.x, a.x), c = [O(i, a, {
+		let n = E(e, 0), r = E(e, 1), i = D(t, n), a = D(t, r), o = Math.min(i.x, a.x), s = e.style.extendRight ? t.W + 10 : Math.max(i.x, a.x), c = [A(i, a, {
 			dash: "dashed",
 			width: 1,
 			color: "#787b86"
-		})], l = D(e), u = l.map((e) => t.Y(Tt(n, r, e)));
-		for (let e = 0; e + 1 < l.length; e++) c.push(A([
+		})], l = k(e), u = l.map((e) => t.Y(Tt(n, r, e)));
+		for (let e = 0; e + 1 < l.length; e++) c.push(M([
 			{
 				x: o,
 				y: u[e]
@@ -2387,34 +2419,34 @@ var Ct = z({
 				x: o,
 				y: u[e + 1]
 			}
-		], S(R(l[e + 1]), .07)));
+		], S(z(l[e + 1]), .07)));
 		return l.forEach((e, i) => {
 			let a = u[i];
-			c.push(O({
+			c.push(A({
 				x: o,
 				y: a
 			}, {
 				x: s,
 				y: a
 			}, {
-				color: R(e),
+				color: z(e),
 				width: 1
-			})), c.push(j(o - 4, a, `${e} (${t.fmt(Tt(n, r, e))})`, {
+			})), c.push(N(o - 4, a, `${e} (${t.fmt(Tt(n, r, e))})`, {
 				align: "right",
 				base: "middle",
-				textColor: R(e),
+				textColor: z(e),
 				size: 10,
 				hit: !1
 			}));
 		}), c;
 	}
-}), At = z({
+}), At = B({
 	id: "fibExtension",
 	label: "Trend-based Fib extension",
 	family: "fibonacci",
 	gesture: "clicks",
 	anchors: 3,
-	defaults: () => G([
+	defaults: () => K([
 		0,
 		.236,
 		.382,
@@ -2430,27 +2462,27 @@ var Ct = z({
 		4.236
 	]),
 	validate: (e) => {
-		V(e), D(e);
+		H(e), k(e);
 	},
 	shapes(e, t) {
 		let [n, r, i] = [
-			w(e, 0),
-			w(e, 1),
-			w(e, 2)
+			E(e, 0),
+			E(e, 1),
+			E(e, 2)
 		], [a, o, s] = [
-			T(t, n),
-			T(t, r),
-			T(t, i)
-		], c = s.x, l = e.style.extendRight ? t.W + 10 : Math.max(s.x, o.x) + 40, u = [O(a, o, {
+			D(t, n),
+			D(t, r),
+			D(t, i)
+		], c = s.x, l = e.style.extendRight ? t.W + 10 : Math.max(s.x, o.x) + 40, u = [A(a, o, {
 			dash: "dashed",
 			width: 1,
 			color: "#787b86"
-		}), O(o, s, {
+		}), A(o, s, {
 			dash: "dashed",
 			width: 1,
 			color: "#787b86"
-		})], d = D(e), f = d.map((e) => t.Y(Et(n, r, i, e)));
-		for (let e = 0; e + 1 < d.length; e++) u.push(A([
+		})], d = k(e), f = d.map((e) => t.Y(Et(n, r, i, e)));
+		for (let e = 0; e + 1 < d.length; e++) u.push(M([
 			{
 				x: c,
 				y: f[e]
@@ -2467,34 +2499,34 @@ var Ct = z({
 				x: c,
 				y: f[e + 1]
 			}
-		], S(R(d[e + 1]), .07)));
+		], S(z(d[e + 1]), .07)));
 		return d.forEach((e, a) => {
 			let o = f[a];
-			u.push(O({
+			u.push(A({
 				x: c,
 				y: o
 			}, {
 				x: l,
 				y: o
 			}, {
-				color: R(e),
+				color: z(e),
 				width: 1
-			})), u.push(j(c - 4, o, `${e} (${t.fmt(Et(n, r, i, e))})`, {
+			})), u.push(N(c - 4, o, `${e} (${t.fmt(Et(n, r, i, e))})`, {
 				align: "right",
 				base: "middle",
-				textColor: R(e),
+				textColor: z(e),
 				size: 10,
 				hit: !1
 			}));
 		}), u;
 	}
-}), jt = z({
+}), jt = B({
 	id: "fibChannel",
 	label: "Fib channel",
 	family: "fibonacci",
 	gesture: "clicks",
 	anchors: 3,
-	defaults: () => G([
+	defaults: () => K([
 		0,
 		.236,
 		.382,
@@ -2506,10 +2538,10 @@ var Ct = z({
 		2.618
 	]),
 	validate(e) {
-		V(e), D(e), B(e, 0, 1);
+		H(e), k(e), V(e, 0, 1);
 	},
 	shapes(e, t) {
-		let [n, r, i] = E(t, e), a = n.y + (r.y - n.y) * (i.x - n.x) / (r.x - n.x), o = i.y - a, s = D(e), c = (e) => [{
+		let [n, r, i] = O(t, e), a = n.y + (r.y - n.y) * (i.x - n.x) / (r.x - n.x), o = i.y - a, s = k(e), c = (e) => [{
 			x: n.x,
 			y: n.y + e * o
 		}, {
@@ -2518,44 +2550,44 @@ var Ct = z({
 		}], l = [];
 		for (let e = 0; e + 1 < s.length; e++) {
 			let [t, n] = c(s[e]), [r, i] = c(s[e + 1]);
-			l.push(A([
+			l.push(M([
 				t,
 				n,
 				i,
 				r
-			], S(R(s[e + 1]), .07)));
+			], S(z(s[e + 1]), .07)));
 		}
 		for (let t of s) {
 			let [n, r] = c(t);
-			l.push(O(n, r, {
+			l.push(A(n, r, {
 				extB: e.style.extendRight,
 				extA: e.style.extendLeft,
-				color: R(t),
+				color: z(t),
 				width: 1
-			}), j(r.x + 4, r.y, String(t), {
+			}), N(r.x + 4, r.y, String(t), {
 				base: "middle",
-				textColor: R(t),
+				textColor: z(t),
 				size: 10,
 				hit: !1
 			}));
 		}
 		return l;
 	}
-}), Mt = z({
+}), Mt = B({
 	id: "fibTimeZone",
 	label: "Fib time zone",
 	family: "fibonacci",
 	gesture: "drag",
 	anchors: 2,
-	defaults: () => G(Dt),
+	defaults: () => K(Dt),
 	validate(e) {
-		V(e), D(e), B(e, 0, 1);
+		H(e), k(e), V(e, 0, 1);
 	},
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = r.x - n.x, a = [];
-		for (let r of D(e)) {
+		let [n, r] = O(t, e), i = r.x - n.x, a = [];
+		for (let r of k(e)) {
 			let e = n.x + r * i;
-			e < -50 || e > t.W + 50 || a.push(O({
+			e < -50 || e > t.W + 50 || a.push(A({
 				x: e,
 				y: 0
 			}, {
@@ -2566,14 +2598,14 @@ var Ct = z({
 				extB: !0,
 				color: r === 0 || r === 1 ? "#787b86" : "#2962ff",
 				width: 1
-			}), j(e + 3, 3, String(r), {
+			}), N(e + 3, 3, String(r), {
 				base: "top",
 				size: 10,
 				textColor: "#787b86",
 				hit: !1
 			}));
 		}
-		return a.push(O(n, r, {
+		return a.push(A(n, r, {
 			dash: "dashed",
 			width: 1
 		})), a;
@@ -2585,19 +2617,19 @@ var Ct = z({
 	.618,
 	.75,
 	1
-], Pt = z({
+], Pt = B({
 	id: "fibSpeedFan",
 	label: "Fib speed resistance fan",
 	family: "fibonacci",
 	gesture: "drag",
 	anchors: 2,
-	defaults: () => G(Nt),
+	defaults: () => K(Nt),
 	validate(e) {
-		if (V(e), D(e), B(e, 0, 1), w(e, 0).price === w(e, 1).price) throw RangeError(`drawings: fibSpeedFan "${e.id}" needs anchors at different prices`);
+		if (H(e), k(e), V(e, 0, 1), E(e, 0).price === E(e, 1).price) throw RangeError(`drawings: fibSpeedFan "${e.id}" needs anchors at different prices`);
 	},
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = [
-			A([
+		let [n, r] = O(t, e), i = [
+			M([
 				n,
 				{
 					x: r.x,
@@ -2609,7 +2641,7 @@ var Ct = z({
 					y: r.y
 				}
 			], S(e.style.color, .05)),
-			O(n, {
+			A(n, {
 				x: r.x,
 				y: n.y
 			}, {
@@ -2617,7 +2649,7 @@ var Ct = z({
 				width: 1,
 				hit: !1
 			}),
-			O({
+			A({
 				x: r.x,
 				y: n.y
 			}, r, {
@@ -2625,7 +2657,7 @@ var Ct = z({
 				width: 1,
 				hit: !1
 			}),
-			O(r, {
+			A(r, {
 				x: n.x,
 				y: r.y
 			}, {
@@ -2633,7 +2665,7 @@ var Ct = z({
 				width: 1,
 				hit: !1
 			}),
-			O({
+			A({
 				x: n.x,
 				y: r.y
 			}, n, {
@@ -2642,23 +2674,23 @@ var Ct = z({
 				hit: !1
 			})
 		];
-		for (let t of D(e)) {
-			let e = R(t === .25 ? .5 : t), a = {
+		for (let t of k(e)) {
+			let e = z(t === .25 ? .5 : t), a = {
 				x: r.x,
 				y: n.y + t * (r.y - n.y)
 			}, o = {
 				x: n.x + t * (r.x - n.x),
 				y: r.y
 			};
-			i.push(O(n, a, {
+			i.push(A(n, a, {
 				extB: !0,
 				color: e,
 				width: 1
-			}), O(n, o, {
+			}), A(n, o, {
 				extB: !0,
 				color: e,
 				width: 1
-			}), j(a.x + 3, a.y, String(t), {
+			}), N(a.x + 3, a.y, String(t), {
 				base: "middle",
 				size: 10,
 				textColor: e,
@@ -2667,13 +2699,13 @@ var Ct = z({
 		}
 		return i;
 	}
-}), Ft = z({
+}), Ft = B({
 	id: "fibTrendTime",
 	label: "Trend-based Fib time",
 	family: "fibonacci",
 	gesture: "clicks",
 	anchors: 3,
-	defaults: () => G([
+	defaults: () => K([
 		0,
 		.382,
 		.5,
@@ -2688,17 +2720,17 @@ var Ct = z({
 		4.236
 	]),
 	validate(e) {
-		V(e), D(e), B(e, 0, 1);
+		H(e), k(e), V(e, 0, 1);
 	},
 	shapes(e, t) {
-		let [n, r, i] = E(t, e), a = r.x - n.x, o = [O(n, r, {
+		let [n, r, i] = O(t, e), a = r.x - n.x, o = [A(n, r, {
 			dash: "dashed",
 			width: 1,
 			color: "#787b86"
 		})];
-		for (let n of D(e)) {
+		for (let n of k(e)) {
 			let e = i.x + n * a;
-			e < -50 || e > t.W + 50 || o.push(O({
+			e < -50 || e > t.W + 50 || o.push(A({
 				x: e,
 				y: 0
 			}, {
@@ -2707,24 +2739,24 @@ var Ct = z({
 			}, {
 				extA: !0,
 				extB: !0,
-				color: R(n),
+				color: z(n),
 				width: 1
-			}), j(e + 3, 3, String(n), {
+			}), N(e + 3, 3, String(n), {
 				base: "top",
 				size: 10,
-				textColor: R(n),
+				textColor: z(n),
 				hit: !1
 			}));
 		}
 		return o;
 	}
-}), It = z({
+}), It = B({
 	id: "fibCircles",
 	label: "Fib circles",
 	family: "fibonacci",
 	gesture: "drag",
 	anchors: 2,
-	defaults: () => G([
+	defaults: () => K([
 		.236,
 		.382,
 		.5,
@@ -2735,41 +2767,41 @@ var Ct = z({
 		2.618
 	]),
 	validate(e) {
-		V(e), D(e);
+		H(e), k(e);
 	},
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = s(n.x, n.y, r.x, r.y), a = [O(n, r, {
+		let [n, r] = O(t, e), i = s(n.x, n.y, r.x, r.y), a = [A(n, r, {
 			dash: "dashed",
 			width: 1,
 			color: "#787b86"
 		})];
-		for (let t of D(e)) a.push({
+		for (let t of k(e)) a.push({
 			k: "ellipse",
 			cx: n.x,
 			cy: n.y,
 			rx: i * t,
 			ry: i * t,
-			color: R(t),
+			color: z(t),
 			width: 1
-		}, j(n.x + i * t, n.y, String(t), {
+		}, N(n.x + i * t, n.y, String(t), {
 			size: 10,
 			base: "bottom",
-			textColor: R(t),
+			textColor: z(t),
 			hit: !1
 		}));
 		return a;
 	}
-}), Lt = z({
+}), Lt = B({
 	id: "fibSpiral",
 	label: "Fib spiral",
 	family: "fibonacci",
 	gesture: "drag",
 	anchors: 2,
 	defaults: () => ({ props: { clockwise: !1 } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = s(n.x, n.y, r.x, r.y);
-		if (i === 0) return [O(n, r)];
+		let [n, r] = O(t, e), i = s(n.x, n.y, r.x, r.y);
+		if (i === 0) return [A(n, r)];
 		let a = Math.atan2(r.y - n.y, r.x - n.x), o = e.props.clockwise === !0 ? 1 : -1, c = 2 * Math.hypot(t.W, t.H), l = Math.min(8 * Math.PI, Math.log(c / i) * Math.PI / (2 * Math.log(Ot))), u = [];
 		for (let e = -3 * Math.PI; e <= l; e += .08) {
 			let t = i * Ot ** (2 * e / Math.PI);
@@ -2778,7 +2810,7 @@ var Ct = z({
 				y: n.y + t * Math.sin(a + o * e)
 			});
 		}
-		return [O(n, r, {
+		return [A(n, r, {
 			dash: "dashed",
 			width: 1
 		}), {
@@ -2793,46 +2825,46 @@ var Ct = z({
 	1,
 	1.382,
 	1.618
-], zt = z({
+], zt = B({
 	id: "fibSpeedArcs",
 	label: "Fib speed resistance arcs",
 	family: "fibonacci",
 	gesture: "drag",
 	anchors: 2,
-	defaults: () => G(Rt),
+	defaults: () => K(Rt),
 	validate: (e) => {
-		V(e), D(e);
+		H(e), k(e);
 	},
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = s(n.x, n.y, r.x, r.y), a = Math.atan2(r.y - n.y, r.x - n.x), o = [O(n, r, {
+		let [n, r] = O(t, e), i = s(n.x, n.y, r.x, r.y), a = Math.atan2(r.y - n.y, r.x - n.x), o = [A(n, r, {
 			dash: "dashed",
 			width: 1,
 			color: "#787b86"
 		})];
-		for (let t of D(e)) o.push({
+		for (let t of k(e)) o.push({
 			k: "arc",
 			cx: r.x,
 			cy: r.y,
 			r: i * t,
 			a0: a - Math.PI / 2,
 			a1: a + Math.PI / 2,
-			color: R(t),
+			color: z(t),
 			width: 1
-		}), o.push(j(r.x + i * t * Math.cos(a), r.y + i * t * Math.sin(a), String(t), {
+		}), o.push(N(r.x + i * t * Math.cos(a), r.y + i * t * Math.sin(a), String(t), {
 			size: 10,
 			base: "middle",
-			textColor: R(t),
+			textColor: z(t),
 			hit: !1
 		}));
 		return o;
 	}
-}), Bt = z({
+}), Bt = B({
 	id: "fibWedge",
 	label: "Fib wedge",
 	family: "fibonacci",
 	gesture: "clicks",
 	anchors: 3,
-	defaults: () => G([
+	defaults: () => K([
 		.236,
 		.382,
 		.5,
@@ -2842,18 +2874,18 @@ var Ct = z({
 		1.618
 	]),
 	validate: (e) => {
-		V(e), D(e);
+		H(e), k(e);
 	},
 	shapes(e, t) {
-		let [n, r, i] = E(t, e), a = s(n.x, n.y, r.x, r.y), o = Math.atan2(r.y - n.y, r.x - n.x), c = ((Math.atan2(i.y - n.y, i.x - n.x) - o + Math.PI) % (2 * Math.PI) + 2 * Math.PI) % (2 * Math.PI) - Math.PI, l = [O(n, r, { extB: !0 }), O(n, i, { extB: !0 })];
-		for (let t of D(e)) l.push({
+		let [n, r, i] = O(t, e), a = s(n.x, n.y, r.x, r.y), o = Math.atan2(r.y - n.y, r.x - n.x), c = ((Math.atan2(i.y - n.y, i.x - n.x) - o + Math.PI) % (2 * Math.PI) + 2 * Math.PI) % (2 * Math.PI) - Math.PI, l = [A(n, r, { extB: !0 }), A(n, i, { extB: !0 })];
+		for (let t of k(e)) l.push({
 			k: "arc",
 			cx: n.x,
 			cy: n.y,
 			r: a * t,
 			a0: o,
 			a1: o + c,
-			color: R(t),
+			color: z(t),
 			width: 1
 		});
 		return l;
@@ -2869,25 +2901,25 @@ var Ct = z({
 	Lt,
 	zt,
 	Bt
-], K = "rgba(41,98,255,0.15)";
-function q(e, t) {
-	return e ? [j(t.x, t.y, e, {
+], q = "rgba(41,98,255,0.15)";
+function Ht(e, t) {
+	return e ? [N(t.x, t.y, e, {
 		align: "center",
 		base: "middle",
 		hit: !1
 	})] : [];
 }
-var Ht = z({
+var Ut = B({
 	id: "rectangle",
 	label: "Rectangle",
 	family: "shapes",
 	gesture: "drag",
 	anchors: 2,
-	defaults: () => ({ style: { fill: K } }),
-	validate: V,
+	defaults: () => ({ style: { fill: q } }),
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = E(t, e);
-		return [k([
+		let [n, r] = O(t, e);
+		return [j([
 			n,
 			{
 				x: r.x,
@@ -2901,10 +2933,10 @@ var Ht = z({
 		], {
 			close: !0,
 			fill: e.style.fill
-		}), ...q(e.style.text, N(n, r))];
+		}), ...Ht(e.style.text, F(n, r))];
 	}
 });
-function Ut(e, t, n) {
+function Wt(e, t, n) {
 	let r = t.x - e.x, i = t.y - e.y, a = Math.hypot(r, i);
 	if (a === 0) throw RangeError("rotated rectangle: its first two anchors coincide");
 	let o = -i / a, s = r / a, c = (n.x - e.x) * o + (n.y - e.y) * s;
@@ -2921,31 +2953,31 @@ function Ut(e, t, n) {
 		}
 	];
 }
-var Wt = z({
+var Gt = B({
 	id: "rotatedRectangle",
 	label: "Rotated rectangle",
 	family: "shapes",
 	gesture: "clicks",
 	anchors: 3,
-	defaults: () => ({ style: { fill: K } }),
-	validate: V,
+	defaults: () => ({ style: { fill: q } }),
+	validate: H,
 	shapes(e, t) {
-		let [n, r, i] = E(t, e), a = Ut(n, r, i);
-		return [k(a, {
+		let [n, r, i] = O(t, e), a = Wt(n, r, i);
+		return [j(a, {
 			close: !0,
 			fill: e.style.fill
-		}), ...q(e.style.text, N(a[0], a[2]))];
+		}), ...Ht(e.style.text, F(a[0], a[2]))];
 	}
-}), Gt = z({
+}), Kt = B({
 	id: "ellipse",
 	label: "Ellipse",
 	family: "shapes",
 	gesture: "drag",
 	anchors: 2,
-	defaults: () => ({ style: { fill: K } }),
-	validate: V,
+	defaults: () => ({ style: { fill: q } }),
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = N(n, r);
+		let [n, r] = O(t, e), i = F(n, r);
 		return [{
 			k: "ellipse",
 			cx: i.x,
@@ -2953,18 +2985,18 @@ var Wt = z({
 			rx: Math.abs(r.x - n.x) / 2,
 			ry: Math.abs(r.y - n.y) / 2,
 			fill: e.style.fill
-		}, ...q(e.style.text, i)];
+		}, ...Ht(e.style.text, i)];
 	}
-}), Kt = z({
+}), qt = B({
 	id: "circle",
 	label: "Circle",
 	family: "shapes",
 	gesture: "drag",
 	anchors: 2,
-	defaults: () => ({ style: { fill: K } }),
-	validate: V,
+	defaults: () => ({ style: { fill: q } }),
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = s(n.x, n.y, r.x, r.y);
+		let [n, r] = O(t, e), i = s(n.x, n.y, r.x, r.y);
 		return [
 			{
 				k: "ellipse",
@@ -2974,30 +3006,30 @@ var Wt = z({
 				ry: i,
 				fill: e.style.fill
 			},
-			O(n, r, {
+			A(n, r, {
 				dash: "dotted",
 				width: 1,
 				hit: !1
 			}),
-			...q(e.style.text, n)
+			...Ht(e.style.text, n)
 		];
 	}
-}), qt = z({
+}), Jt = B({
 	id: "triangle",
 	label: "Triangle",
 	family: "shapes",
 	gesture: "clicks",
 	anchors: 3,
-	defaults: () => ({ style: { fill: K } }),
-	validate: V,
+	defaults: () => ({ style: { fill: q } }),
+	validate: H,
 	shapes(e, t) {
-		return [k(E(t, e), {
+		return [j(O(t, e), {
 			close: !0,
 			fill: e.style.fill
 		})];
 	}
 });
-function Jt(e, t, n) {
+function Yt(e, t, n) {
 	let r = m(e, t, n);
 	if (!r) return null;
 	let i = (e) => Math.atan2(e.y - r.cy, e.x - r.cx), a = (e) => (e % (2 * Math.PI) + 2 * Math.PI) % (2 * Math.PI), o = i(e), s = a(i(t) - o), c = a(i(n) - o);
@@ -3007,16 +3039,16 @@ function Jt(e, t, n) {
 		a1: c < s ? o + s : o - (2 * Math.PI - s)
 	};
 }
-var Yt = z({
+var Xt = B({
 	id: "arc",
 	label: "Arc",
 	family: "shapes",
 	gesture: "clicks",
 	anchors: 3,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r, i] = E(t, e), a = Jt(n, r, i);
+		let [n, r, i] = O(t, e), a = Yt(n, r, i);
 		return a ? [{
 			k: "arc",
 			cx: a.cx,
@@ -3025,39 +3057,39 @@ var Yt = z({
 			a0: a.a0,
 			a1: a.a1,
 			fill: e.style.fill
-		}] : [O(n, r)];
+		}] : [A(n, r)];
 	}
-}), Xt = z({
+}), Zt = B({
 	id: "curve",
 	label: "Curve",
 	family: "shapes",
 	gesture: "clicks",
 	anchors: 3,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r, i] = E(t, e);
+		let [n, r, i] = O(t, e);
 		return [{
 			k: "poly",
 			pts: f(n, p(n, i, r), r)
 		}];
 	}
-}), Zt = z({
+}), Qt = B({
 	id: "doubleCurve",
 	label: "Double curve",
 	family: "shapes",
 	gesture: "clicks",
 	anchors: 4,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r, i, a] = E(t, e), o = N(n, r);
+		let [n, r, i, a] = O(t, e), o = F(n, r);
 		return [{
 			k: "poly",
 			pts: [...f(n, p(n, i, o), o), ...f(o, p(o, a, r), r)]
 		}];
 	}
-}), Qt = z({
+}), $t = B({
 	id: "polyline",
 	label: "Polyline",
 	family: "shapes",
@@ -3065,14 +3097,14 @@ var Yt = z({
 	anchors: 2,
 	variable: !0,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		return [k(E(t, e), {
+		return [j(O(t, e), {
 			close: e.style.fill !== null,
 			fill: e.style.fill
 		})];
 	}
-}), $t = z({
+}), en = B({
 	id: "path",
 	label: "Path",
 	family: "shapes",
@@ -3080,12 +3112,12 @@ var Yt = z({
 	anchors: 2,
 	variable: !0,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let n = E(t, e);
-		return [k(n), M(n[n.length - 2], n[n.length - 1], 6 + e.style.width * 2, e.style.color)];
+		let n = O(t, e);
+		return [j(n), P(n[n.length - 2], n[n.length - 1], 6 + e.style.width * 2, e.style.color)];
 	}
-}), en = z({
+}), tn = B({
 	id: "brush",
 	label: "Brush",
 	family: "shapes",
@@ -3094,9 +3126,9 @@ var Yt = z({
 	variable: !0,
 	noHandles: !0,
 	defaults: () => ({ style: { width: 2 } }),
-	validate: V,
-	shapes: (e, t) => [k(E(t, e))]
-}), tn = z({
+	validate: H,
+	shapes: (e, t) => [j(O(t, e))]
+}), nn = B({
 	id: "highlighter",
 	label: "Highlighter",
 	family: "shapes",
@@ -3108,22 +3140,22 @@ var Yt = z({
 		width: 14,
 		color: "rgba(255,235,59,0.4)"
 	} }),
-	validate: V,
-	shapes: (e, t) => [k(E(t, e))]
-}), nn = [
-	Ht,
-	Wt,
+	validate: H,
+	shapes: (e, t) => [j(O(t, e))]
+}), rn = [
+	Ut,
 	Gt,
 	Kt,
 	qt,
-	Yt,
+	Jt,
 	Xt,
 	Zt,
 	Qt,
 	$t,
 	en,
-	tn
-], rn = [
+	tn,
+	nn
+], an = [
 	0,
 	.25,
 	.382,
@@ -3131,7 +3163,7 @@ var Yt = z({
 	.618,
 	.75,
 	1
-], an = (e, t, n) => e.price + (t.price - e.price) * n, on = (e, t, n, r) => e.price + (t.price - e.price) * n / r, sn = [
+], on = (e, t, n) => e.price + (t.price - e.price) * n, sn = (e, t, n, r) => e.price + (t.price - e.price) * n / r, cn = [
 	[8, 1],
 	[4, 1],
 	[3, 1],
@@ -3142,9 +3174,9 @@ var Yt = z({
 	[1, 4],
 	[1, 8]
 ];
-function cn(e, t, n, r, i) {
+function ln(e, t, n, r, i) {
 	let a = [];
-	for (let r of n) a.push(O({
+	for (let r of n) a.push(A({
 		x: e.x + r * (t.x - e.x),
 		y: e.y
 	}, {
@@ -3154,7 +3186,7 @@ function cn(e, t, n, r, i) {
 		width: 1,
 		color: S(i, .7)
 	}));
-	for (let n of r) a.push(O({
+	for (let n of r) a.push(A({
 		x: e.x,
 		y: e.y + n * (t.y - e.y)
 	}, {
@@ -3166,21 +3198,21 @@ function cn(e, t, n, r, i) {
 	}));
 	return a;
 }
-var ln = z({
+var un = B({
 	id: "gannBox",
 	label: "Gann box",
 	family: "gann",
 	gesture: "drag",
 	anchors: 2,
-	defaults: () => ({ props: { levels: rn } }),
+	defaults: () => ({ props: { levels: an } }),
 	validate: (e) => {
-		V(e), B(e, 0, 1), D(e);
+		H(e), V(e, 0, 1), k(e);
 	},
 	shapes(e, t) {
-		let n = w(e, 0), r = w(e, 1), [i, a] = E(t, e), o = D(e), s = (e) => t.Y(an(n, r, e)), c = [];
+		let n = E(e, 0), r = E(e, 1), [i, a] = O(t, e), o = k(e), s = (e) => t.Y(on(n, r, e)), c = [];
 		for (let t = 0; t + 1 < o.length; t += 2) {
 			let n = s(o[t]), r = s(o[t + 1]);
-			c.push(A([
+			c.push(M([
 				{
 					x: i.x,
 					y: n
@@ -3199,8 +3231,8 @@ var ln = z({
 				}
 			], S(e.style.color, .06)));
 		}
-		c.push(...cn(i, a, o, [], e.style.color));
-		for (let t of o) c.push(O({
+		c.push(...ln(i, a, o, [], e.style.color));
+		for (let t of o) c.push(A({
 			x: i.x,
 			y: s(t)
 		}, {
@@ -3210,27 +3242,27 @@ var ln = z({
 			width: 1,
 			color: S(e.style.color, .7)
 		}));
-		c.push(O(i, a), O({
+		c.push(A(i, a), A({
 			x: i.x,
 			y: a.y
 		}, {
 			x: a.x,
 			y: i.y
-		})), c.push(O(i, {
+		})), c.push(A(i, {
 			x: a.x,
 			y: i.y
-		}), O({
+		}), A({
 			x: a.x,
 			y: i.y
-		}, a), O(a, {
+		}, a), A(a, {
 			x: i.x,
 			y: a.y
-		}), O({
+		}), A({
 			x: i.x,
 			y: a.y
 		}, i));
 		for (let l of o) {
-			c.push(j(Math.min(i.x, a.x) - 4, s(l), t.fmt(an(n, r, l)), {
+			c.push(N(Math.min(i.x, a.x) - 4, s(l), t.fmt(on(n, r, l)), {
 				align: "right",
 				base: "middle",
 				size: 10,
@@ -3238,7 +3270,7 @@ var ln = z({
 				hit: !1
 			}));
 			let o = i.x + l * (a.x - i.x);
-			c.push(j(o, Math.min(i.y, a.y) - 4, F(t.T(o)), {
+			c.push(N(o, Math.min(i.y, a.y) - 4, I(t.T(o)), {
 				align: "center",
 				base: "bottom",
 				size: 9,
@@ -3248,7 +3280,7 @@ var ln = z({
 		}
 		return c;
 	}
-}), un = [
+}), dn = [
 	0,
 	1 / 8,
 	2 / 8,
@@ -3259,36 +3291,36 @@ var ln = z({
 	7 / 8,
 	1
 ];
-function dn(e, t, n) {
-	let r = cn(e, t, un, un, n), i = {
+function fn(e, t, n) {
+	let r = ln(e, t, dn, dn, n), i = {
 		x: (e.x + t.x) / 2,
 		y: (e.y + t.y) / 2
 	};
-	return r.push(O(e, t, { extB: !0 }), O({
+	return r.push(A(e, t, { extB: !0 }), A({
 		x: e.x,
 		y: t.y
 	}, {
 		x: t.x,
 		y: e.y
-	}, { extB: !0 })), r.push(O({
+	}, { extB: !0 })), r.push(A({
 		x: i.x,
 		y: e.y
 	}, {
 		x: t.x,
 		y: i.y
-	}, { width: 1 }), O({
+	}, { width: 1 }), A({
 		x: t.x,
 		y: i.y
 	}, {
 		x: i.x,
 		y: t.y
-	}, { width: 1 }), O({
+	}, { width: 1 }), A({
 		x: i.x,
 		y: t.y
 	}, {
 		x: e.x,
 		y: i.y
-	}, { width: 1 }), O({
+	}, { width: 1 }), A({
 		x: e.x,
 		y: i.y
 	}, {
@@ -3296,7 +3328,7 @@ function dn(e, t, n) {
 		y: e.y
 	}, { width: 1 })), r;
 }
-var fn = z({
+var pn = B({
 	id: "gannSquare",
 	label: "Gann square",
 	family: "gann",
@@ -3304,21 +3336,21 @@ var fn = z({
 	anchors: 2,
 	defaults: () => ({}),
 	validate: (e) => {
-		V(e), B(e, 0, 1);
+		H(e), V(e, 0, 1);
 	},
 	shapes: (e, t) => {
-		let [n, r] = E(t, e);
-		return dn(n, r, e.style.color);
+		let [n, r] = O(t, e);
+		return fn(n, r, e.style.color);
 	}
 });
-function pn(e, t) {
-	let n = T(t, e.anchors[0]), r = T(t, e.anchors[1]), i = Math.abs(r.x - n.x);
+function mn(e, t) {
+	let n = D(t, e.anchors[0]), r = D(t, e.anchors[1]), i = Math.abs(r.x - n.x);
 	return {
 		x: r.x,
 		y: n.y + (r.y >= n.y ? i : -i)
 	};
 }
-var mn = z({
+var hn = B({
 	id: "gannSquareFixed",
 	label: "Gann square fixed",
 	family: "gann",
@@ -3326,11 +3358,11 @@ var mn = z({
 	anchors: 2,
 	defaults: () => ({}),
 	validate: (e) => {
-		V(e), B(e, 0, 1);
+		H(e), V(e, 0, 1);
 	},
-	handlePoints: (e, t) => [T(t, w(e, 0)), pn(e, t)],
-	shapes: (e, t) => dn(T(t, w(e, 0)), pn(e, t), e.style.color)
-}), hn = z({
+	handlePoints: (e, t) => [D(t, E(e, 0)), mn(e, t)],
+	shapes: (e, t) => fn(D(t, E(e, 0)), mn(e, t), e.style.color)
+}), gn = B({
 	id: "gannFan",
 	label: "Gann fan",
 	family: "gann",
@@ -3338,15 +3370,15 @@ var mn = z({
 	anchors: 2,
 	defaults: () => ({}),
 	validate(e) {
-		if (V(e), B(e, 0, 1), w(e, 0).price === w(e, 1).price) throw RangeError(`drawings: gannFan "${e.id}" needs anchors at different prices (its 1×1 line would be flat)`);
+		if (H(e), V(e, 0, 1), E(e, 0).price === E(e, 1).price) throw RangeError(`drawings: gannFan "${e.id}" needs anchors at different prices (its 1×1 line would be flat)`);
 	},
 	shapes(e, t) {
-		let n = w(e, 0), r = w(e, 1), i = T(t, n), a = t.X(r.time), o = [], s = sn.map(([e, i]) => ({
+		let n = E(e, 0), r = E(e, 1), i = D(t, n), a = t.X(r.time), o = [], s = cn.map(([e, i]) => ({
 			n: e,
 			m: i,
 			e: {
 				x: a,
-				y: t.Y(on(n, r, e, i))
+				y: t.Y(sn(n, r, e, i))
 			}
 		}));
 		for (let n = 0; n + 1 < s.length; n++) {
@@ -3357,17 +3389,17 @@ var mn = z({
 					y: i.y + r * a
 				};
 			};
-			a > i.x && o.push(A([
+			a > i.x && o.push(M([
 				i,
 				r(s[n].e),
 				r(s[n + 1].e)
 			], S(e.style.color, n % 2 ? .04 : .09)));
 		}
-		for (let { n: t, m: n, e: r } of s) o.push(O(i, r, {
+		for (let { n: t, m: n, e: r } of s) o.push(A(i, r, {
 			extB: !0,
 			extA: !1,
 			width: t === n ? e.style.width : 1
-		}), j(r.x + 3, r.y, `${t}x${n}`, {
+		}), N(r.x + 3, r.y, `${t}x${n}`, {
 			base: "middle",
 			size: 10,
 			textColor: e.style.color,
@@ -3375,14 +3407,14 @@ var mn = z({
 		}));
 		return o;
 	}
-}), gn = [
-	ln,
-	mn,
-	fn,
-	hn
+}), _n = [
+	un,
+	hn,
+	pn,
+	gn
 ], J = (e) => {
-	V(e);
-}, _n = z({
+	H(e);
+}, vn = B({
 	id: "trendLine",
 	label: "Trend line",
 	family: "lines",
@@ -3391,10 +3423,10 @@ var mn = z({
 	defaults: () => ({}),
 	validate: J,
 	shapes: (e, t) => {
-		let n = T(t, w(e, 0)), r = T(t, w(e, 1));
-		return [O(n, r, Oe(e.style, n, r))];
+		let n = D(t, E(e, 0)), r = D(t, E(e, 1));
+		return [A(n, r, De(e.style, n, r))];
 	}
-}), vn = z({
+}), yn = B({
 	id: "ray",
 	label: "Ray",
 	family: "lines",
@@ -3402,11 +3434,11 @@ var mn = z({
 	anchors: 2,
 	defaults: () => ({ style: { extendRight: !0 } }),
 	validate: J,
-	shapes: (e, t) => [O(T(t, w(e, 0)), T(t, w(e, 1)), {
+	shapes: (e, t) => [A(D(t, E(e, 0)), D(t, E(e, 1)), {
 		extA: !1,
 		extB: !0
 	})]
-}), yn = z({
+}), bn = B({
 	id: "extendedLine",
 	label: "Extended line",
 	family: "lines",
@@ -3417,11 +3449,11 @@ var mn = z({
 		extendRight: !0
 	} }),
 	validate: J,
-	shapes: (e, t) => [O(T(t, w(e, 0)), T(t, w(e, 1)), {
+	shapes: (e, t) => [A(D(t, E(e, 0)), D(t, E(e, 1)), {
 		extA: !0,
 		extB: !0
 	})]
-}), bn = z({
+}), xn = B({
 	id: "infoLine",
 	label: "Info line",
 	family: "lines",
@@ -3430,8 +3462,8 @@ var mn = z({
 	defaults: () => ({}),
 	validate: J,
 	shapes(e, t) {
-		let n = w(e, 0), r = w(e, 1), i = T(t, n), a = T(t, r), o = I(n, r, t.source);
-		return [O(i, a, Oe(e.style, i, a)), j((i.x + a.x) / 2, (i.y + a.y) / 2 - 8, [...Ne(o, t), `${F(n.time)} → ${F(r.time)}`].join("\n"), {
+		let n = E(e, 0), r = E(e, 1), i = D(t, n), a = D(t, r), o = L(n, r, t.source);
+		return [A(i, a, De(e.style, i, a)), N((i.x + a.x) / 2, (i.y + a.y) / 2 - 8, [...Ne(o, t), `${I(n.time)} → ${I(r.time)}`].join("\n"), {
 			align: "center",
 			base: "bottom",
 			bg: e.style.color,
@@ -3440,7 +3472,7 @@ var mn = z({
 			pad: 4
 		})];
 	}
-}), xn = z({
+}), Sn = B({
 	id: "horizontalLine",
 	label: "Horizontal line",
 	family: "lines",
@@ -3449,8 +3481,8 @@ var mn = z({
 	defaults: () => ({}),
 	validate: J,
 	shapes(t, n) {
-		let r = T(n, w(t, 0)), i = e(r.y, n.dpr, t.style.width);
-		return [O({
+		let r = D(n, E(t, 0)), i = e(r.y, n.dpr, t.style.width);
+		return [A({
 			x: 0,
 			y: i
 		}, {
@@ -3459,14 +3491,15 @@ var mn = z({
 		}, {
 			extA: !0,
 			extB: !0
-		}), j(n.W - 6, i - 2, n.fmt(w(t, 0).price), {
+		}), N(n.W - 6, i - 2, n.fmt(E(t, 0).price), {
 			align: "right",
 			base: "bottom",
 			textColor: t.style.color,
-			hit: !1
+			hit: !1,
+			stack: !0
 		})];
 	}
-}), Sn = z({
+}), Cn = 72, wn = B({
 	id: "horizontalRay",
 	label: "Horizontal ray",
 	family: "lines",
@@ -3475,21 +3508,28 @@ var mn = z({
 	defaults: () => ({}),
 	validate: J,
 	shapes(t, n) {
-		let r = T(n, w(t, 0)), i = e(r.y, n.dpr, t.style.width);
-		return [O({
+		let r = D(n, E(t, 0)), i = e(r.y, n.dpr, t.style.width), a = r.x >= Cn ? N(r.x - 4, i, n.fmt(E(t, 0).price), {
+			align: "right",
+			base: "middle",
+			textColor: t.style.color,
+			hit: !1,
+			stack: !0
+		}) : N(Math.max(r.x, 0) + 4, i - 2, n.fmt(E(t, 0).price), {
+			align: "left",
+			base: "bottom",
+			textColor: t.style.color,
+			hit: !1,
+			stack: !0
+		});
+		return [A({
 			x: r.x,
 			y: i
 		}, {
 			x: r.x + 1,
 			y: i
-		}, { extB: !0 }), j(n.W - 6, i - 2, n.fmt(w(t, 0).price), {
-			align: "right",
-			base: "bottom",
-			textColor: t.style.color,
-			hit: !1
-		})];
+		}, { extB: !0 }), a];
 	}
-}), Cn = z({
+}), Tn = B({
 	id: "verticalLine",
 	label: "Vertical line",
 	family: "lines",
@@ -3498,8 +3538,8 @@ var mn = z({
 	defaults: () => ({}),
 	validate: J,
 	shapes(t, n) {
-		let r = T(n, w(t, 0)), i = e(r.x, n.dpr, t.style.width);
-		return [O({
+		let r = D(n, E(t, 0)), i = e(r.x, n.dpr, t.style.width);
+		return [A({
 			x: i,
 			y: 0
 		}, {
@@ -3508,13 +3548,13 @@ var mn = z({
 		}, {
 			extA: !0,
 			extB: !0
-		}), j(i + 4, 4, F(w(t, 0).time), {
+		}), N(i + 4, 4, I(E(t, 0).time), {
 			base: "top",
 			textColor: t.style.color,
 			hit: !1
 		})];
 	}
-}), wn = z({
+}), En = B({
 	id: "crossLine",
 	label: "Cross line",
 	family: "lines",
@@ -3523,8 +3563,8 @@ var mn = z({
 	defaults: () => ({}),
 	validate: J,
 	shapes(t, n) {
-		let r = T(n, w(t, 0)), i = e(r.x, n.dpr, t.style.width), a = e(r.y, n.dpr, t.style.width);
-		return [O({
+		let r = D(n, E(t, 0)), i = e(r.x, n.dpr, t.style.width), a = e(r.y, n.dpr, t.style.width);
+		return [A({
 			x: 0,
 			y: a
 		}, {
@@ -3533,7 +3573,7 @@ var mn = z({
 		}, {
 			extA: !0,
 			extB: !0
-		}), O({
+		}), A({
 			x: i,
 			y: 0
 		}, {
@@ -3544,22 +3584,22 @@ var mn = z({
 			extB: !0
 		})];
 	}
-}), Tn = [
-	_n,
+}), Dn = [
 	vn,
-	bn,
 	yn,
 	xn,
+	bn,
 	Sn,
-	Cn,
-	wn
+	wn,
+	Tn,
+	En
 ];
 //#endregion
 //#region src/tools/measure.ts
-function En(e, t) {
+function On(e, t) {
 	return t < 0 ? "#ef5350" : e.style.color;
 }
-var Dn = (e, t, n, r) => j(e, t, n, {
+var kn = (e, t, n, r) => N(e, t, n, {
 	align: "center",
 	base: "middle",
 	bg: S(r, .9),
@@ -3567,26 +3607,26 @@ var Dn = (e, t, n, r) => j(e, t, n, {
 	pad: 4,
 	hit: !1
 });
-function On(e, t) {
-	let n = I(w(e, 0), w(e, 1), t.source), r = n.dPrice < 0 ? "-" : n.dPrice > 0 ? "+" : "";
+function An(e, t) {
+	let n = L(E(e, 0), E(e, 1), t.source), r = n.dPrice < 0 ? "-" : n.dPrice > 0 ? "+" : "";
 	return `${r}${t.fmt(Math.abs(n.dPrice))}${n.pct === null ? "" : ` (${r}${Math.abs(n.pct).toFixed(2)}%)`}`;
 }
-function kn(e, t) {
-	let n = I(w(e, 0), w(e, 1), t.source);
+function jn(e, t) {
+	let n = L(E(e, 0), E(e, 1), t.source);
 	return [n.bars === null ? "" : `${Me(n.bars)} bars`, Ae(n.dTime)].filter(Boolean).join(", ");
 }
-var An = z({
+var Mn = B({
 	id: "dateRange",
 	label: "Date range",
 	family: "measure",
 	gesture: "drag",
 	anchors: 2,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = (n.y + r.y) / 2, a = e.style.color;
+		let [n, r] = O(t, e), i = (n.y + r.y) / 2, a = e.style.color;
 		return [
-			k([
+			j([
 				{
 					x: n.x,
 					y: 0
@@ -3608,7 +3648,7 @@ var An = z({
 				fill: S(a, .1),
 				width: 0
 			}),
-			O({
+			A({
 				x: n.x,
 				y: 0
 			}, {
@@ -3618,7 +3658,7 @@ var An = z({
 				width: 1,
 				color: a
 			}),
-			O({
+			A({
 				x: r.x,
 				y: 0
 			}, {
@@ -3628,7 +3668,7 @@ var An = z({
 				width: 1,
 				color: a
 			}),
-			O({
+			A({
 				x: n.x,
 				y: i
 			}, {
@@ -3638,28 +3678,28 @@ var An = z({
 				width: 1,
 				color: a
 			}),
-			M({
+			P({
 				x: n.x,
 				y: i
 			}, {
 				x: r.x,
 				y: i
 			}, 8, a),
-			Dn((n.x + r.x) / 2, i - 14, kn(e, t), a)
+			kn((n.x + r.x) / 2, i - 14, jn(e, t), a)
 		];
 	}
-}), jn = z({
+}), Nn = B({
 	id: "priceRange",
 	label: "Price range",
 	family: "measure",
 	gesture: "drag",
 	anchors: 2,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = (n.x + r.x) / 2, a = En(e, w(e, 1).price - w(e, 0).price);
+		let [n, r] = O(t, e), i = (n.x + r.x) / 2, a = On(e, E(e, 1).price - E(e, 0).price);
 		return [
-			k([
+			j([
 				{
 					x: 0,
 					y: n.y
@@ -3681,7 +3721,7 @@ var An = z({
 				fill: S(a, .1),
 				width: 0
 			}),
-			O({
+			A({
 				x: 0,
 				y: n.y
 			}, {
@@ -3693,7 +3733,7 @@ var An = z({
 				extA: !0,
 				extB: !0
 			}),
-			O({
+			A({
 				x: 0,
 				y: r.y
 			}, {
@@ -3705,7 +3745,7 @@ var An = z({
 				extA: !0,
 				extB: !0
 			}),
-			O({
+			A({
 				x: i,
 				y: n.y
 			}, {
@@ -3715,28 +3755,28 @@ var An = z({
 				width: 1,
 				color: a
 			}),
-			M({
+			P({
 				x: i,
 				y: n.y
 			}, {
 				x: i,
 				y: r.y
 			}, 8, a),
-			Dn(i, (n.y + r.y) / 2, On(e, t), a)
+			kn(i, (n.y + r.y) / 2, An(e, t), a)
 		];
 	}
-}), Mn = z({
+}), Pn = B({
 	id: "dateAndPriceRange",
 	label: "Date and price range",
 	family: "measure",
 	gesture: "drag",
 	anchors: 2,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = E(t, e), i = En(e, w(e, 1).price - w(e, 0).price), a = (n.x + r.x) / 2, o = (n.y + r.y) / 2;
+		let [n, r] = O(t, e), i = On(e, E(e, 1).price - E(e, 0).price), a = (n.x + r.x) / 2, o = (n.y + r.y) / 2;
 		return [
-			k([
+			j([
 				n,
 				{
 					x: r.x,
@@ -3753,7 +3793,7 @@ var An = z({
 				color: i,
 				width: 1
 			}),
-			O({
+			A({
 				x: a,
 				y: n.y
 			}, {
@@ -3764,14 +3804,14 @@ var An = z({
 				color: i,
 				hit: !1
 			}),
-			M({
+			P({
 				x: a,
 				y: n.y
 			}, {
 				x: a,
 				y: r.y
 			}, 8, i),
-			O({
+			A({
 				x: n.x,
 				y: o
 			}, {
@@ -3782,51 +3822,51 @@ var An = z({
 				color: i,
 				hit: !1
 			}),
-			M({
+			P({
 				x: n.x,
 				y: o
 			}, {
 				x: r.x,
 				y: o
 			}, 8, i),
-			Dn(a, Math.min(n.y, r.y) - 14, `${On(e, t)}\n${kn(e, t)}`, i)
+			kn(a, Math.min(n.y, r.y) - 14, `${An(e, t)}\n${jn(e, t)}`, i)
 		];
 	}
-}), Nn = [
-	An,
-	jn,
-	Mn
+}), Fn = [
+	Mn,
+	Nn,
+	Pn
 ], Y = (e, t) => Math.abs(t.price - e.price);
-function Pn(e, t, n, r, i) {
+function In(e, t, n, r, i) {
 	return {
-		abXa: L(Y(t, n), Y(e, t)),
-		bcAb: L(Y(n, r), Y(t, n)),
-		cdBc: L(Y(r, i), Y(n, r)),
-		adXa: L(Y(t, i), Y(e, t))
+		abXa: R(Y(t, n), Y(e, t)),
+		bcAb: R(Y(n, r), Y(t, n)),
+		cdBc: R(Y(r, i), Y(n, r)),
+		adXa: R(Y(t, i), Y(e, t))
 	};
 }
-function Fn(e, t, n, r, i) {
+function Ln(e, t, n, r, i) {
 	return {
-		abXa: L(Y(t, n), Y(e, t)),
-		xcXa: L(Y(e, r), Y(e, t)),
-		cdXc: L(Y(r, i), Y(e, r))
+		abXa: R(Y(t, n), Y(e, t)),
+		xcXa: R(Y(e, r), Y(e, t)),
+		cdXc: R(Y(r, i), Y(e, r))
 	};
 }
-function In(e, t, n, r) {
+function Rn(e, t, n, r) {
 	return {
-		bcAb: L(Y(t, n), Y(e, t)),
-		cdBc: L(Y(n, r), Y(t, n))
+		bcAb: R(Y(t, n), Y(e, t)),
+		cdBc: R(Y(n, r), Y(t, n))
 	};
 }
-function Ln(e) {
+function zn(e) {
 	if (e.length !== 7) throw RangeError(`three drives needs 7 anchors, got ${e.length}`);
 	let t = e;
 	return [
-		L(Y(t[1], t[2]), Y(t[0], t[1])),
-		L(Y(t[2], t[3]), Y(t[1], t[2])),
-		L(Y(t[3], t[4]), Y(t[2], t[3])),
-		L(Y(t[4], t[5]), Y(t[3], t[4])),
-		L(Y(t[5], t[6]), Y(t[4], t[5]))
+		R(Y(t[1], t[2]), Y(t[0], t[1])),
+		R(Y(t[2], t[3]), Y(t[1], t[2])),
+		R(Y(t[3], t[4]), Y(t[2], t[3])),
+		R(Y(t[4], t[5]), Y(t[3], t[4])),
+		R(Y(t[5], t[6]), Y(t[4], t[5]))
 	];
 }
 function X(e, t, n) {
@@ -3835,7 +3875,7 @@ function X(e, t, n) {
 		let o = t[a];
 		if (!o) return;
 		let s = e[a - 1], c = e[a + 1], l = (!s || i.y <= s.y) && (!c || i.y <= c.y);
-		r.push(j(i.x, i.y + (l ? -6 : 6), o, {
+		r.push(N(i.x, i.y + (l ? -6 : 6), o, {
 			align: "center",
 			base: l ? "bottom" : "top",
 			textColor: n,
@@ -3848,8 +3888,8 @@ var Z = {
 	width: 1,
 	hit: !1
 }, Q = (e, t, n, r) => {
-	let i = N(e, t);
-	return j(i.x, i.y, Pe(n), {
+	let i = F(e, t);
+	return N(i.x, i.y, Pe(n), {
 		align: "center",
 		base: "middle",
 		bg: S(r, .85),
@@ -3858,38 +3898,38 @@ var Z = {
 		size: 10,
 		hit: !1
 	});
-}, Rn = z({
+}, Bn = B({
 	id: "xabcd",
 	label: "XABCD pattern",
 	family: "patterns",
 	gesture: "clicks",
 	anchors: 5,
 	defaults: () => ({ style: { fill: "rgba(41,98,255,0.12)" } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r, i, a, o] = E(t, e), s = Pn(w(e, 0), w(e, 1), w(e, 2), w(e, 3), w(e, 4)), c = e.style.color;
+		let [n, r, i, a, o] = O(t, e), s = In(E(e, 0), E(e, 1), E(e, 2), E(e, 3), E(e, 4)), c = e.style.color;
 		return [
-			A([
+			M([
 				n,
 				r,
 				i
 			], e.style.fill ?? S(c, .12)),
-			A([
+			M([
 				i,
 				a,
 				o
 			], e.style.fill ?? S(c, .12)),
-			k([
+			j([
 				n,
 				r,
 				i,
 				a,
 				o
 			]),
-			O(n, i, Z),
-			O(r, a, Z),
-			O(i, o, Z),
-			O(n, o, Z),
+			A(n, i, Z),
+			A(r, a, Z),
+			A(i, o, Z),
+			A(n, o, Z),
 			Q(n, i, s.abXa, c),
 			Q(r, a, s.bcAb, c),
 			Q(i, o, s.cdBc, c),
@@ -3909,7 +3949,7 @@ var Z = {
 			], c)
 		];
 	}
-}), zn = z({
+}), Vn = B({
 	id: "cypher",
 	label: "Cypher pattern",
 	family: "patterns",
@@ -3919,31 +3959,31 @@ var Z = {
 		fill: "rgba(156,39,176,0.12)",
 		color: "#9c27b0"
 	} }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r, i, a, o] = E(t, e), s = Fn(w(e, 0), w(e, 1), w(e, 2), w(e, 3), w(e, 4)), c = e.style.color;
+		let [n, r, i, a, o] = O(t, e), s = Ln(E(e, 0), E(e, 1), E(e, 2), E(e, 3), E(e, 4)), c = e.style.color;
 		return [
-			A([
+			M([
 				n,
 				r,
 				i
 			], e.style.fill ?? S(c, .12)),
-			A([
+			M([
 				i,
 				a,
 				o
 			], e.style.fill ?? S(c, .12)),
-			k([
+			j([
 				n,
 				r,
 				i,
 				a,
 				o
 			]),
-			O(n, i, Z),
-			O(r, a, Z),
-			O(n, a, Z),
-			O(i, o, Z),
+			A(n, i, Z),
+			A(r, a, Z),
+			A(n, a, Z),
+			A(i, o, Z),
 			Q(n, i, s.abXa, c),
 			Q(n, a, s.xcXa, c),
 			Q(i, o, s.cdXc, c),
@@ -3962,25 +4002,25 @@ var Z = {
 			], c)
 		];
 	}
-}), Bn = z({
+}), Hn = B({
 	id: "abcd",
 	label: "ABCD pattern",
 	family: "patterns",
 	gesture: "clicks",
 	anchors: 4,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r, i, a] = E(t, e), o = In(w(e, 0), w(e, 1), w(e, 2), w(e, 3)), s = e.style.color;
+		let [n, r, i, a] = O(t, e), o = Rn(E(e, 0), E(e, 1), E(e, 2), E(e, 3)), s = e.style.color;
 		return [
-			k([
+			j([
 				n,
 				r,
 				i,
 				a
 			]),
-			O(n, i, Z),
-			O(r, a, Z),
+			A(n, i, Z),
+			A(r, a, Z),
 			Q(n, i, o.bcAb, s),
 			Q(r, a, o.cdBc, s),
 			...X([
@@ -3996,34 +4036,34 @@ var Z = {
 			], s)
 		];
 	}
-}), Vn = z({
+}), Un = B({
 	id: "trianglePattern",
 	label: "Triangle pattern",
 	family: "patterns",
 	gesture: "clicks",
 	anchors: 4,
 	defaults: () => ({ style: { fill: "rgba(41,98,255,0.1)" } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r, i, a] = E(t, e), o = e.style.color, s = [
-			k([
+		let [n, r, i, a] = O(t, e), o = e.style.color, s = [
+			j([
 				n,
 				r,
 				i,
 				a
 			]),
-			O(n, i, {
+			A(n, i, {
 				extB: !0,
 				dash: "dashed",
 				width: 1
 			}),
-			O(r, a, {
+			A(r, a, {
 				extB: !0,
 				dash: "dashed",
 				width: 1
 			})
 		], c = _(n, i, r, a);
-		return c && c.x > Math.max(i.x, a.x) && s.unshift(A([
+		return c && c.x > Math.max(i.x, a.x) && s.unshift(M([
 			n,
 			r,
 			c
@@ -4039,16 +4079,16 @@ var Z = {
 			"D"
 		], o)];
 	}
-}), Hn = z({
+}), Wn = B({
 	id: "threeDrives",
 	label: "Three drives pattern",
 	family: "patterns",
 	gesture: "clicks",
 	anchors: 7,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let n = E(t, e), r = e.style.color, i = Ln(e.anchors), a = [k(n)];
+		let n = O(t, e), r = e.style.color, i = zn(e.anchors), a = [j(n)];
 		return i.forEach((e, t) => a.push(Q(n[t + 1], n[t + 2], e, r))), [...a, ...X(n, [
 			"0",
 			"1",
@@ -4059,39 +4099,39 @@ var Z = {
 			"C"
 		], r)];
 	}
-}), Un = z({
+}), Gn = B({
 	id: "headAndShoulders",
 	label: "Head and shoulders",
 	family: "patterns",
 	gesture: "clicks",
 	anchors: 7,
 	defaults: () => ({ style: { fill: "rgba(239,83,80,0.12)" } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let n = E(t, e), [, r, i, a, o, s] = n, c = e.style.color;
+		let n = O(t, e), [, r, i, a, o, s] = n, c = e.style.color;
 		return [
-			A([
+			M([
 				i,
 				r,
 				a
 			], e.style.fill ?? S(c, .12)),
-			A([
+			M([
 				i,
 				a,
 				o
 			], e.style.fill ?? S(c, .12)),
-			A([
+			M([
 				o,
 				a,
 				s
 			], e.style.fill ?? S(c, .12)),
-			k(n),
-			O(i, o, {
+			j(n),
+			A(i, o, {
 				extB: !0,
 				dash: "dashed",
 				width: 1
 			}),
-			j(o.x + 6, o.y, "Neckline", {
+			N(o.x + 6, o.y, "Neckline", {
 				base: "top",
 				size: 10,
 				textColor: c,
@@ -4109,7 +4149,7 @@ var Z = {
 		];
 	}
 });
-function Wn(e, t) {
+function Kn(e, t) {
 	switch (e) {
 		case "minuette": return `((${t}))`;
 		case "minor": return t;
@@ -4118,7 +4158,7 @@ function Wn(e, t) {
 	}
 }
 function $(e, t, n) {
-	return z({
+	return B({
 		id: e,
 		label: t,
 		family: "elliott",
@@ -4126,7 +4166,7 @@ function $(e, t, n) {
 		anchors: n.length,
 		defaults: () => ({ props: { degree: "intermediate" } }),
 		validate(t) {
-			if (V(t), ![
+			if (H(t), ![
 				"minuette",
 				"minor",
 				"intermediate",
@@ -4134,58 +4174,58 @@ function $(e, t, n) {
 			].includes(t.props.degree)) throw RangeError(`drawings: ${e} "${t.id}" prop "degree" must be minuette, minor, intermediate or primary`);
 		},
 		shapes(e, t) {
-			let r = E(t, e), i = e.props.degree;
-			return [k(r), ...X(r, n.map((e) => e ? Wn(i, e) : ""), e.style.color)];
+			let r = O(t, e), i = e.props.degree;
+			return [j(r), ...X(r, n.map((e) => e ? Kn(i, e) : ""), e.style.color)];
 		}
 	});
 }
-var Gn = $("elliottImpulse", "Elliott impulse wave", [
+var qn = $("elliottImpulse", "Elliott impulse wave", [
 	"",
 	"1",
 	"2",
 	"3",
 	"4",
 	"5"
-]), Kn = $("elliottCorrection", "Elliott correction wave", [
+]), Jn = $("elliottCorrection", "Elliott correction wave", [
 	"",
 	"A",
 	"B",
 	"C"
-]), qn = $("elliottTriangle", "Elliott triangle wave", [
+]), Yn = $("elliottTriangle", "Elliott triangle wave", [
 	"",
 	"A",
 	"B",
 	"C",
 	"D",
 	"E"
-]), Jn = $("elliottDoubleCombo", "Elliott double combo wave", [
+]), Xn = $("elliottDoubleCombo", "Elliott double combo wave", [
 	"",
 	"W",
 	"X",
 	"Y"
-]), Yn = $("elliottTripleCombo", "Elliott triple combo wave", [
+]), Zn = $("elliottTripleCombo", "Elliott triple combo wave", [
 	"",
 	"W",
 	"X",
 	"Y",
 	"X",
 	"Z"
-]), Xn = [
-	Rn,
-	zn,
+]), Qn = [
 	Bn,
 	Vn,
 	Hn,
 	Un,
+	Wn,
 	Gn,
-	Kn,
 	qn,
 	Jn,
-	Yn
+	Yn,
+	Xn,
+	Zn
 ];
 //#endregion
 //#region src/tools/position.ts
-function Zn(e, t, n, r, i = {}) {
+function $n(e, t, n, r, i = {}) {
 	if (!(e === "long" ? n >= t && t >= r : n <= t && t <= r)) throw RangeError(`position: a ${e} needs ${e === "long" ? "target ≥ entry ≥ stop" : "target ≤ entry ≤ stop"}, got target ${n}, entry ${t}, stop ${r}`);
 	let a = Math.abs(t - r), o = Math.abs(n - t), s = null;
 	if (t === 0) throw RangeError("position: entry price 0 has no percent risk");
@@ -4207,22 +4247,22 @@ function Zn(e, t, n, r, i = {}) {
 		loss: s === null ? null : s * a
 	};
 }
-var Qn = (e, t, n) => {
+var er = (e, t, n) => {
 	if (e == null) return null;
 	if (typeof e != "number" || !Number.isFinite(e)) throw TypeError(`drawings: ${n.tool} "${n.id}" prop "${t}" must be a finite number or null`);
 	return e;
 };
-function $n(e, t) {
-	return Zn(e, w(t, 0).price, w(t, 1).price, w(t, 2).price, {
-		accountSize: Qn(t.props.accountSize, "accountSize", t),
-		riskPercent: Qn(t.props.riskPercent, "riskPercent", t) ?? void 0,
-		lotSize: Qn(t.props.lotSize, "lotSize", t) ?? void 0
+function tr(e, t) {
+	return $n(e, E(t, 0).price, E(t, 1).price, E(t, 2).price, {
+		accountSize: er(t.props.accountSize, "accountSize", t),
+		riskPercent: er(t.props.riskPercent, "riskPercent", t) ?? void 0,
+		lotSize: er(t.props.lotSize, "lotSize", t) ?? void 0
 	});
 }
-var er = (e) => e.toFixed(2);
-function tr(e) {
+var nr = (e) => e.toFixed(2);
+function rr(e) {
 	let t = e === "long";
-	return z({
+	return B({
 		id: t ? "longPosition" : "shortPosition",
 		label: t ? "Long position" : "Short position",
 		family: "position",
@@ -4234,13 +4274,13 @@ function tr(e) {
 			lotSize: 1
 		} }),
 		validate(t) {
-			V(t), $n(e, t);
+			H(t), tr(e, t);
 		},
 		constrain(e, n) {
 			let [r, i, a] = [
-				w(e, 0),
-				w(e, 1),
-				w(e, 2)
+				E(e, 0),
+				E(e, 1),
+				E(e, 2)
 			];
 			if (n === 1 || n === 2) {
 				let e = n === 1 ? i.time : a.time;
@@ -4249,8 +4289,8 @@ function tr(e) {
 			t ? (i.price < r.price && (i.price = r.price), a.price > r.price && (a.price = r.price)) : (i.price > r.price && (i.price = r.price), a.price < r.price && (a.price = r.price));
 		},
 		shapes(t, n) {
-			let r = $n(e, t), [i, a, o] = E(n, t), s = Math.min(i.x, a.x), c = Math.max(i.x, a.x), l = "#26a69a", u = "#ef5350", d = [
-				k([
+			let r = tr(e, t), [i, a, o] = O(n, t), s = Math.min(i.x, a.x), c = Math.max(i.x, a.x), l = "#26a69a", u = "#ef5350", d = [
+				j([
 					{
 						x: s,
 						y: i.y
@@ -4272,7 +4312,7 @@ function tr(e) {
 					fill: S(l, .2),
 					width: 0
 				}),
-				k([
+				j([
 					{
 						x: s,
 						y: i.y
@@ -4294,45 +4334,45 @@ function tr(e) {
 					fill: S(u, .2),
 					width: 0
 				}),
-				O({
+				A({
 					x: s,
 					y: i.y
 				}, {
 					x: c,
 					y: i.y
 				}, { color: t.style.color }),
-				O({
+				A({
 					x: s,
 					y: a.y
 				}, {
 					x: c,
 					y: a.y
 				}, { color: l }),
-				O({
+				A({
 					x: s,
 					y: o.y
 				}, {
 					x: c,
 					y: o.y
 				}, { color: u })
-			], f = (e) => `${e < 0 ? "-" : e > 0 ? "+" : ""}${n.fmt(Math.abs(e))}`, p = w(t, 1).price - w(t, 0).price, m = w(t, 2).price - w(t, 0).price, h = [`Target ${n.fmt(w(t, 1).price)} (${f(p)}, ${r.rewardPct.toFixed(2)}%)`];
-			r.profit !== null && h.push(`P&L ${er(r.profit)}`);
-			let g = [`Stop ${n.fmt(w(t, 2).price)} (${f(m)}, ${r.riskPct.toFixed(2)}%)`];
-			r.loss !== null && g.push(`P&L -${er(r.loss)}`);
+			], f = (e) => `${e < 0 ? "-" : e > 0 ? "+" : ""}${n.fmt(Math.abs(e))}`, p = E(t, 1).price - E(t, 0).price, m = E(t, 2).price - E(t, 0).price, h = [`Target ${n.fmt(E(t, 1).price)} (${f(p)}, ${r.rewardPct.toFixed(2)}%)`];
+			r.profit !== null && h.push(`P&L ${nr(r.profit)}`);
+			let g = [`Stop ${n.fmt(E(t, 2).price)} (${f(m)}, ${r.riskPct.toFixed(2)}%)`];
+			r.loss !== null && g.push(`P&L -${nr(r.loss)}`);
 			let _ = (s + c) / 2;
-			d.push(j(_, (i.y + a.y) / 2, h.join("\n"), {
+			d.push(N(_, (i.y + a.y) / 2, h.join("\n"), {
 				align: "center",
 				base: "middle",
 				textColor: l,
 				hit: !1
-			})), d.push(j(_, (i.y + o.y) / 2, g.join("\n"), {
+			})), d.push(N(_, (i.y + o.y) / 2, g.join("\n"), {
 				align: "center",
 				base: "middle",
 				textColor: u,
 				hit: !1
 			}));
-			let ee = [`Entry ${n.fmt(w(t, 0).price)}`, r.rr === null ? "R:R n/a" : `R:R ${r.rr.toFixed(2)}`];
-			return r.qty !== null && ee.push(`Qty ${r.qty}`), d.push(j(_, i.y, ee.join("  "), {
+			let ee = [`Entry ${n.fmt(E(t, 0).price)}`, r.rr === null ? "R:R n/a" : `R:R ${r.rr.toFixed(2)}`];
+			return r.qty !== null && ee.push(`Qty ${r.qty}`), d.push(N(_, i.y, ee.join("  "), {
 				align: "center",
 				base: "middle",
 				bg: S(t.style.color, .9),
@@ -4343,18 +4383,18 @@ function tr(e) {
 		}
 	});
 }
-var nr = tr("long"), rr = tr("short"), ir = z({
+var ir = rr("long"), ar = rr("short"), or = B({
 	id: "forecast",
 	label: "Forecast",
 	family: "position",
 	gesture: "drag",
 	anchors: 2,
 	defaults: () => ({ style: { fill: "rgba(41,98,255,0.15)" } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let [n, r] = [w(e, 0), w(e, 1)], [i, a] = [T(t, n), T(t, r)], o = I(n, r, t.source);
+		let [n, r] = [E(e, 0), E(e, 1)], [i, a] = [D(t, n), D(t, r)], o = L(n, r, t.source);
 		return [
-			A([
+			M([
 				i,
 				{
 					x: a.x,
@@ -4362,7 +4402,7 @@ var nr = tr("long"), rr = tr("short"), ir = z({
 				},
 				a
 			], e.style.fill ?? S(e.style.color, .15)),
-			O(i, {
+			A(i, {
 				x: a.x,
 				y: i.y
 			}, {
@@ -4370,7 +4410,7 @@ var nr = tr("long"), rr = tr("short"), ir = z({
 				width: 1,
 				hit: !1
 			}),
-			O({
+			A({
 				x: a.x,
 				y: i.y
 			}, a, {
@@ -4378,7 +4418,7 @@ var nr = tr("long"), rr = tr("short"), ir = z({
 				width: 1,
 				hit: !1
 			}),
-			O(i, a, { dash: "dashed" }),
+			A(i, a, { dash: "dashed" }),
 			{
 				k: "ellipse",
 				cx: a.x,
@@ -4388,7 +4428,7 @@ var nr = tr("long"), rr = tr("short"), ir = z({
 				fill: e.style.color,
 				width: 1
 			},
-			j(a.x + 8, a.y, Ne(o, t).join("\n"), {
+			N(a.x + 8, a.y, Ne(o, t).join("\n"), {
 				align: "left",
 				base: "middle",
 				bg: e.style.color,
@@ -4399,35 +4439,35 @@ var nr = tr("long"), rr = tr("short"), ir = z({
 		];
 	}
 });
-function ar(e, t, n) {
+function sr(e, t, n) {
 	return n.price + (t.price - e.price);
 }
-var or = z({
+var cr = B({
 	id: "projection",
 	label: "Projection",
 	family: "position",
 	gesture: "clicks",
 	anchors: 3,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
 		let [n, r, i] = [
-			w(e, 0),
-			w(e, 1),
-			w(e, 2)
-		], [a, o, s] = E(t, e), c = {
+			E(e, 0),
+			E(e, 1),
+			E(e, 2)
+		], [a, o, s] = O(t, e), c = {
 			x: s.x + (o.x - a.x),
-			y: t.Y(ar(n, r, i))
+			y: t.Y(sr(n, r, i))
 		};
 		return [
-			O(a, o),
-			O(s, c, { dash: "dashed" }),
-			O(a, s, {
+			A(a, o),
+			A(s, c, { dash: "dashed" }),
+			A(a, s, {
 				dash: "dotted",
 				width: 1,
 				hit: !1
 			}),
-			O(o, c, {
+			A(o, c, {
 				dash: "dotted",
 				width: 1,
 				hit: !1
@@ -4441,7 +4481,7 @@ var or = z({
 				fill: e.style.color,
 				width: 1
 			},
-			j(c.x + 6, c.y, t.fmt(ar(n, r, i)), {
+			N(c.x + 6, c.y, t.fmt(sr(n, r, i)), {
 				align: "left",
 				base: "middle",
 				textColor: e.style.color,
@@ -4449,12 +4489,12 @@ var or = z({
 			})
 		];
 	}
-}), sr = "#26a69a", cr = "#ef5350";
-function lr(e, t, n, r, i, a, o) {
-	let s = a >= n ? sr : cr;
+}), lr = "#26a69a", ur = "#ef5350";
+function dr(e, t, n, r, i, a, o) {
+	let s = a >= n ? lr : ur;
 	if (o) {
 		let o = Math.min(n, a), c = Math.max(n, a);
-		return [O({
+		return [A({
 			x: e,
 			y: r
 		}, {
@@ -4463,7 +4503,7 @@ function lr(e, t, n, r, i, a, o) {
 		}, {
 			color: s,
 			width: 1
-		}), k([
+		}), j([
 			{
 				x: e - t,
 				y: o
@@ -4488,7 +4528,7 @@ function lr(e, t, n, r, i, a, o) {
 		})];
 	}
 	return [
-		O({
+		A({
 			x: e,
 			y: r
 		}, {
@@ -4498,7 +4538,7 @@ function lr(e, t, n, r, i, a, o) {
 			color: s,
 			width: 1
 		}),
-		O({
+		A({
 			x: e - t,
 			y: n
 		}, {
@@ -4508,7 +4548,7 @@ function lr(e, t, n, r, i, a, o) {
 			color: s,
 			width: 1
 		}),
-		O({
+		A({
 			x: e,
 			y: a
 		}, {
@@ -4520,12 +4560,12 @@ function lr(e, t, n, r, i, a, o) {
 		})
 	];
 }
-function ur(e, t) {
+function fr(e, t) {
 	if (!e.source) throw Error(`${t} needs a BarSource`);
 	return e.source;
 }
-function dr(e, t, n) {
-	let r = ur(e, n), i = w(t, 0).time, a = w(t, 1).time, [o, s] = r.range(Math.min(i, a), Math.max(i, a));
+function pr(e, t, n) {
+	let r = fr(e, n), i = E(t, 0).time, a = E(t, 1).time, [o, s] = r.range(Math.min(i, a), Math.max(i, a));
 	if (s <= o) throw RangeError(`${n} "${t.id}": no bars between the first two anchors`);
 	return {
 		src: r,
@@ -4533,7 +4573,7 @@ function dr(e, t, n) {
 		hi: s
 	};
 }
-function fr(e, t) {
+function mr(e, t) {
 	let n = e[0];
 	if (!n) throw RangeError("patternBars: no bars");
 	let r = t - n.close;
@@ -4545,7 +4585,7 @@ function fr(e, t) {
 		close: e.close + r
 	}));
 }
-var pr = z({
+var hr = B({
 	id: "barsPattern",
 	label: "Bars pattern",
 	family: "position",
@@ -4553,12 +4593,12 @@ var pr = z({
 	anchors: 3,
 	needsSource: !0,
 	defaults: () => ({}),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
-		let { src: n, lo: r, hi: i } = dr(t, e, "barsPattern"), a = [];
+		let { src: n, lo: r, hi: i } = pr(t, e, "barsPattern"), a = [];
 		for (let e = r; e < i; e++) a.push(n.at(e));
-		let o = fr(a, w(e, 2).price), s = t.X(a[0].time), c = t.X(w(e, 2).time), l = Math.max(1, (a.length > 1 ? Math.abs(t.X(a[1].time) - s) : 6) * .35), u = [], d = t.X(w(e, 0).time), f = t.X(w(e, 1).time);
-		u.push(O({
+		let o = mr(a, E(e, 2).price), s = t.X(a[0].time), c = t.X(E(e, 2).time), l = Math.max(1, (a.length > 1 ? Math.abs(t.X(a[1].time) - s) : 6) * .35), u = [], d = t.X(E(e, 0).time), f = t.X(E(e, 1).time);
+		u.push(A({
 			x: d,
 			y: 0
 		}, {
@@ -4569,7 +4609,7 @@ var pr = z({
 			width: 1,
 			extA: !0,
 			extB: !0
-		}), O({
+		}), A({
 			x: f,
 			y: 0
 		}, {
@@ -4583,12 +4623,12 @@ var pr = z({
 		}));
 		for (let e = 0; e < o.length; e++) {
 			let n = o[e], r = c + (t.X(a[e].time) - s);
-			u.push(...lr(r, l, t.Y(n.open), t.Y(n.high), t.Y(n.low), t.Y(n.close), !1));
+			u.push(...dr(r, l, t.Y(n.open), t.Y(n.high), t.Y(n.low), t.Y(n.close), !1));
 		}
 		return u;
 	}
 });
-function mr(e) {
+function gr(e) {
 	let t = e >>> 0;
 	return () => {
 		t = t + 1831565813 >>> 0;
@@ -4596,9 +4636,9 @@ function mr(e) {
 		return e = Math.imul(e ^ e >>> 15, e | 1), e ^= e + Math.imul(e ^ e >>> 7, e | 61), ((e ^ e >>> 14) >>> 0) / 4294967296;
 	};
 }
-function hr(e, t, n, r) {
+function _r(e, t, n, r) {
 	if (e.length === 0) throw RangeError("ghostBars: no history to sample");
-	let i = mr(r), a = [], o = t;
+	let i = gr(r), a = [], o = t;
 	for (let t = 0; t < n; t++) {
 		let t = e[Math.floor(i() * e.length)], n = o, r = n + (t.close - t.open);
 		a.push({
@@ -4610,7 +4650,7 @@ function hr(e, t, n, r) {
 	}
 	return a;
 }
-var gr = z({
+var vr = B({
 	id: "ghostFeed",
 	label: "Ghost feed (resampled bars)",
 	family: "position",
@@ -4622,35 +4662,35 @@ var gr = z({
 		count: 30
 	} }),
 	validate(e) {
-		V(e);
+		H(e);
 		let t = e.props.count, n = e.props.seed;
 		if (typeof t != "number" || !Number.isInteger(t) || t < 1 || t > 5e3) throw RangeError(`drawings: ghostFeed "${e.id}" prop "count" must be an integer in 1..5000`);
 		if (typeof n != "number" || !Number.isInteger(n)) throw RangeError(`drawings: ghostFeed "${e.id}" prop "seed" must be an integer`);
 	},
 	shapes(e, t) {
-		let { src: n, lo: r, hi: i } = dr(t, e, "ghostFeed"), a = [];
+		let { src: n, lo: r, hi: i } = pr(t, e, "ghostFeed"), a = [];
 		for (let e = r; e < i; e++) a.push(n.at(e));
-		let o = hr(a, w(e, 2).price, e.props.count, e.props.seed), s = w(e, 2).time, c = Math.max(1, Math.abs(t.X(s + n.interval) - t.X(s)) * .35), l = [];
-		o.forEach((e, r) => l.push(...lr(t.X(s + r * n.interval), c, t.Y(e.open), t.Y(e.high), t.Y(e.low), t.Y(e.close), !0)));
-		let u = T(t, w(e, 2));
-		return l.push(j(u.x, u.y - 6, "ghost feed", {
+		let o = _r(a, E(e, 2).price, e.props.count, e.props.seed), s = E(e, 2).time, c = Math.max(1, Math.abs(t.X(s + n.interval) - t.X(s)) * .35), l = [];
+		o.forEach((e, r) => l.push(...dr(t.X(s + r * n.interval), c, t.Y(e.open), t.Y(e.high), t.Y(e.low), t.Y(e.close), !0)));
+		let u = D(t, E(e, 2));
+		return l.push(N(u.x, u.y - 6, "ghost feed", {
 			base: "bottom",
 			size: 10,
 			textColor: e.style.color,
 			hit: !1
 		})), l;
 	}
-}), _r = [
-	nr,
-	rr,
+}), yr = [
 	ir,
+	ar,
 	or,
-	pr,
-	gr
+	cr,
+	hr,
+	vr
 ];
 //#endregion
 //#region src/tools/volume.ts
-function vr(e, t) {
+function br(e, t) {
 	if (!Number.isInteger(t) || t < 0 || t >= e.length) throw RangeError(`anchoredVwap: start ${t} outside 0..${e.length - 1}`);
 	let n = e.length - t, r = new Float64Array(n), i = new Float64Array(n), a = 0, o = 0;
 	for (let s = 0; s < n; s++) {
@@ -4662,24 +4702,24 @@ function vr(e, t) {
 		values: i
 	};
 }
-function yr(e, t) {
+function xr(e, t) {
 	if (e.length === 0) return null;
 	let [n, r] = e.range(t, t);
 	return r > n ? n : n >= e.length ? null : Math.max(0, n - 1);
 }
-var br = /* @__PURE__ */ new WeakMap();
-function xr(e, t) {
-	let n = br.get(e);
-	n || br.set(e, n = /* @__PURE__ */ new Map());
+var Sr = /* @__PURE__ */ new WeakMap();
+function Cr(e, t) {
+	let n = Sr.get(e);
+	n || Sr.set(e, n = /* @__PURE__ */ new Map());
 	let r = n.get(t);
 	if (r && r.version === e.version) return r.series;
-	let i = vr(e, t);
+	let i = br(e, t);
 	return n.size > 64 && n.clear(), n.set(t, {
 		version: e.version,
 		series: i
 	}), i;
 }
-var Sr = z({
+var wr = B({
 	id: "anchoredVwap",
 	label: "Anchored VWAP",
 	family: "volume",
@@ -4687,10 +4727,10 @@ var Sr = z({
 	anchors: 1,
 	needsSource: !0,
 	defaults: () => ({ style: { color: "#ff9800" } }),
-	validate: V,
+	validate: H,
 	shapes(e, t) {
 		if (!t.source) throw Error("anchoredVwap needs a BarSource");
-		let n = T(t, w(e, 0)), r = [{
+		let n = D(t, E(e, 0)), r = [{
 			k: "ellipse",
 			cx: n.x,
 			cy: n.y,
@@ -4698,9 +4738,9 @@ var Sr = z({
 			ry: 4,
 			fill: e.style.color,
 			width: 1
-		}], i = yr(t.source, w(e, 0).time);
+		}], i = xr(t.source, E(e, 0).time);
 		if (i === null) return r;
-		let a = xr(t.source, i), o = t.T(-2), s = t.T(t.W + 2), c = (e) => {
+		let a = Cr(t.source, i), o = t.T(-2), s = t.T(t.W + 2), c = (e) => {
 			let t = 0, n = a.times.length;
 			for (; t < n;) {
 				let r = t + n >> 1;
@@ -4715,7 +4755,7 @@ var Sr = z({
 		}), r;
 	}
 });
-function Cr(e, t, n, r) {
+function Tr(e, t, n, r) {
 	if (!Number.isInteger(r) || r < 1) throw RangeError(`volumeProfile: rows must be a positive integer, got ${r}`);
 	if (n <= t) throw RangeError("volumeProfile: no bars in the range");
 	let i = Infinity, a = -Infinity;
@@ -4748,12 +4788,12 @@ function Cr(e, t, n, r) {
 		poc: l
 	};
 }
-function wr(e, t) {
-	let [n, r] = t.range(Math.min(w(e, 0).time, w(e, 1).time), Math.max(w(e, 0).time, w(e, 1).time));
+function Er(e, t) {
+	let [n, r] = t.range(Math.min(E(e, 0).time, E(e, 1).time), Math.max(E(e, 0).time, E(e, 1).time));
 	if (r <= n) throw RangeError(`drawings: volumeProfile "${e.id}" has no bars between its anchors`);
 	return [n, r];
 }
-var Tr = z({
+var Dr = B({
 	id: "volumeProfile",
 	label: "Fixed range volume profile (bar-level approximation)",
 	family: "volume",
@@ -4762,13 +4802,13 @@ var Tr = z({
 	needsSource: !0,
 	defaults: () => ({ props: { rows: 24 } }),
 	validate(e) {
-		V(e), B(e, 0, 1);
+		H(e), V(e, 0, 1);
 		let t = e.props.rows;
 		if (typeof t != "number" || !Number.isInteger(t) || t < 1 || t > 500) throw RangeError(`drawings: volumeProfile "${e.id}" prop "rows" must be an integer in 1..500`);
 	},
 	shapes(e, t) {
 		if (!t.source) throw Error("volumeProfile needs a BarSource");
-		let [n, r] = wr(e, t.source), i = e.props.rows, a = Cr(t.source, n, r, i), o = t.X(w(e, 0).time), s = t.X(w(e, 1).time), c = Math.min(o, s), l = Math.max(o, s), u = (l - c) * .6, d = a.volumes[a.poc], f = [O({
+		let [n, r] = Er(e, t.source), i = e.props.rows, a = Tr(t.source, n, r, i), o = t.X(E(e, 0).time), s = t.X(E(e, 1).time), c = Math.min(o, s), l = Math.max(o, s), u = (l - c) * .6, d = a.volumes[a.poc], f = [A({
 			x: c,
 			y: 0
 		}, {
@@ -4779,7 +4819,7 @@ var Tr = z({
 			width: 1,
 			extA: !0,
 			extB: !0
-		}), O({
+		}), A({
 			x: l,
 			y: 0
 		}, {
@@ -4811,32 +4851,32 @@ var Tr = z({
 					y: o
 				}
 			];
-			f.push(k(l, {
+			f.push(j(l, {
 				close: !0,
 				fill: S(r === a.poc ? "#ff9800" : e.style.color, r === a.poc ? .6 : .35),
 				width: 0
 			}));
-		}), f.push(j(c + 4, 4, "Volume profile (bar-level approximation)", {
+		}), f.push(N(c + 4, 4, "Volume profile (bar-level approximation)", {
 			base: "top",
 			size: 10,
 			textColor: e.style.color,
 			hit: !1
 		})), f;
 	}
-}), Er = [Sr, Tr], Dr = [
-	...Tn,
+}), Or = [wr, Dr], kr = [
+	...Dn,
 	...gt,
 	...Vt,
-	...gn,
-	...nn,
+	..._n,
+	...rn,
 	...tt,
-	..._r,
-	...Nn,
-	...Xn,
+	...yr,
+	...Fn,
+	...Qn,
 	...wt,
-	...Er
+	...Or
 ];
 //#endregion
-export { y as AddCommand, Ee as ArrayBarSource, ie as BatchCommand, ye as DEFAULT_STYLE, xe as DRAG_SLOP, we as DUPLICATE_BARS, te as DrawingStore, Te as DrawingsPlugin, Dt as FIB_SEQUENCE, sn as GANN_RATIOS, ae as History, b as PatchCommand, ne as RemoveCommand, re as ReorderCommand, be as SCHEMA_VERSION, Se as TOLERANCE, ve as TemplateStore, Ce as WEAK_MAGNET_PX, Bn as abcd, In as abcdRatios, Dr as allTools, Ue as anchoredNote, Be as anchoredText, vr as anchoredVwap, Sr as anchoredVwapTool, tt as annotationTools, Yt as arc, Jt as arcThrough, Xe as arrow, et as arrowMarkDown, $e as arrowMarkUp, Ze as arrowMarker, pr as barsPattern, en as brush, We as callout, gt as channelTools, Kt as circle, Ge as comment, wn as crossLine, Xt as curve, wt as cycleTools, bt as cyclicLines, zn as cypher, Fn as cypherRatios, Mn as dateAndPriceRange, An as dateRange, lt as disjointChannel, Zt as doubleCurve, pe as drawShapes, Ln as driveRatios, Kn as elliottCorrection, Jn as elliottDoubleCombo, Gn as elliottImpulse, qn as elliottTriangle, Yn as elliottTripleCombo, Gt as ellipse, yn as extendedLine, jt as fibChannel, It as fibCircles, At as fibExtension, Et as fibExtensionPrice, kt as fibRetracement, Tt as fibRetracementPrice, zt as fibSpeedArcs, Pt as fibSpeedFan, Lt as fibSpiral, Mt as fibTimeZone, Vt as fibTools, Ft as fibTrendTime, Bt as fibWedge, nn as figureTools, Ye as flagMark, ct as flatTopBottom, Ae as fmtDuration, F as fmtTime, ir as forecast, ut as forkGeometry, ln as gannBox, an as gannBoxPrice, hn as gannFan, on as gannFanPrice, fn as gannSquare, mn as gannSquareFixed, gn as gannTools, o as geometry, hr as ghostBars, gr as ghostFeed, Un as headAndShoulders, tn as highlighter, xn as horizontalLine, Sn as horizontalRay, bn as infoLine, mt as insidePitchfork, Tn as lineTools, nr as longPosition, I as measure, Nn as measureTools, pt as modifiedSchiffPitchfork, He as note, it as parallelChannel, $t as path, fr as patternBars, Xn as patternTools, ht as pitchfan, dt as pitchfork, Qt as polyline, Zn as positionStats, _r as positionTools, Ke as priceLabel, qe as priceNote, jn as priceRange, or as projection, ar as projectionTarget, vn as ray, Ht as rectangle, at as regression, ot as regressionOf, st as regressionTrendChannel, Ut as rotatedRectCorners, Wt as rotatedRectangle, ft as schiffPitchfork, mr as seeded, he as shapeDistance, ge as shapeInRect, rr as shortPosition, Je as signpost, Ct as sineLine, St as sineY, yr as startIndex, ze as textTool, Hn as threeDrives, xt as timeCycles, _n as trendLine, qt as triangle, Vn as trianglePattern, Cn as verticalLine, Cr as volumeProfile, Tr as volumeProfileTool, Er as volumeTools, Wn as waveLabel, S as withAlpha, Rn as xabcd, Pn as xabcdRatios };
+export { y as AddCommand, Te as ArrayBarSource, ie as BatchCommand, T as DEFAULT_STYLE, be as DRAG_SLOP, Ce as DUPLICATE_BARS, te as DrawingStore, we as DrawingsPlugin, Dt as FIB_SEQUENCE, cn as GANN_RATIOS, ae as History, b as PatchCommand, ne as RemoveCommand, re as ReorderCommand, ye as SCHEMA_VERSION, xe as TOLERANCE, ve as TemplateStore, Se as WEAK_MAGNET_PX, Hn as abcd, Rn as abcdRatios, kr as allTools, Ue as anchoredNote, Be as anchoredText, br as anchoredVwap, wr as anchoredVwapTool, tt as annotationTools, Xt as arc, Yt as arcThrough, Xe as arrow, et as arrowMarkDown, $e as arrowMarkUp, Ze as arrowMarker, hr as barsPattern, tn as brush, We as callout, gt as channelTools, qt as circle, Ge as comment, En as crossLine, Zt as curve, wt as cycleTools, bt as cyclicLines, Vn as cypher, Ln as cypherRatios, Pn as dateAndPriceRange, Mn as dateRange, le as declutter, lt as disjointChannel, Qt as doubleCurve, pe as drawShapes, zn as driveRatios, Jn as elliottCorrection, Xn as elliottDoubleCombo, qn as elliottImpulse, Yn as elliottTriangle, Zn as elliottTripleCombo, Kt as ellipse, bn as extendedLine, jt as fibChannel, It as fibCircles, At as fibExtension, Et as fibExtensionPrice, kt as fibRetracement, Tt as fibRetracementPrice, zt as fibSpeedArcs, Pt as fibSpeedFan, Lt as fibSpiral, Mt as fibTimeZone, Vt as fibTools, Ft as fibTrendTime, Bt as fibWedge, rn as figureTools, Ye as flagMark, ct as flatTopBottom, Ae as fmtDuration, I as fmtTime, or as forecast, ut as forkGeometry, un as gannBox, on as gannBoxPrice, gn as gannFan, sn as gannFanPrice, pn as gannSquare, hn as gannSquareFixed, _n as gannTools, o as geometry, _r as ghostBars, vr as ghostFeed, Gn as headAndShoulders, nn as highlighter, Sn as horizontalLine, wn as horizontalRay, xn as infoLine, mt as insidePitchfork, Dn as lineTools, ir as longPosition, L as measure, Fn as measureTools, pt as modifiedSchiffPitchfork, He as note, it as parallelChannel, en as path, mr as patternBars, Qn as patternTools, ht as pitchfan, dt as pitchfork, $t as polyline, $n as positionStats, yr as positionTools, Ke as priceLabel, qe as priceNote, Nn as priceRange, cr as projection, sr as projectionTarget, yn as ray, Ut as rectangle, at as regression, ot as regressionOf, st as regressionTrendChannel, Wt as rotatedRectCorners, Gt as rotatedRectangle, ft as schiffPitchfork, gr as seeded, he as shapeDistance, ge as shapeInRect, ar as shortPosition, Je as signpost, Ct as sineLine, St as sineY, xr as startIndex, ze as textTool, Wn as threeDrives, xt as timeCycles, vn as trendLine, Jt as triangle, Un as trianglePattern, Tn as verticalLine, Tr as volumeProfile, Dr as volumeProfileTool, Or as volumeTools, Kn as waveLabel, S as withAlpha, Bn as xabcd, In as xabcdRatios };
 
 //# sourceMappingURL=index.js.map