@weasel-js/core 1.10.1 → 1.11.1

package/dist/canvas/getNodeAtPoint.js

@@ -1,14 +1,17 @@
 //#region src/canvas/getNodeAtPoint.ts
-function e(e, t) {
-	return (n, r, i) => {
-		let a = e(n, r, i);
-		return a == null ? null : {
-			id: a,
-			kind: t?.(a)?.kind ?? "unknown"
+/** The node a single-hit picker names under a world point, with its kind:
+*  `'unknown'` when `nodeResolver` is absent or returns null. */
+function makeGetNodeAtPoint(pickBest, nodeResolver) {
+	return (wx, wy, view) => {
+		const id = pickBest(wx, wy, view);
+		if (id == null) return null;
+		return {
+			id,
+			kind: nodeResolver?.(id)?.kind ?? "unknown"
 		};
 	};
 }
-//#endregion
-export { e as makeGetNodeAtPoint };
 
+//#endregion
+export { makeGetNodeAtPoint };
 //# sourceMappingURL=getNodeAtPoint.js.map

package/dist/canvas/getNodeAtPoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"getNodeAtPoint.js","names":["makeGetNodeAtPoint","id","pickBest","wx","wy","view","nodeResolver"],"sources":["../../src/canvas/getNodeAtPoint.ts"],"sourcesContent":["import type { PickView } from './SceneCanvas/useSceneSelectTool';\n\n/** The hit record returned by a `getNodeAtPoint` function. */\nexport interface NodeAtPointHit {\n  id: string;\n  kind: string;\n}\n\n/** Resolves a node's routing kind. */\nexport type NodeResolver = (id: string) => { kind: string } | null;\n\n/** The node a single-hit picker names under a world point, with its kind:\n *  `'unknown'` when `nodeResolver` is absent or returns null. */\nexport function makeGetNodeAtPoint(\n  pickBest: (wx: number, wy: number, view?: PickView | null) => string | null,\n  nodeResolver?: NodeResolver,\n): (wx: number, wy: number, view?: PickView | null) => NodeAtPointHit | null {\n  return (wx: number, wy: number, view?: PickView | null): NodeAtPointHit | null => {\n    const id = pickBest(wx, wy, view);\n    if (id == null) return null;\n\n    return { id, kind: nodeResolver?.(id)?.kind ?? 'unknown' };\n  };\n}\n"],"mappings":";AAaA,SAAgBA,EACd,GACA,GAC2E;CAC3E,QAAQ,GAAY,GAAY,MAAkD;EAChF,IAAMC,IAAKC,EAASC,GAAIC,GAAIC,CAAI;EAGhC,OAFIJ,KAAM,OAAa,OAEhB;GAAE;GAAI,MAAMK,IAAeL,CAAE,CAAC,EAAE,QAAQ;EAAU;CAC3D;AACF"}
+{"version":3,"file":"getNodeAtPoint.js","names":[],"sources":["../../src/canvas/getNodeAtPoint.ts"],"sourcesContent":["import type { PickView } from './SceneCanvas/useSceneSelectTool';\n\n/** The hit record returned by a `getNodeAtPoint` function. */\nexport interface NodeAtPointHit {\n  id: string;\n  kind: string;\n}\n\n/** Resolves a node's routing kind. */\nexport type NodeResolver = (id: string) => { kind: string } | null;\n\n/** The node a single-hit picker names under a world point, with its kind:\n *  `'unknown'` when `nodeResolver` is absent or returns null. */\nexport function makeGetNodeAtPoint(\n  pickBest: (wx: number, wy: number, view?: PickView | null) => string | null,\n  nodeResolver?: NodeResolver,\n): (wx: number, wy: number, view?: PickView | null) => NodeAtPointHit | null {\n  return (wx: number, wy: number, view?: PickView | null): NodeAtPointHit | null => {\n    const id = pickBest(wx, wy, view);\n    if (id == null) return null;\n\n    return { id, kind: nodeResolver?.(id)?.kind ?? 'unknown' };\n  };\n}\n"],"mappings":";;;AAaA,SAAgB,mBACd,UACA,cAC2E;CAC3E,QAAQ,IAAY,IAAY,SAAkD;EAChF,MAAM,KAAK,SAAS,IAAI,IAAI,IAAI;EAChC,IAAI,MAAM,MAAM,OAAO;EAEvB,OAAO;GAAE;GAAI,MAAM,eAAe,EAAE,CAAC,EAAE,QAAQ;EAAU;CAC3D;AACF"}

package/dist/canvas/hostAnchor.js

@@ -1,29 +1,46 @@
-import { clampRectWithin as e } from "@weasel-js/geom";
+import { clampRectWithin } from "@weasel-js/geom";
+
 //#region src/canvas/hostAnchor.ts
-function t(e, t, n, r, i) {
-	return r === "start" ? e + i : r === "end" ? e + t - n - i : e + (t - n) / 2 + i;
+function insetAlong(start, extent, size, align, by) {
+	if (align === "start") return start + by;
+	if (align === "end") return start + extent - size - by;
+	return start + (extent - size) / 2 + by;
 }
-function n(n) {
-	let { host: r, panel: i, viewport: a, align: o, offset: s, padding: c = 0 } = n, l = {
-		x: t(r.x, r.width, i.width, o.x, s.x),
-		y: t(r.y, r.height, i.height, o.y, s.y),
-		width: i.width,
-		height: i.height
+/**
+* Where a fixed-position panel held against a host element's corner lands, once
+* it has been kept inside the viewport. Returns a rect rather than CSS so the
+* caller decides which edges to pin — see {@link hostAnchorCss}.
+*/
+function hostAnchorRect(input) {
+	const { host, panel, viewport, align, offset, padding = 0 } = input;
+	const desired = {
+		x: insetAlong(host.x, host.width, panel.width, align.x, offset.x),
+		y: insetAlong(host.y, host.height, panel.height, align.y, offset.y),
+		width: panel.width,
+		height: panel.height
 	};
-	return e(l, {
+	return clampRectWithin(desired, {
 		x: 0,
 		y: 0,
-		width: a.width,
-		height: a.height
-	}, c);
+		width: viewport.width,
+		height: viewport.height
+	}, padding);
 }
-function r(e, t, n) {
+/**
+* CSS for a resolved rect, pinning whichever edges the alignment names.
+*
+* Pinning matters beyond taste: a panel whose width tracks its content holds
+* the anchored edge still and grows away from it. Pin the wrong edge and the
+* anchored corner drifts on every content change, correcting only once a
+* resize observer catches up.
+*/
+function hostAnchorCss(rect, align, viewport) {
 	return {
-		...t.y === "end" ? { bottom: n.height - e.y - e.height } : { top: e.y },
-		...t.x === "end" ? { right: n.width - e.x - e.width } : { left: e.x }
+		...align.y === "end" ? { bottom: viewport.height - rect.y - rect.height } : { top: rect.y },
+		...align.x === "end" ? { right: viewport.width - rect.x - rect.width } : { left: rect.x }
 	};
 }
-//#endregion
-export { r as hostAnchorCss, n as hostAnchorRect };
 
+//#endregion
+export { hostAnchorCss, hostAnchorRect };
 //# sourceMappingURL=hostAnchor.js.map

package/dist/canvas/hostAnchor.js.map

@@ -1 +1 @@
-{"version":3,"file":"hostAnchor.js","names":["insetAlong","align","start","by","extent","size","hostAnchorRect","input","desired","host","panel","offset","clampRectWithin","viewport","padding","hostAnchorCss","rect"],"sources":["../../src/canvas/hostAnchor.ts"],"sourcesContent":["import { clampRectWithin, type PlacementAlign, type Rect } from '@weasel-js/geom';\n\n/** Which of the host's edges the panel is held against, per axis. */\nexport interface HostAnchorAlign {\n  x: PlacementAlign;\n  y: PlacementAlign;\n}\n\n/** Inset from the anchored corner, in CSS pixels, positive going inward. */\nexport interface HostAnchorOffset {\n  x: number;\n  y: number;\n}\n\n/** Everything {@link hostAnchorRect} needs, all in viewport coordinates. */\nexport interface HostAnchorInput {\n  host: Rect;\n  panel: { width: number; height: number };\n  viewport: { width: number; height: number };\n  align: HostAnchorAlign;\n  offset: HostAnchorOffset;\n  /** Minimum gap kept between the panel and the viewport edge. Default 0. */\n  padding?: number;\n}\n\nfunction insetAlong(start: number, extent: number, size: number, align: PlacementAlign, by: number): number {\n  if (align === 'start') return start + by;\n  if (align === 'end') return start + extent - size - by;\n  return start + (extent - size) / 2 + by;\n}\n\n/**\n * Where a fixed-position panel held against a host element's corner lands, once\n * it has been kept inside the viewport. Returns a rect rather than CSS so the\n * caller decides which edges to pin — see {@link hostAnchorCss}.\n */\nexport function hostAnchorRect(input: HostAnchorInput): Rect {\n  const { host, panel, viewport, align, offset, padding = 0 } = input;\n  const desired: Rect = {\n    x: insetAlong(host.x, host.width, panel.width, align.x, offset.x),\n    y: insetAlong(host.y, host.height, panel.height, align.y, offset.y),\n    width: panel.width,\n    height: panel.height,\n  };\n  return clampRectWithin(desired, { x: 0, y: 0, width: viewport.width, height: viewport.height }, padding);\n}\n\n/**\n * CSS for a resolved rect, pinning whichever edges the alignment names.\n *\n * Pinning matters beyond taste: a panel whose width tracks its content holds\n * the anchored edge still and grows away from it. Pin the wrong edge and the\n * anchored corner drifts on every content change, correcting only once a\n * resize observer catches up.\n */\nexport function hostAnchorCss(\n  rect: Rect,\n  align: HostAnchorAlign,\n  viewport: { width: number; height: number },\n): { top?: number; right?: number; bottom?: number; left?: number } {\n  return {\n    ...(align.y === 'end'\n      ? { bottom: viewport.height - rect.y - rect.height }\n      : { top: rect.y }),\n    ...(align.x === 'end'\n      ? { right: viewport.width - rect.x - rect.width }\n      : { left: rect.x }),\n  };\n}\n"],"mappings":";;AAyBA,SAASA,EAAW,GAAe,GAAgB,GAAc,GAAuB,GAAoB;CAG1G,OAFIC,MAAU,UAAgBC,IAAQC,IAClCF,MAAU,QAAcC,IAAQE,IAASC,IAAOF,IAC7CD,KAASE,IAASC,KAAQ,IAAIF;AACvC;AAOA,SAAgBG,EAAe,GAA8B;CAC3D,IAAM,EAAE,SAAM,UAAO,aAAU,UAAO,WAAQ,aAAU,MAAMC,GACxDC,IAAgB;EACpB,GAAGR,EAAWS,EAAK,GAAGA,EAAK,OAAOC,EAAM,OAAOT,EAAM,GAAGU,EAAO,CAAC;EAChE,GAAGX,EAAWS,EAAK,GAAGA,EAAK,QAAQC,EAAM,QAAQT,EAAM,GAAGU,EAAO,CAAC;EAClE,OAAOD,EAAM;EACb,QAAQA,EAAM;CAChB;CACA,OAAOE,EAAgBJ,GAAS;EAAE,GAAG;EAAG,GAAG;EAAG,OAAOK,EAAS;EAAO,QAAQA,EAAS;CAAO,GAAGC,CAAO;AACzG;AAUA,SAAgBC,EACd,GACA,GACA,GACkE;CAClE,OAAO;EACL,GAAId,EAAM,MAAM,QACZ,EAAE,QAAQY,EAAS,SAASG,EAAK,IAAIA,EAAK,OAAO,IACjD,EAAE,KAAKA,EAAK,EAAE;EAClB,GAAIf,EAAM,MAAM,QACZ,EAAE,OAAOY,EAAS,QAAQG,EAAK,IAAIA,EAAK,MAAM,IAC9C,EAAE,MAAMA,EAAK,EAAE;CACrB;AACF"}
+{"version":3,"file":"hostAnchor.js","names":[],"sources":["../../src/canvas/hostAnchor.ts"],"sourcesContent":["import { clampRectWithin, type PlacementAlign, type Rect } from '@weasel-js/geom';\n\n/** Which of the host's edges the panel is held against, per axis. */\nexport interface HostAnchorAlign {\n  x: PlacementAlign;\n  y: PlacementAlign;\n}\n\n/** Inset from the anchored corner, in CSS pixels, positive going inward. */\nexport interface HostAnchorOffset {\n  x: number;\n  y: number;\n}\n\n/** Everything {@link hostAnchorRect} needs, all in viewport coordinates. */\nexport interface HostAnchorInput {\n  host: Rect;\n  panel: { width: number; height: number };\n  viewport: { width: number; height: number };\n  align: HostAnchorAlign;\n  offset: HostAnchorOffset;\n  /** Minimum gap kept between the panel and the viewport edge. Default 0. */\n  padding?: number;\n}\n\nfunction insetAlong(start: number, extent: number, size: number, align: PlacementAlign, by: number): number {\n  if (align === 'start') return start + by;\n  if (align === 'end') return start + extent - size - by;\n  return start + (extent - size) / 2 + by;\n}\n\n/**\n * Where a fixed-position panel held against a host element's corner lands, once\n * it has been kept inside the viewport. Returns a rect rather than CSS so the\n * caller decides which edges to pin — see {@link hostAnchorCss}.\n */\nexport function hostAnchorRect(input: HostAnchorInput): Rect {\n  const { host, panel, viewport, align, offset, padding = 0 } = input;\n  const desired: Rect = {\n    x: insetAlong(host.x, host.width, panel.width, align.x, offset.x),\n    y: insetAlong(host.y, host.height, panel.height, align.y, offset.y),\n    width: panel.width,\n    height: panel.height,\n  };\n  return clampRectWithin(desired, { x: 0, y: 0, width: viewport.width, height: viewport.height }, padding);\n}\n\n/**\n * CSS for a resolved rect, pinning whichever edges the alignment names.\n *\n * Pinning matters beyond taste: a panel whose width tracks its content holds\n * the anchored edge still and grows away from it. Pin the wrong edge and the\n * anchored corner drifts on every content change, correcting only once a\n * resize observer catches up.\n */\nexport function hostAnchorCss(\n  rect: Rect,\n  align: HostAnchorAlign,\n  viewport: { width: number; height: number },\n): { top?: number; right?: number; bottom?: number; left?: number } {\n  return {\n    ...(align.y === 'end'\n      ? { bottom: viewport.height - rect.y - rect.height }\n      : { top: rect.y }),\n    ...(align.x === 'end'\n      ? { right: viewport.width - rect.x - rect.width }\n      : { left: rect.x }),\n  };\n}\n"],"mappings":";;;AAyBA,SAAS,WAAW,OAAe,QAAgB,MAAc,OAAuB,IAAoB;CAC1G,IAAI,UAAU,SAAS,OAAO,QAAQ;CACtC,IAAI,UAAU,OAAO,OAAO,QAAQ,SAAS,OAAO;CACpD,OAAO,SAAS,SAAS,QAAQ,IAAI;AACvC;;;;;;AAOA,SAAgB,eAAe,OAA8B;CAC3D,MAAM,EAAE,MAAM,OAAO,UAAU,OAAO,QAAQ,UAAU,MAAM;CAC9D,MAAM,UAAgB;EACpB,GAAG,WAAW,KAAK,GAAG,KAAK,OAAO,MAAM,OAAO,MAAM,GAAG,OAAO,CAAC;EAChE,GAAG,WAAW,KAAK,GAAG,KAAK,QAAQ,MAAM,QAAQ,MAAM,GAAG,OAAO,CAAC;EAClE,OAAO,MAAM;EACb,QAAQ,MAAM;CAChB;CACA,OAAO,gBAAgB,SAAS;EAAE,GAAG;EAAG,GAAG;EAAG,OAAO,SAAS;EAAO,QAAQ,SAAS;CAAO,GAAG,OAAO;AACzG;;;;;;;;;AAUA,SAAgB,cACd,MACA,OACA,UACkE;CAClE,OAAO;EACL,GAAI,MAAM,MAAM,QACZ,EAAE,QAAQ,SAAS,SAAS,KAAK,IAAI,KAAK,OAAO,IACjD,EAAE,KAAK,KAAK,EAAE;EAClB,GAAI,MAAM,MAAM,QACZ,EAAE,OAAO,SAAS,QAAQ,KAAK,IAAI,KAAK,MAAM,IAC9C,EAAE,MAAM,KAAK,EAAE;CACrB;AACF"}

package/dist/canvas/hud.module.js

@@ -1,18 +1,29 @@
 //#region src/canvas/hud.module.css
-var e = "_hud_4467cb", t = "_sized_4467cb", n = "_readings_4467cb _numeric_25fd0b", r = "_muted_4467cb", i = "_absent_4467cb", a = "_header_4467cb", o = "_list_4467cb", s = "_item_4467cb", c = "_itemBest_4467cb", l = "_row_4467cb", u = "_stack_4467cb", d = {
-	hud: e,
-	sized: t,
-	readings: n,
-	muted: r,
-	absent: i,
-	header: a,
-	list: o,
-	item: s,
-	itemBest: c,
-	row: l,
-	stack: u
+var hud = "_hud_4467cb";
+var sized = "_sized_4467cb";
+var readings = "_readings_4467cb _numeric_25fd0b";
+var muted = "_muted_4467cb";
+var absent = "_absent_4467cb";
+var header = "_header_4467cb";
+var list = "_list_4467cb";
+var item = "_item_4467cb";
+var itemBest = "_itemBest_4467cb";
+var row = "_row_4467cb";
+var stack = "_stack_4467cb";
+var hud_module_default = {
+	hud,
+	sized,
+	readings,
+	muted,
+	absent,
+	header,
+	list,
+	item,
+	itemBest,
+	row,
+	stack
 };
-//#endregion
-export { i as absent, d as default, a as header, e as hud, s as item, c as itemBest, o as list, r as muted, n as readings, l as row, t as sized, u as stack };
 
+//#endregion
+export { absent, hud_module_default as default, header, hud, item, itemBest, list, muted, readings, row, sized, stack };
 //# sourceMappingURL=hud.module.js.map

package/dist/canvas/hud.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"hud.module.js","names":["hud","sized","readings","muted","absent","header","list","item","itemBest","row","stack","hud_module_default"],"sources":["../../src/canvas/hud.module.css"],"sourcesContent":["/* The debug HUDs <Canvas> can draw: CursorCoordsHud, PickHud, ModalityHud. The\n   mono face is for the ids the pick and modality HUDs list; figures take the\n   numeric face, on a child so `.hud`'s own font cannot override it. */\n.hud {\n  position: fixed;\n  z-index: var(--wzl-z-hud, 900);\n  background: rgba(0, 0, 0, 0.7);\n  color: #e8e8e8;\n  font: 11px ui-monospace, SFMono-Regular, Menlo, monospace;\n  padding: var(--wzl-space-3, 6px) var(--wzl-space-4, 8px);\n  border-radius: 4px;\n  pointer-events: none;\n  line-height: 1.4;\n  text-align: right;\n}\n\n.sized {\n  min-width: 120px;\n  max-width: 260px;\n}\n\n.readings {\n  composes: numeric from '@weasel-js/theme/numeric.module.css';\n  display: grid;\n  grid-template-columns: auto auto;\n  column-gap: var(--wzl-space-4, 8px);\n  margin: 0;\n}\n\n.readings dt {\n  text-align: left;\n}\n\n.readings dd {\n  margin: 0;\n  white-space: nowrap;\n}\n\n.muted {\n  color: #888;\n}\n\n/* A value that is not there: an em dash, \"off-canvas\". */\n.absent {\n  color: #888;\n  font-style: italic;\n}\n\n.header {\n  margin-bottom: var(--wzl-space-1, 2px);\n}\n\n.list {\n  list-style: none;\n  margin: 0;\n  padding: 0;\n  display: flex;\n  flex-direction: column;\n  gap: 1px;\n}\n\n.item {\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n}\n\n.itemBest {\n  font-weight: 700;\n}\n\n.row {\n  display: flex;\n  gap: var(--wzl-space-4, 8px);\n  justify-content: flex-end;\n  white-space: nowrap;\n}\n\n.stack {\n  display: flex;\n  flex-direction: column;\n  align-items: flex-end;\n}\n"],"mappings":""}
+{"version":3,"file":"hud.module.js","names":[],"sources":["../../src/canvas/hud.module.css"],"sourcesContent":["/* The debug HUDs <Canvas> can draw: CursorCoordsHud, PickHud, ModalityHud. The\n   mono face is for the ids the pick and modality HUDs list; figures take the\n   numeric face, on a child so `.hud`'s own font cannot override it. */\n.hud {\n  position: fixed;\n  z-index: var(--wzl-z-hud, 900);\n  background: rgba(0, 0, 0, 0.7);\n  color: #e8e8e8;\n  font: 11px ui-monospace, SFMono-Regular, Menlo, monospace;\n  padding: var(--wzl-space-3, 6px) var(--wzl-space-4, 8px);\n  border-radius: 4px;\n  pointer-events: none;\n  line-height: 1.4;\n  text-align: right;\n}\n\n.sized {\n  min-width: 120px;\n  max-width: 260px;\n}\n\n.readings {\n  composes: numeric from '@weasel-js/theme/numeric.module.css';\n  display: grid;\n  grid-template-columns: auto auto;\n  column-gap: var(--wzl-space-4, 8px);\n  margin: 0;\n}\n\n.readings dt {\n  text-align: left;\n}\n\n.readings dd {\n  margin: 0;\n  white-space: nowrap;\n}\n\n.muted {\n  color: #888;\n}\n\n/* A value that is not there: an em dash, \"off-canvas\". */\n.absent {\n  color: #888;\n  font-style: italic;\n}\n\n.header {\n  margin-bottom: var(--wzl-space-1, 2px);\n}\n\n.list {\n  list-style: none;\n  margin: 0;\n  padding: 0;\n  display: flex;\n  flex-direction: column;\n  gap: 1px;\n}\n\n.item {\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n}\n\n.itemBest {\n  font-weight: 700;\n}\n\n.row {\n  display: flex;\n  gap: var(--wzl-space-4, 8px);\n  justify-content: flex-end;\n  white-space: nowrap;\n}\n\n.stack {\n  display: flex;\n  flex-direction: column;\n  align-items: flex-end;\n}\n"],"mappings":""}

package/dist/canvas/insertPreviewExtent.js

@@ -1,105 +1,126 @@
-import { boundsOfPath as e, regularPolygonPath as t, starPath as n } from "@weasel-js/geom";
+import { boundsOfPath, regularPolygonPath, starPath } from "@weasel-js/geom";
+
 //#region src/canvas/insertPreviewExtent.ts
-function r(e) {
-	let r = e.bounds, o = {
-		x: r.x,
-		y: r.y,
-		width: r.width,
-		height: r.height
+/** Resolve an in-flight insert's geometry and world AABB. Uses the geometry in
+*  `extras` where the shape carries it; an unknown shape falls back to its drag rect. */
+function insertPreviewExtent(ov) {
+	const b = ov.bounds;
+	const box = {
+		x: b.x,
+		y: b.y,
+		width: b.width,
+		height: b.height
 	};
-	switch (e.shape) {
+	switch (ov.shape) {
 		case "line": {
-			let t = e.extras, n = t.a ?? {
-				x: r.x,
-				y: r.y
-			}, i = t.b ?? {
-				x: r.x + r.width,
-				y: r.y + r.height
+			const e = ov.extras;
+			const a = e.a ?? {
+				x: b.x,
+				y: b.y
+			};
+			const b2 = e.b ?? {
+				x: b.x + b.width,
+				y: b.y + b.height
 			};
 			return {
-				shape: e.shape,
-				bounds: a([n, i]) ?? o,
+				shape: ov.shape,
+				bounds: aabbOf([a, b2]) ?? box,
 				geometry: {
 					kind: "line",
-					a: n,
-					b: i
+					a,
+					b: b2
 				}
 			};
 		}
 		case "polygon": {
-			let n = e.extras, a = n.center ?? {
-				x: r.x + r.width / 2,
-				y: r.y + r.height / 2
-			}, o = n.radius ?? Math.min(r.width, r.height) / 2, s = Math.max(3, Math.floor(n.sides ?? 6)), c = n.rotation ?? 0;
+			const e = ov.extras;
+			const center = e.center ?? {
+				x: b.x + b.width / 2,
+				y: b.y + b.height / 2
+			};
+			const radius = e.radius ?? Math.min(b.width, b.height) / 2;
+			const sides = Math.max(3, Math.floor(e.sides ?? 6));
+			const rotation = e.rotation ?? 0;
 			return {
-				shape: e.shape,
-				bounds: i(t(a, o, s, c)),
+				shape: ov.shape,
+				bounds: boxOf(regularPolygonPath(center, radius, sides, rotation)),
 				geometry: {
 					kind: "polygon",
-					center: a,
-					radius: o,
-					sides: s,
-					rotation: c
+					center,
+					radius,
+					sides,
+					rotation
 				}
 			};
 		}
 		case "star": {
-			let t = e.extras, a = t.center ?? {
-				x: r.x + r.width / 2,
-				y: r.y + r.height / 2
-			}, o = t.outerRadius ?? Math.min(r.width, r.height) / 2, s = o * (t.innerRadiusRatio ?? .5), c = Math.max(3, Math.floor(t.points ?? 5)), l = t.rotation ?? 0;
+			const e = ov.extras;
+			const center = e.center ?? {
+				x: b.x + b.width / 2,
+				y: b.y + b.height / 2
+			};
+			const outerRadius = e.outerRadius ?? Math.min(b.width, b.height) / 2;
+			const innerRadius = outerRadius * (e.innerRadiusRatio ?? .5);
+			const points = Math.max(3, Math.floor(e.points ?? 5));
+			const rotation = e.rotation ?? 0;
 			return {
-				shape: e.shape,
-				bounds: i(n(a, o, c, s, l)),
+				shape: ov.shape,
+				bounds: boxOf(starPath(center, outerRadius, points, innerRadius, rotation)),
 				geometry: {
 					kind: "star",
-					center: a,
-					outerRadius: o,
-					innerRadius: s,
-					points: c,
-					rotation: l
+					center,
+					outerRadius,
+					innerRadius,
+					points,
+					rotation
 				}
 			};
 		}
 		case "pencil": {
-			let t = e.extras.samples ?? [];
+			const samples = ov.extras.samples ?? [];
 			return {
-				shape: e.shape,
-				bounds: a(t) ?? o,
+				shape: ov.shape,
+				bounds: aabbOf(samples) ?? box,
 				geometry: {
 					kind: "pencil",
-					samples: t
+					samples
 				}
 			};
 		}
 		default: return {
-			shape: e.shape,
-			bounds: o,
+			shape: ov.shape,
+			bounds: box,
 			geometry: { kind: "box" }
 		};
 	}
 }
-function i(t) {
-	let { x: n, y: r, width: i, height: a } = e(t);
+/** A radial shape's extent is the box of the shape it makes, as the commit stores it. */
+function boxOf(path) {
+	const { x, y, width, height } = boundsOfPath(path);
 	return {
-		x: n,
-		y: r,
-		width: i,
-		height: a
+		x,
+		y,
+		width,
+		height
 	};
 }
-function a(e) {
-	if (e.length === 0) return null;
-	let t = Infinity, n = Infinity, r = -Infinity, i = -Infinity;
-	for (let a of e) a.x < t && (t = a.x), a.y < n && (n = a.y), a.x > r && (r = a.x), a.y > i && (i = a.y);
+function aabbOf(pts) {
+	if (pts.length === 0) return null;
+	let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
+	for (const p of pts) {
+		if (p.x < minX) minX = p.x;
+		if (p.y < minY) minY = p.y;
+		if (p.x > maxX) maxX = p.x;
+		if (p.y > maxY) maxY = p.y;
+	}
 	return {
-		x: t,
-		y: n,
-		width: r - t,
-		height: i - n
+		x: minX,
+		y: minY,
+		width: maxX - minX,
+		height: maxY - minY
 	};
 }
-//#endregion
-export { r as insertPreviewExtent };
 
+//#endregion
+export { insertPreviewExtent };
 //# sourceMappingURL=insertPreviewExtent.js.map

package/dist/canvas/insertPreviewExtent.js.map

@@ -1 +1 @@
-{"version":3,"file":"insertPreviewExtent.js","names":["insertPreviewExtent","b","ov","box","e","a","b2","aabbOf","center","radius","sides","rotation","boxOf","regularPolygonPath","outerRadius","innerRadius","points","starPath","samples","boundsOfPath","path","pts","minX","minY","maxX","maxY","p"],"sources":["../../src/canvas/insertPreviewExtent.ts"],"sourcesContent":["/**\n * The one answer to \"how big is the thing this in-flight insert is making\",\n * shared by the preview paint, the commit, and the gesture's reported bounds.\n *\n * The drag AABB alone is NOT the answer. `insertAction` hands over an\n * `extras` payload that can carry richer geometry than the drag rect, and\n * where it does, that geometry is the shape: a pencil that loops back to its\n * start produces a zero-area drag rect around a trail that swept the page.\n */\nimport type { Bounds } from 'core/viewport/fitViewToBounds';\nimport type { OngoingOverlay } from '@weasel-js/routing';\nimport { boundsOfPath, regularPolygonPath, starPath, type Path } from '@weasel-js/geom';\n\ntype Point = { x: number; y: number };\n\n/** The fields of an `insertPreview` overlay this needs. `canvas/deps/insert`\n *  passes the equivalent from its own `(bounds, extras)` commit arguments. */\nexport interface InsertPreviewLike {\n  shape: string;\n  bounds: { x: number; y: number; width: number; height: number };\n  extras: unknown;\n}\n\n/** Resolved preview geometry, in the terms the path builders take. */\nexport type InsertPreviewGeometry =\n  | { kind: 'box' }\n  | { kind: 'line'; a: Point; b: Point }\n  | { kind: 'polygon'; center: Point; radius: number; sides: number; rotation: number }\n  | {\n      kind: 'star';\n      center: Point;\n      outerRadius: number;\n      innerRadius: number;\n      points: number;\n      rotation: number;\n    }\n  | { kind: 'pencil'; samples: ReadonlyArray<Point> };\n\n/** An in-flight insert's shape, resolved from its drag rect and `extras`. */\nexport interface InsertPreviewExtent {\n  /** The insert kind, verbatim from the caller. */\n  shape: string;\n  /** World-space AABB of `geometry` — the extent. */\n  bounds: Bounds;\n  geometry: InsertPreviewGeometry;\n}\n\n/** The `insertPreview` member of `OngoingOverlay`, which `insertAction` publishes during a drag-to-insert. */\nexport type InsertPreviewOverlay = Extract<OngoingOverlay, { kind: 'insertPreview' }>;\n\n/** Resolve an in-flight insert's geometry and world AABB. Uses the geometry in\n *  `extras` where the shape carries it; an unknown shape falls back to its drag rect. */\nexport function insertPreviewExtent(ov: InsertPreviewLike): InsertPreviewExtent {\n  const b = ov.bounds;\n  const box = { x: b.x, y: b.y, width: b.width, height: b.height };\n\n  switch (ov.shape) {\n    case 'line': {\n      const e = ov.extras as Partial<{ a: Point; b: Point }>;\n      const a = e.a ?? { x: b.x, y: b.y };\n      const b2 = e.b ?? { x: b.x + b.width, y: b.y + b.height };\n      return { shape: ov.shape, bounds: aabbOf([a, b2]) ?? box, geometry: { kind: 'line', a, b: b2 } };\n    }\n    case 'polygon': {\n      const e = ov.extras as Partial<{\n        sides: number; rotation: number; center: Point; radius: number;\n      }>;\n      const center = e.center ?? { x: b.x + b.width / 2, y: b.y + b.height / 2 };\n      const radius = e.radius ?? Math.min(b.width, b.height) / 2;\n      const sides = Math.max(3, Math.floor(e.sides ?? 6));\n      const rotation = e.rotation ?? 0;\n      return {\n        shape: ov.shape,\n        bounds: boxOf(regularPolygonPath(center, radius, sides, rotation)),\n        geometry: { kind: 'polygon', center, radius, sides, rotation },\n      };\n    }\n    case 'star': {\n      const e = ov.extras as Partial<{\n        points: number; innerRadiusRatio: number; rotation: number;\n        center: Point; outerRadius: number;\n      }>;\n      const center = e.center ?? { x: b.x + b.width / 2, y: b.y + b.height / 2 };\n      const outerRadius = e.outerRadius ?? Math.min(b.width, b.height) / 2;\n      const innerRadius = outerRadius * (e.innerRadiusRatio ?? 0.5);\n      const points = Math.max(3, Math.floor(e.points ?? 5));\n      const rotation = e.rotation ?? 0;\n      return {\n        shape: ov.shape,\n        bounds: boxOf(starPath(center, outerRadius, points, innerRadius, rotation)),\n        geometry: { kind: 'star', center, outerRadius, innerRadius, points, rotation },\n      };\n    }\n    case 'pencil': {\n      const e = ov.extras as Partial<{ samples: ReadonlyArray<Point> }>;\n      const samples = e.samples ?? [];\n      return {\n        shape: ov.shape,\n        bounds: aabbOf(samples) ?? box,\n        geometry: { kind: 'pencil', samples },\n      };\n    }\n    default:\n      return { shape: ov.shape, bounds: box, geometry: { kind: 'box' } };\n  }\n}\n\n/** A radial shape's extent is the box of the shape it makes, as the commit stores it. */\nfunction boxOf(path: Path): Bounds {\n  const { x, y, width, height } = boundsOfPath(path);\n  return { x, y, width, height };\n}\n\nfunction aabbOf(pts: ReadonlyArray<Point>): Bounds | null {\n  if (pts.length === 0) return null;\n  let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;\n  for (const p of pts) {\n    if (p.x < minX) minX = p.x;\n    if (p.y < minY) minY = p.y;\n    if (p.x > maxX) maxX = p.x;\n    if (p.y > maxY) maxY = p.y;\n  }\n  return { x: minX, y: minY, width: maxX - minX, height: maxY - minY };\n}\n"],"mappings":";;AAoDA,SAAgBA,EAAoB,GAA4C;CAC9E,IAAMC,IAAIC,EAAG,QACPC,IAAM;EAAE,GAAGF,EAAE;EAAG,GAAGA,EAAE;EAAG,OAAOA,EAAE;EAAO,QAAQA,EAAE;CAAO;CAE/D,QAAQC,EAAG,OAAX;EACE,KAAK,QAAQ;GACX,IAAME,IAAIF,EAAG,QACPG,IAAID,EAAE,KAAK;IAAE,GAAGH,EAAE;IAAG,GAAGA,EAAE;GAAE,GAC5BK,IAAKF,EAAE,KAAK;IAAE,GAAGH,EAAE,IAAIA,EAAE;IAAO,GAAGA,EAAE,IAAIA,EAAE;GAAO;GACxD,OAAO;IAAE,OAAOC,EAAG;IAAO,QAAQK,EAAO,CAACF,GAAGC,CAAE,CAAC,KAAKH;IAAK,UAAU;KAAE,MAAM;KAAQ;KAAG,GAAGG;IAAG;GAAE;EACjG;EACA,KAAK,WAAW;GACd,IAAMF,IAAIF,EAAG,QAGPM,IAASJ,EAAE,UAAU;IAAE,GAAGH,EAAE,IAAIA,EAAE,QAAQ;IAAG,GAAGA,EAAE,IAAIA,EAAE,SAAS;GAAE,GACnEQ,IAASL,EAAE,UAAU,KAAK,IAAIH,EAAE,OAAOA,EAAE,MAAM,IAAI,GACnDS,IAAQ,KAAK,IAAI,GAAG,KAAK,MAAMN,EAAE,SAAS,CAAC,CAAC,GAC5CO,IAAWP,EAAE,YAAY;GAC/B,OAAO;IACL,OAAOF,EAAG;IACV,QAAQU,EAAMC,EAAmBL,GAAQC,GAAQC,GAAOC,CAAQ,CAAC;IACjE,UAAU;KAAE,MAAM;KAAW;KAAQ;KAAQ;KAAO;IAAS;GAC/D;EACF;EACA,KAAK,QAAQ;GACX,IAAMP,IAAIF,EAAG,QAIPM,IAASJ,EAAE,UAAU;IAAE,GAAGH,EAAE,IAAIA,EAAE,QAAQ;IAAG,GAAGA,EAAE,IAAIA,EAAE,SAAS;GAAE,GACnEa,IAAcV,EAAE,eAAe,KAAK,IAAIH,EAAE,OAAOA,EAAE,MAAM,IAAI,GAC7Dc,IAAcD,KAAeV,EAAE,oBAAoB,KACnDY,IAAS,KAAK,IAAI,GAAG,KAAK,MAAMZ,EAAE,UAAU,CAAC,CAAC,GAC9CO,IAAWP,EAAE,YAAY;GAC/B,OAAO;IACL,OAAOF,EAAG;IACV,QAAQU,EAAMK,EAAST,GAAQM,GAAaE,GAAQD,GAAaJ,CAAQ,CAAC;IAC1E,UAAU;KAAE,MAAM;KAAQ;KAAQ;KAAa;KAAa;KAAQ;IAAS;GAC/E;EACF;EACA,KAAK,UAAU;GAEb,IAAMO,IADIhB,EAAG,OACK,WAAW,CAAC;GAC9B,OAAO;IACL,OAAOA,EAAG;IACV,QAAQK,EAAOW,CAAO,KAAKf;IAC3B,UAAU;KAAE,MAAM;KAAU;IAAQ;GACtC;EACF;EACA,SACE,OAAO;GAAE,OAAOD,EAAG;GAAO,QAAQC;GAAK,UAAU,EAAE,MAAM,MAAM;EAAE;CACrE;AACF;AAGA,SAASS,EAAM,GAAoB;CACjC,IAAM,EAAE,MAAG,MAAG,UAAO,cAAWO,EAAaC,CAAI;CACjD,OAAO;EAAE;EAAG;EAAG;EAAO;CAAO;AAC/B;AAEA,SAASb,EAAO,GAA0C;CACxD,IAAIc,EAAI,WAAW,GAAG,OAAO;CAC7B,IAAIC,IAAO,UAAUC,IAAO,UAAUC,IAAO,WAAWC,IAAO;CAC/D,KAAK,IAAMC,KAAKL,GAId,AAHIK,EAAE,IAAIJ,MAAM,IAAOI,EAAE,IACrBA,EAAE,IAAIH,MAAM,IAAOG,EAAE,IACrBA,EAAE,IAAIF,MAAM,IAAOE,EAAE,IACrBA,EAAE,IAAID,MAAM,IAAOC,EAAE;CAE3B,OAAO;EAAE,GAAGJ;EAAM,GAAGC;EAAM,OAAOC,IAAOF;EAAM,QAAQG,IAAOF;CAAK;AACrE"}
+{"version":3,"file":"insertPreviewExtent.js","names":[],"sources":["../../src/canvas/insertPreviewExtent.ts"],"sourcesContent":["/**\n * The one answer to \"how big is the thing this in-flight insert is making\",\n * shared by the preview paint, the commit, and the gesture's reported bounds.\n *\n * The drag AABB alone is NOT the answer. `insertAction` hands over an\n * `extras` payload that can carry richer geometry than the drag rect, and\n * where it does, that geometry is the shape: a pencil that loops back to its\n * start produces a zero-area drag rect around a trail that swept the page.\n */\nimport type { Bounds } from 'core/viewport/fitViewToBounds';\nimport type { OngoingOverlay } from '@weasel-js/routing';\nimport { boundsOfPath, regularPolygonPath, starPath, type Path } from '@weasel-js/geom';\n\ntype Point = { x: number; y: number };\n\n/** The fields of an `insertPreview` overlay this needs. `canvas/deps/insert`\n *  passes the equivalent from its own `(bounds, extras)` commit arguments. */\nexport interface InsertPreviewLike {\n  shape: string;\n  bounds: { x: number; y: number; width: number; height: number };\n  extras: unknown;\n}\n\n/** Resolved preview geometry, in the terms the path builders take. */\nexport type InsertPreviewGeometry =\n  | { kind: 'box' }\n  | { kind: 'line'; a: Point; b: Point }\n  | { kind: 'polygon'; center: Point; radius: number; sides: number; rotation: number }\n  | {\n      kind: 'star';\n      center: Point;\n      outerRadius: number;\n      innerRadius: number;\n      points: number;\n      rotation: number;\n    }\n  | { kind: 'pencil'; samples: ReadonlyArray<Point> };\n\n/** An in-flight insert's shape, resolved from its drag rect and `extras`. */\nexport interface InsertPreviewExtent {\n  /** The insert kind, verbatim from the caller. */\n  shape: string;\n  /** World-space AABB of `geometry` — the extent. */\n  bounds: Bounds;\n  geometry: InsertPreviewGeometry;\n}\n\n/** The `insertPreview` member of `OngoingOverlay`, which `insertAction` publishes during a drag-to-insert. */\nexport type InsertPreviewOverlay = Extract<OngoingOverlay, { kind: 'insertPreview' }>;\n\n/** Resolve an in-flight insert's geometry and world AABB. Uses the geometry in\n *  `extras` where the shape carries it; an unknown shape falls back to its drag rect. */\nexport function insertPreviewExtent(ov: InsertPreviewLike): InsertPreviewExtent {\n  const b = ov.bounds;\n  const box = { x: b.x, y: b.y, width: b.width, height: b.height };\n\n  switch (ov.shape) {\n    case 'line': {\n      const e = ov.extras as Partial<{ a: Point; b: Point }>;\n      const a = e.a ?? { x: b.x, y: b.y };\n      const b2 = e.b ?? { x: b.x + b.width, y: b.y + b.height };\n      return { shape: ov.shape, bounds: aabbOf([a, b2]) ?? box, geometry: { kind: 'line', a, b: b2 } };\n    }\n    case 'polygon': {\n      const e = ov.extras as Partial<{\n        sides: number; rotation: number; center: Point; radius: number;\n      }>;\n      const center = e.center ?? { x: b.x + b.width / 2, y: b.y + b.height / 2 };\n      const radius = e.radius ?? Math.min(b.width, b.height) / 2;\n      const sides = Math.max(3, Math.floor(e.sides ?? 6));\n      const rotation = e.rotation ?? 0;\n      return {\n        shape: ov.shape,\n        bounds: boxOf(regularPolygonPath(center, radius, sides, rotation)),\n        geometry: { kind: 'polygon', center, radius, sides, rotation },\n      };\n    }\n    case 'star': {\n      const e = ov.extras as Partial<{\n        points: number; innerRadiusRatio: number; rotation: number;\n        center: Point; outerRadius: number;\n      }>;\n      const center = e.center ?? { x: b.x + b.width / 2, y: b.y + b.height / 2 };\n      const outerRadius = e.outerRadius ?? Math.min(b.width, b.height) / 2;\n      const innerRadius = outerRadius * (e.innerRadiusRatio ?? 0.5);\n      const points = Math.max(3, Math.floor(e.points ?? 5));\n      const rotation = e.rotation ?? 0;\n      return {\n        shape: ov.shape,\n        bounds: boxOf(starPath(center, outerRadius, points, innerRadius, rotation)),\n        geometry: { kind: 'star', center, outerRadius, innerRadius, points, rotation },\n      };\n    }\n    case 'pencil': {\n      const e = ov.extras as Partial<{ samples: ReadonlyArray<Point> }>;\n      const samples = e.samples ?? [];\n      return {\n        shape: ov.shape,\n        bounds: aabbOf(samples) ?? box,\n        geometry: { kind: 'pencil', samples },\n      };\n    }\n    default:\n      return { shape: ov.shape, bounds: box, geometry: { kind: 'box' } };\n  }\n}\n\n/** A radial shape's extent is the box of the shape it makes, as the commit stores it. */\nfunction boxOf(path: Path): Bounds {\n  const { x, y, width, height } = boundsOfPath(path);\n  return { x, y, width, height };\n}\n\nfunction aabbOf(pts: ReadonlyArray<Point>): Bounds | null {\n  if (pts.length === 0) return null;\n  let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;\n  for (const p of pts) {\n    if (p.x < minX) minX = p.x;\n    if (p.y < minY) minY = p.y;\n    if (p.x > maxX) maxX = p.x;\n    if (p.y > maxY) maxY = p.y;\n  }\n  return { x: minX, y: minY, width: maxX - minX, height: maxY - minY };\n}\n"],"mappings":";;;;;AAoDA,SAAgB,oBAAoB,IAA4C;CAC9E,MAAM,IAAI,GAAG;CACb,MAAM,MAAM;EAAE,GAAG,EAAE;EAAG,GAAG,EAAE;EAAG,OAAO,EAAE;EAAO,QAAQ,EAAE;CAAO;CAE/D,QAAQ,GAAG,OAAX;EACE,KAAK,QAAQ;GACX,MAAM,IAAI,GAAG;GACb,MAAM,IAAI,EAAE,KAAK;IAAE,GAAG,EAAE;IAAG,GAAG,EAAE;GAAE;GAClC,MAAM,KAAK,EAAE,KAAK;IAAE,GAAG,EAAE,IAAI,EAAE;IAAO,GAAG,EAAE,IAAI,EAAE;GAAO;GACxD,OAAO;IAAE,OAAO,GAAG;IAAO,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK;IAAK,UAAU;KAAE,MAAM;KAAQ;KAAG,GAAG;IAAG;GAAE;EACjG;EACA,KAAK,WAAW;GACd,MAAM,IAAI,GAAG;GAGb,MAAM,SAAS,EAAE,UAAU;IAAE,GAAG,EAAE,IAAI,EAAE,QAAQ;IAAG,GAAG,EAAE,IAAI,EAAE,SAAS;GAAE;GACzE,MAAM,SAAS,EAAE,UAAU,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,IAAI;GACzD,MAAM,QAAQ,KAAK,IAAI,GAAG,KAAK,MAAM,EAAE,SAAS,CAAC,CAAC;GAClD,MAAM,WAAW,EAAE,YAAY;GAC/B,OAAO;IACL,OAAO,GAAG;IACV,QAAQ,MAAM,mBAAmB,QAAQ,QAAQ,OAAO,QAAQ,CAAC;IACjE,UAAU;KAAE,MAAM;KAAW;KAAQ;KAAQ;KAAO;IAAS;GAC/D;EACF;EACA,KAAK,QAAQ;GACX,MAAM,IAAI,GAAG;GAIb,MAAM,SAAS,EAAE,UAAU;IAAE,GAAG,EAAE,IAAI,EAAE,QAAQ;IAAG,GAAG,EAAE,IAAI,EAAE,SAAS;GAAE;GACzE,MAAM,cAAc,EAAE,eAAe,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,IAAI;GACnE,MAAM,cAAc,eAAe,EAAE,oBAAoB;GACzD,MAAM,SAAS,KAAK,IAAI,GAAG,KAAK,MAAM,EAAE,UAAU,CAAC,CAAC;GACpD,MAAM,WAAW,EAAE,YAAY;GAC/B,OAAO;IACL,OAAO,GAAG;IACV,QAAQ,MAAM,SAAS,QAAQ,aAAa,QAAQ,aAAa,QAAQ,CAAC;IAC1E,UAAU;KAAE,MAAM;KAAQ;KAAQ;KAAa;KAAa;KAAQ;IAAS;GAC/E;EACF;EACA,KAAK,UAAU;GAEb,MAAM,UADI,GAAG,OACK,WAAW,CAAC;GAC9B,OAAO;IACL,OAAO,GAAG;IACV,QAAQ,OAAO,OAAO,KAAK;IAC3B,UAAU;KAAE,MAAM;KAAU;IAAQ;GACtC;EACF;EACA,SACE,OAAO;GAAE,OAAO,GAAG;GAAO,QAAQ;GAAK,UAAU,EAAE,MAAM,MAAM;EAAE;CACrE;AACF;;AAGA,SAAS,MAAM,MAAoB;CACjC,MAAM,EAAE,GAAG,GAAG,OAAO,WAAW,aAAa,IAAI;CACjD,OAAO;EAAE;EAAG;EAAG;EAAO;CAAO;AAC/B;AAEA,SAAS,OAAO,KAA0C;CACxD,IAAI,IAAI,WAAW,GAAG,OAAO;CAC7B,IAAI,OAAO,UAAU,OAAO,UAAU,OAAO,WAAW,OAAO;CAC/D,KAAK,MAAM,KAAK,KAAK;EACnB,IAAI,EAAE,IAAI,MAAM,OAAO,EAAE;EACzB,IAAI,EAAE,IAAI,MAAM,OAAO,EAAE;EACzB,IAAI,EAAE,IAAI,MAAM,OAAO,EAAE;EACzB,IAAI,EAAE,IAAI,MAAM,OAAO,EAAE;CAC3B;CACA,OAAO;EAAE,GAAG;EAAM,GAAG;EAAM,OAAO,OAAO;EAAM,QAAQ,OAAO;CAAK;AACrE"}