@weasel-js/core 1.10.0 → 1.11.0

package/dist/interactions/actions/insert/action.js

@@ -1,72 +1,108 @@
-import { runBehaviorSettled as e } from "../gestureLifecycle.js";
-import { inPlane as t, insertLayer as n } from "../planeInput.js";
-import { shapeKindInfo as r } from "../../../core/shapeKinds.js";
-import { insertKind as i, insertShape as a } from "./shape.js";
-import { cancelInsert as o, commitInsert as s } from "./commit.js";
-import { beginInsert as c } from "./session.js";
-import { nextFrame as l } from "./frame.js";
-import { resolveParams as u } from "@weasel-js/routing";
+import { scenePaintedPoseOf } from "../../../canvas/derivedPath.js";
+import { runBehaviorSettled } from "../gestureLifecycle.js";
+import { inPlane, insertLayer } from "../planeInput.js";
+import { SNAP_ROLES } from "../../../features/snap/roles.js";
+import { shapeKindInfo } from "../../../core/shapeKinds.js";
+import { copiesWithin } from "../../../canvas/copiesAbove.js";
+import { insertKind, insertShape } from "./shape.js";
+import { cancelInsert, commitInsert } from "./commit.js";
+import { beginInsert } from "./session.js";
+import { carryStart, nextFrame } from "./frame.js";
+import { resolveParams } from "@weasel-js/routing";
+
 //#region src/interactions/actions/insert/action.ts
-var d = t({
+/**
+* Drag-to-insert. The node `kind` is read from `opts.params.kind`.
+*
+* The drag's start and current point snap through the `snap` dep's `point`
+* sessions (never freehand pencil samples). While `snap.constrain` (Shift) is
+* held, a line's end stays on the 15° line through the snapped start nearest
+* the pointer, and lands where that line meets a target. Behaviors from the
+* binding's `opts.behaviors` (`InsertBehavior[]`) run over the two points
+* after that; on release the first answer wins (`null` aborts, `Op[]` commits
+* in place of the insert).
+*
+* The new node has no scene id until commit, so the live preview is the
+* `overlay()` surface with `kind: 'insertPreview'`. A consumer-defined kind
+* the kit cannot draw skips the preview and still commits on release.
+*/
+var insertAction = inPlane({
 	id: "insert",
 	label: "Insert",
 	group: "insert",
 	eligible: { capability: "creates-shapes" },
+	modifierRoles: SNAP_ROLES,
 	requires: [
 		"insert",
 		"insertLive",
+		"insertInto",
 		"selection",
 		"snap",
 		"textEdit",
 		"scene",
 		"applyOps",
-		"view"
+		"view",
+		"kitSettings"
 	],
 	invoker: {
 		timing: "ongoing",
-		start(t, n) {
-			let d = c(t, n);
-			if (!d) return {};
-			let { session: f, readers: p } = d, m = d.frame, h = {
-				open: !0,
-				userRotation: 0
-			}, g = t.deps.insertLive;
-			return g && (g.gesture = h), {
+		start(ctx, opts) {
+			const begun = beginInsert(ctx, opts);
+			if (!begun) return {};
+			const { session, readers } = begun;
+			let frame = begun.frame;
+			const gesture = {
+				open: true,
+				userRotation: 0,
+				repositioning: false
+			};
+			const live = ctx.deps.insertLive;
+			if (live) live.gesture = gesture;
+			const scene = ctx.deps.scene;
+			const into = ctx.deps.insertInto?.get() ?? null;
+			const copies = scene ? copiesWithin(scene, into, scenePaintedPoseOf(scene)) : [];
+			return {
 				kind: "insert",
-				onMove(e) {
-					m = l(f, p, m, e);
+				onMove(moveCtx) {
+					if (gesture.repositioning) carryStart(session, frame.pointer, moveCtx.world, moveCtx);
+					frame = nextFrame(session, readers, frame, moveCtx);
 				},
 				overlay() {
-					if (!h.open) return null;
-					let e = u(f.opts?.params);
-					if (!r(i(e))?.insertPreview) return null;
-					let { bounds: t, extras: n, start: o } = a(e, m, m.points, h.userRotation);
+					if (!gesture.open) return null;
+					const resolved = resolveParams(session.opts?.params);
+					if (!shapeKindInfo(insertKind(resolved))?.insertPreview) return null;
+					const { bounds, extras, start } = insertShape(resolved, frame, frame.points, gesture.userRotation);
 					return {
 						kind: "insertPreview",
-						shape: n.kind,
-						bounds: t,
-						extras: n,
+						shape: extras.kind,
+						bounds,
+						extras,
 						anchorPoint: {
-							x: o.x,
-							y: o.y
-						}
+							x: start.x,
+							y: start.y
+						},
+						...copies.length > 0 ? { copies } : {}
 					};
 				},
-				onEnd(t, n) {
-					h.open = !1, g?.gesture === h && (g.gesture = null);
-					let r = !1;
+				onEnd(endCtx, reason) {
+					gesture.open = false;
+					if (live?.gesture === gesture) live.gesture = null;
+					let committed = false;
 					try {
-						n === "cancel" ? o(f) : r = s(f, m, t.drag?.points ?? m.points, h.userRotation);
+						if (reason === "cancel") cancelInsert(session);
+						else committed = commitInsert(session, frame, endCtx.drag?.points ?? frame.points, gesture.userRotation);
 					} finally {
-						e(f.behaviors, f.gestureCtx, r);
+						session.snap.close();
+						runBehaviorSettled(session.behaviors, session.gestureCtx, committed);
 					}
 				}
 			};
 		}
 	},
-	enabled: () => !0
-}, n);
-//#endregion
-export { d as insertAction };
+	/** Insert needs no selection; anything but `true` blocks dispatcher-routed inserts. */
+	enabled: () => true
+}, insertLayer);
 
+//#endregion
+export { insertAction };
 //# sourceMappingURL=action.js.map

package/dist/interactions/actions/insert/action.js.map

@@ -1 +1 @@
-{"version":3,"file":"action.js","names":["insertAction","inPlane","begun","beginInsert","ctx","opts","frame","gesture","live","nextFrame","session","readers","moveCtx","resolved","resolveParams","shapeKindInfo","insertKind","insertShape","extras","start","committed","reason","cancelInsert","commitInsert","endCtx","insertLayer"],"sources":["../../../../src/interactions/actions/insert/action.ts"],"sourcesContent":["import type { Action } from '@weasel-js/routing';\nimport type { InvocationCtx, OngoingHandle, BindingOpts, OngoingOverlay } from '@weasel-js/routing';\nimport { resolveParams } from '@weasel-js/routing';\nimport { shapeKindInfo } from 'core/shapeKinds';\nimport type { KitInsertShape } from 'core/shapeKinds';\nimport { runBehaviorSettled } from '../gestureLifecycle';\nimport { inPlane, insertLayer } from '../planeInput';\nimport { cancelInsert, commitInsert } from './commit';\nimport { nextFrame } from './frame';\nimport type { InsertLiveGesture } from './live';\nimport { beginInsert } from './session';\nimport { insertKind, insertShape } from './shape';\n\n/**\n * @experimental\n * Drag-to-insert. The node `kind` is read from `opts.params.kind`.\n *\n * Grid snapping comes from the optional `snap` dep, applied to the drag's\n * start and current point (never to freehand pencil samples). Behaviors from\n * the binding's `opts.behaviors` (`InsertBehavior[]`) run over the two points\n * after that; on release the first answer wins (`null` aborts, `Op[]` commits\n * in place of the insert).\n *\n * The new node has no scene id until commit, so the live preview is the\n * `overlay()` surface with `kind: 'insertPreview'`. A consumer-defined kind\n * the kit cannot draw skips the preview and still commits on release.\n */\nexport const insertAction: Action & { requires: string[] } = inPlane({\n  id: 'insert',\n  label: 'Insert',\n  group: 'insert',\n  eligible: { capability: 'creates-shapes' },\n  requires: ['insert', 'insertLive', 'selection', 'snap', 'textEdit', 'scene', 'applyOps', 'view'],\n  invoker: {\n    timing: 'ongoing',\n    start(ctx: InvocationCtx, opts?: BindingOpts): OngoingHandle {\n      const begun = beginInsert(ctx, opts);\n      if (!begun) return {};\n      const { session, readers } = begun;\n      let frame = begun.frame;\n      const gesture: InsertLiveGesture = { open: true, userRotation: 0 };\n      const live = ctx.deps.insertLive;\n      if (live) live.gesture = gesture;\n\n      return {\n        kind: 'insert',\n        onMove(moveCtx: InvocationCtx): void {\n          frame = nextFrame(session, readers, frame, moveCtx);\n        },\n        overlay(): OngoingOverlay | null {\n          if (!gesture.open) return null;\n          // Resolve params on every overlay() so thunked params (polygon\n          // sides ticking via ArrowUp mid-drag) reflect in the live preview.\n          const resolved = resolveParams(session.opts?.params);\n          if (!shapeKindInfo(insertKind(resolved))?.insertPreview) return null;\n          const { bounds, extras, start } = insertShape(resolved, frame, frame.points, gesture.userRotation);\n          return {\n            kind: 'insertPreview',\n            shape: extras.kind as KitInsertShape,\n            bounds,\n            extras,\n            // Anchor dot at the click point: radial shapes have no vertex\n            // there, and in center mode it marks the growth axis.\n            anchorPoint: { x: start.x, y: start.y },\n          };\n        },\n        onEnd(endCtx: InvocationCtx, reason: 'commit' | 'cancel'): void {\n          gesture.open = false;\n          if (live?.gesture === gesture) live.gesture = null;\n          let committed = false;\n          try {\n            if (reason === 'cancel') cancelInsert(session);\n            else committed = commitInsert(session, frame, endCtx.drag?.points ?? frame.points, gesture.userRotation);\n          } finally {\n            runBehaviorSettled(session.behaviors, session.gestureCtx, committed);\n          }\n        },\n      };\n    },\n  },\n  /** Insert needs no selection; anything but `true` blocks dispatcher-routed inserts. */\n  enabled: () => true as const,\n}, insertLayer);\n"],"mappings":";;;;;;;;;AA2BA,IAAaA,IAAgDC,EAAQ;CACnE,IAAI;CACJ,OAAO;CACP,OAAO;CACP,UAAU,EAAE,YAAY,iBAAiB;CACzC,UAAU;EAAC;EAAU;EAAc;EAAa;EAAQ;EAAY;EAAS;EAAY;CAAM;CAC/F,SAAS;EACP,QAAQ;EACR,MAAM,GAAoB,GAAmC;GAC3D,IAAMC,IAAQC,EAAYC,GAAKC,CAAI;GACnC,IAAI,CAACH,GAAO,OAAO,CAAC;GACpB,IAAM,EAAE,YAAS,eAAYA,GACzBI,IAAQJ,EAAM,OACZK,IAA6B;IAAE,MAAM;IAAM,cAAc;GAAE,GAC3DC,IAAOJ,EAAI,KAAK;GAGtB,OAFII,MAAM,EAAK,UAAUD,IAElB;IACL,MAAM;IACN,OAAO,GAA8B;KACnC,IAAQE,EAAUC,GAASC,GAASL,GAAOM,CAAO;IACpD;IACA,UAAiC;KAC/B,IAAI,CAACL,EAAQ,MAAM,OAAO;KAG1B,IAAMM,IAAWC,EAAcJ,EAAQ,MAAM,MAAM;KACnD,IAAI,CAACK,EAAcC,EAAWH,CAAQ,CAAC,CAAC,EAAE,eAAe,OAAO;KAChE,IAAM,EAAE,WAAQ,WAAQ,aAAUI,EAAYJ,GAAUP,GAAOA,EAAM,QAAQC,EAAQ,YAAY;KACjG,OAAO;MACL,MAAM;MACN,OAAOW,EAAO;MACd;MACA;MAGA,aAAa;OAAE,GAAGC,EAAM;OAAG,GAAGA,EAAM;MAAE;KACxC;IACF;IACA,MAAM,GAAuB,GAAmC;KAE9D,AADA,EAAQ,OAAO,IACXX,GAAM,YAAYD,MAAS,EAAK,UAAU;KAC9C,IAAIa,IAAY;KAChB,IAAI;MACF,AAAIC,MAAW,WAAUC,EAAaZ,CAAO,IACxC,IAAYa,EAAab,GAASJ,GAAOkB,EAAO,MAAM,UAAUlB,EAAM,QAAQC,EAAQ,YAAY;KACzG,UAAU;MACR,EAAmBG,EAAQ,WAAWA,EAAQ,YAAYU,CAAS;KACrE;IACF;GACF;EACF;CACF;CAEA,eAAe;AACjB,GAAGK,CAAW"}
+{"version":3,"file":"action.js","names":[],"sources":["../../../../src/interactions/actions/insert/action.ts"],"sourcesContent":["import type { Action, NodeId } from '@weasel-js/routing';\nimport type { InvocationCtx, OngoingHandle, BindingOpts, OngoingOverlay } from '@weasel-js/routing';\nimport { resolveParams } from '@weasel-js/routing';\nimport { shapeKindInfo } from 'core/shapeKinds';\nimport type { KitInsertShape } from 'core/shapeKinds';\nimport { SNAP_ROLES } from 'features/snap/roles';\nimport { runBehaviorSettled } from '../gestureLifecycle';\nimport { inPlane, insertLayer } from '../planeInput';\nimport { copiesWithin } from 'canvas/copiesAbove';\nimport { scenePaintedPoseOf } from 'canvas/derivedPath';\nimport { cancelInsert, commitInsert } from './commit';\nimport { carryStart, nextFrame } from './frame';\nimport type { InsertLiveGesture } from './live';\nimport { beginInsert } from './session';\nimport { insertKind, insertShape } from './shape';\n\n/**\n * Drag-to-insert. The node `kind` is read from `opts.params.kind`.\n *\n * The drag's start and current point snap through the `snap` dep's `point`\n * sessions (never freehand pencil samples). While `snap.constrain` (Shift) is\n * held, a line's end stays on the 15° line through the snapped start nearest\n * the pointer, and lands where that line meets a target. Behaviors from the\n * binding's `opts.behaviors` (`InsertBehavior[]`) run over the two points\n * after that; on release the first answer wins (`null` aborts, `Op[]` commits\n * in place of the insert).\n *\n * The new node has no scene id until commit, so the live preview is the\n * `overlay()` surface with `kind: 'insertPreview'`. A consumer-defined kind\n * the kit cannot draw skips the preview and still commits on release.\n */\nexport const insertAction: Action & { requires: string[] } = inPlane({\n  id: 'insert',\n  label: 'Insert',\n  group: 'insert',\n  eligible: { capability: 'creates-shapes' },\n  modifierRoles: SNAP_ROLES,\n  requires: ['insert', 'insertLive', 'insertInto', 'selection', 'snap', 'textEdit', 'scene', 'applyOps', 'view', 'kitSettings'],\n  invoker: {\n    timing: 'ongoing',\n    start(ctx: InvocationCtx, opts?: BindingOpts): OngoingHandle {\n      const begun = beginInsert(ctx, opts);\n      if (!begun) return {};\n      const { session, readers } = begun;\n      let frame = begun.frame;\n      const gesture: InsertLiveGesture = { open: true, userRotation: 0, repositioning: false };\n      const live = ctx.deps.insertLive;\n      if (live) live.gesture = gesture;\n      // Where the shape will land decides the copies it will be drawn in.\n      const scene = ctx.deps.scene;\n      const into = (ctx.deps.insertInto?.get() ?? null) as NodeId | null;\n      const copies = scene ? copiesWithin(scene, into, scenePaintedPoseOf(scene)) : [];\n\n      return {\n        kind: 'insert',\n        onMove(moveCtx: InvocationCtx): void {\n          if (gesture.repositioning) carryStart(session, frame.pointer, moveCtx.world, moveCtx);\n          frame = nextFrame(session, readers, frame, moveCtx);\n        },\n        overlay(): OngoingOverlay | null {\n          if (!gesture.open) return null;\n          // Resolve params on every overlay() so thunked params (polygon\n          // sides ticking via ArrowUp mid-drag) reflect in the live preview.\n          const resolved = resolveParams(session.opts?.params);\n          if (!shapeKindInfo(insertKind(resolved))?.insertPreview) return null;\n          const { bounds, extras, start } = insertShape(resolved, frame, frame.points, gesture.userRotation);\n          return {\n            kind: 'insertPreview',\n            shape: extras.kind as KitInsertShape,\n            bounds,\n            extras,\n            // Anchor dot at the click point: radial shapes have no vertex\n            // there, and in center mode it marks the growth axis.\n            anchorPoint: { x: start.x, y: start.y },\n            ...(copies.length > 0 ? { copies } : {}),\n          };\n        },\n        onEnd(endCtx: InvocationCtx, reason: 'commit' | 'cancel'): void {\n          gesture.open = false;\n          if (live?.gesture === gesture) live.gesture = null;\n          let committed = false;\n          try {\n            if (reason === 'cancel') cancelInsert(session);\n            else committed = commitInsert(session, frame, endCtx.drag?.points ?? frame.points, gesture.userRotation);\n          } finally {\n            session.snap.close();\n            runBehaviorSettled(session.behaviors, session.gestureCtx, committed);\n          }\n        },\n      };\n    },\n  },\n  /** Insert needs no selection; anything but `true` blocks dispatcher-routed inserts. */\n  enabled: () => true as const,\n}, insertLayer);\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BA,IAAa,eAAgD,QAAQ;CACnE,IAAI;CACJ,OAAO;CACP,OAAO;CACP,UAAU,EAAE,YAAY,iBAAiB;CACzC,eAAe;CACf,UAAU;EAAC;EAAU;EAAc;EAAc;EAAa;EAAQ;EAAY;EAAS;EAAY;EAAQ;CAAa;CAC5H,SAAS;EACP,QAAQ;EACR,MAAM,KAAoB,MAAmC;GAC3D,MAAM,QAAQ,YAAY,KAAK,IAAI;GACnC,IAAI,CAAC,OAAO,OAAO,CAAC;GACpB,MAAM,EAAE,SAAS,YAAY;GAC7B,IAAI,QAAQ,MAAM;GAClB,MAAM,UAA6B;IAAE,MAAM;IAAM,cAAc;IAAG,eAAe;GAAM;GACvF,MAAM,OAAO,IAAI,KAAK;GACtB,IAAI,MAAM,KAAK,UAAU;GAEzB,MAAM,QAAQ,IAAI,KAAK;GACvB,MAAM,OAAQ,IAAI,KAAK,YAAY,IAAI,KAAK;GAC5C,MAAM,SAAS,QAAQ,aAAa,OAAO,MAAM,mBAAmB,KAAK,CAAC,IAAI,CAAC;GAE/E,OAAO;IACL,MAAM;IACN,OAAO,SAA8B;KACnC,IAAI,QAAQ,eAAe,WAAW,SAAS,MAAM,SAAS,QAAQ,OAAO,OAAO;KACpF,QAAQ,UAAU,SAAS,SAAS,OAAO,OAAO;IACpD;IACA,UAAiC;KAC/B,IAAI,CAAC,QAAQ,MAAM,OAAO;KAG1B,MAAM,WAAW,cAAc,QAAQ,MAAM,MAAM;KACnD,IAAI,CAAC,cAAc,WAAW,QAAQ,CAAC,CAAC,EAAE,eAAe,OAAO;KAChE,MAAM,EAAE,QAAQ,QAAQ,UAAU,YAAY,UAAU,OAAO,MAAM,QAAQ,QAAQ,YAAY;KACjG,OAAO;MACL,MAAM;MACN,OAAO,OAAO;MACd;MACA;MAGA,aAAa;OAAE,GAAG,MAAM;OAAG,GAAG,MAAM;MAAE;MACtC,GAAI,OAAO,SAAS,IAAI,EAAE,OAAO,IAAI,CAAC;KACxC;IACF;IACA,MAAM,QAAuB,QAAmC;KAC9D,QAAQ,OAAO;KACf,IAAI,MAAM,YAAY,SAAS,KAAK,UAAU;KAC9C,IAAI,YAAY;KAChB,IAAI;MACF,IAAI,WAAW,UAAU,aAAa,OAAO;WACxC,YAAY,aAAa,SAAS,OAAO,OAAO,MAAM,UAAU,MAAM,QAAQ,QAAQ,YAAY;KACzG,UAAU;MACR,QAAQ,KAAK,MAAM;MACnB,mBAAmB,QAAQ,WAAW,QAAQ,YAAY,SAAS;KACrE;IACF;GACF;EACF;CACF;;CAEA,eAAe;AACjB,GAAG,WAAW"}

package/dist/interactions/actions/insert/commit.js

@@ -1,28 +1,50 @@
-import { commitGestureOps as e, readGestureLifecycle as t, reduceBehaviorEnd as n, runBehaviorCancel as r } from "../gestureLifecycle.js";
-import { defaultCommitAdapter as i } from "../defaultCommitAdapter.js";
-import { insertShape as a, isCommittableExtent as o } from "./shape.js";
-import { resolveParams as s } from "@weasel-js/routing";
+import { commitGestureOps, readGestureLifecycle, reduceBehaviorEnd, runBehaviorCancel } from "../gestureLifecycle.js";
+import { defaultCommitAdapter } from "../defaultCommitAdapter.js";
+import { shapeKindInfo } from "../../../core/shapeKinds.js";
+import { insertShape, isCommittableExtent } from "./shape.js";
+import { resolveParams } from "@weasel-js/routing";
+
 //#region src/interactions/actions/insert/commit.ts
-function c(e) {
-	r(e.behaviors, e.gestureCtx), e.priorSelection.length > 0 && e.selection?.set([...e.priorSelection]);
+/**
+* A freshly inserted text box is empty, so it draws nothing and the tool's own
+* `click on selected body → enterTextEdit` binding has nothing visible to
+* click. Drop straight into the caret instead, for every kind that is text —
+* which is also what every other editor does. `textEdit` is optional: without
+* it the node is still committed.
+*/
+function enterInsertedText(textEdit, id, kind) {
+	if (id !== null && shapeKindInfo(kind)?.text) textEdit?.startEdit(id, { caret: 0 });
+}
+/** Cancel the insert: tell the behaviors, and put the selection the draw
+*  cleared back. */
+function cancelInsert(session) {
+	runBehaviorCancel(session.behaviors, session.gestureCtx);
+	if (session.priorSelection.length > 0) session.selection?.set([...session.priorSelection]);
 }
-function l(r, c, l, u) {
-	let d = s(r.opts?.params);
-	if (r.behaviors.length > 0) {
-		let a = n(r.behaviors, r.gestureCtx);
-		if (a === null) return !1;
-		if (a !== void 0) return r.scene ? e({
-			scene: r.scene,
-			applyOps: r.applyOps,
-			adapter: i(r.scene, r.selection?.adapterMethods)
-		}, t(d, "Insert", r.behaviors), a) : !1;
+/** Commit the insert. Returns whether it committed: a behavior's ops reached
+*  the scene, or the `insert` dep minted a node. `points` is the pointer
+*  trail as the release left it. */
+function commitInsert(session, frame, points, userRotation) {
+	const resolved = resolveParams(session.opts?.params);
+	if (session.behaviors.length > 0) {
+		const r = reduceBehaviorEnd(session.behaviors, session.gestureCtx);
+		if (r === null) return false;
+		if (r !== void 0) {
+			if (!session.scene) return false;
+			return commitGestureOps({
+				scene: session.scene,
+				applyOps: session.applyOps,
+				adapter: defaultCommitAdapter(session.scene, session.selection?.adapterMethods)
+			}, readGestureLifecycle(resolved, "Insert", session.behaviors), r);
+		}
 	}
-	let { bounds: f, extras: p } = a(d, c, l, u);
-	if (!o(f, p.kind)) return !1;
-	let m = r.dep.commit(f, p);
-	return m !== null && p.kind === "text" && r.textEdit?.startEdit(String(m), { caret: 0 }), m !== null;
+	const { bounds, extras, ends } = insertShape(resolved, frame, points, userRotation);
+	if (!isCommittableExtent(bounds, extras.kind)) return false;
+	const id = session.dep.commit(bounds, extras, ends);
+	enterInsertedText(session.textEdit, id === null ? null : String(id), extras.kind);
+	return id !== null;
 }
-//#endregion
-export { c as cancelInsert, l as commitInsert };
 
+//#endregion
+export { cancelInsert, commitInsert, enterInsertedText };
 //# sourceMappingURL=commit.js.map

package/dist/interactions/actions/insert/commit.js.map

@@ -1 +1 @@
-{"version":3,"file":"commit.js","names":["cancelInsert","runBehaviorCancel","session","commitInsert","resolved","resolveParams","r","reduceBehaviorEnd","commitGestureOps","defaultCommitAdapter","readGestureLifecycle","insertShape","frame","points","userRotation","isCommittableExtent","bounds","extras","id"],"sources":["../../../../src/interactions/actions/insert/commit.ts"],"sourcesContent":["import type { DragSample } from '@weasel-js/routing';\nimport { resolveParams } from '@weasel-js/routing';\nimport { defaultCommitAdapter } from '../defaultCommitAdapter';\nimport { commitGestureOps, readGestureLifecycle, reduceBehaviorEnd, runBehaviorCancel } from '../gestureLifecycle';\nimport type { InsertFrame, InsertSession } from './session';\nimport { insertShape, isCommittableExtent } from './shape';\n\n/** Cancel the insert: tell the behaviors, and put the selection the draw\n *  cleared back. */\nexport function cancelInsert(\n  session: Pick<InsertSession, 'behaviors' | 'gestureCtx' | 'priorSelection' | 'selection'>,\n): void {\n  runBehaviorCancel(session.behaviors, session.gestureCtx);\n  if (session.priorSelection.length > 0) session.selection?.set([...session.priorSelection]);\n}\n\n/** Commit the insert. Returns whether it committed: a behavior's ops reached\n *  the scene, or the `insert` dep minted a node. `points` is the pointer\n *  trail as the release left it. */\nexport function commitInsert(\n  session: InsertSession,\n  frame: Pick<InsertFrame, 'shaped' | 'altHeld'>,\n  points: ReadonlyArray<DragSample> | null,\n  userRotation: number,\n): boolean {\n  // Resolve params at commit time so thunked params (polygon\n  // `sides` adjusted mid-drag, etc.) see the latest tool state.\n  const resolved = resolveParams(session.opts?.params);\n\n  if (session.behaviors.length > 0) {\n    const r = reduceBehaviorEnd(session.behaviors, session.gestureCtx);\n    if (r === null) return false;\n    if (r !== undefined) {\n      if (!session.scene) return false;\n      return commitGestureOps(\n        {\n          scene: session.scene,\n          applyOps: session.applyOps,\n          adapter: defaultCommitAdapter(session.scene, session.selection?.adapterMethods),\n        },\n        readGestureLifecycle(resolved, 'Insert', session.behaviors),\n        r,\n      );\n    }\n  }\n\n  const { bounds, extras } = insertShape(resolved, frame, points, userRotation);\n  // Sub-threshold drag — no insert.\n  if (!isCommittableExtent(bounds, extras.kind)) return false;\n\n  const id = session.dep.commit(bounds, extras);\n\n  // A freshly dragged text box is empty, so it draws nothing and the\n  // tool's own `click on selected body → enterTextEdit` binding has\n  // nothing visible to click. Drop straight into the caret instead —\n  // which is also what every other editor does with a text tool.\n  // `textEdit` is optional: without it the box is still committed,\n  // exactly as before.\n  if (id !== null && extras.kind === 'text') {\n    session.textEdit?.startEdit(String(id), { caret: 0 });\n  }\n  return id !== null;\n}\n"],"mappings":";;;;;AASA,SAAgBA,EACd,GACM;CAEN,AADAC,EAAkBC,EAAQ,WAAWA,EAAQ,UAAU,GACnDA,EAAQ,eAAe,SAAS,KAAGA,EAAQ,WAAW,IAAI,CAAC,GAAGA,EAAQ,cAAc,CAAC;AAC3F;AAKA,SAAgBC,EACd,GACA,GACA,GACA,GACS;CAGT,IAAMC,IAAWC,EAAcH,EAAQ,MAAM,MAAM;CAEnD,IAAIA,EAAQ,UAAU,SAAS,GAAG;EAChC,IAAMI,IAAIC,EAAkBL,EAAQ,WAAWA,EAAQ,UAAU;EACjE,IAAII,MAAM,MAAM,OAAO;EACvB,IAAIA,MAAM,KAAA,GAER,OADKJ,EAAQ,QACNM,EACL;GACE,OAAON,EAAQ;GACf,UAAUA,EAAQ;GAClB,SAASO,EAAqBP,EAAQ,OAAOA,EAAQ,WAAW,cAAc;EAChF,GACAQ,EAAqBN,GAAU,UAAUF,EAAQ,SAAS,GAC1DI,CACF,IAT2B;CAW/B;CAEA,IAAM,EAAE,WAAQ,cAAWK,EAAYP,GAAUQ,GAAOC,GAAQC,CAAY;CAE5E,IAAI,CAACC,EAAoBC,GAAQC,EAAO,IAAI,GAAG,OAAO;CAEtD,IAAMC,IAAKhB,EAAQ,IAAI,OAAOc,GAAQC,CAAM;CAW5C,OAHIC,MAAO,QAAQD,EAAO,SAAS,UACjCf,EAAQ,UAAU,UAAU,OAAOgB,CAAE,GAAG,EAAE,OAAO,EAAE,CAAC,GAE/CA,MAAO;AAChB"}
+{"version":3,"file":"commit.js","names":[],"sources":["../../../../src/interactions/actions/insert/commit.ts"],"sourcesContent":["import type { DragSample } from '@weasel-js/routing';\nimport { resolveParams } from '@weasel-js/routing';\nimport { defaultCommitAdapter } from '../defaultCommitAdapter';\nimport { commitGestureOps, readGestureLifecycle, reduceBehaviorEnd, runBehaviorCancel } from '../gestureLifecycle';\nimport type { InsertFrame, InsertSession } from './session';\nimport { insertShape, isCommittableExtent } from './shape';\nimport { shapeKindInfo } from 'core/shapeKinds';\nimport type { TextEditDep } from '../depSchema';\n\n/**\n * A freshly inserted text box is empty, so it draws nothing and the tool's own\n * `click on selected body → enterTextEdit` binding has nothing visible to\n * click. Drop straight into the caret instead, for every kind that is text —\n * which is also what every other editor does. `textEdit` is optional: without\n * it the node is still committed.\n */\nexport function enterInsertedText(textEdit: TextEditDep | undefined, id: string | null, kind: string): void {\n  if (id !== null && shapeKindInfo(kind)?.text) textEdit?.startEdit(id, { caret: 0 });\n}\n\n/** Cancel the insert: tell the behaviors, and put the selection the draw\n *  cleared back. */\nexport function cancelInsert(\n  session: Pick<InsertSession, 'behaviors' | 'gestureCtx' | 'priorSelection' | 'selection'>,\n): void {\n  runBehaviorCancel(session.behaviors, session.gestureCtx);\n  if (session.priorSelection.length > 0) session.selection?.set([...session.priorSelection]);\n}\n\n/** Commit the insert. Returns whether it committed: a behavior's ops reached\n *  the scene, or the `insert` dep minted a node. `points` is the pointer\n *  trail as the release left it. */\nexport function commitInsert(\n  session: InsertSession,\n  frame: Pick<InsertFrame, 'shaped' | 'altHeld'>,\n  points: ReadonlyArray<DragSample> | null,\n  userRotation: number,\n): boolean {\n  // Resolve params at commit time so thunked params (polygon\n  // `sides` adjusted mid-drag, etc.) see the latest tool state.\n  const resolved = resolveParams(session.opts?.params);\n\n  if (session.behaviors.length > 0) {\n    const r = reduceBehaviorEnd(session.behaviors, session.gestureCtx);\n    if (r === null) return false;\n    if (r !== undefined) {\n      if (!session.scene) return false;\n      return commitGestureOps(\n        {\n          scene: session.scene,\n          applyOps: session.applyOps,\n          adapter: defaultCommitAdapter(session.scene, session.selection?.adapterMethods),\n        },\n        readGestureLifecycle(resolved, 'Insert', session.behaviors),\n        r,\n      );\n    }\n  }\n\n  const { bounds, extras, ends } = insertShape(resolved, frame, points, userRotation);\n  // Sub-threshold drag — no insert.\n  if (!isCommittableExtent(bounds, extras.kind)) return false;\n\n  const id = session.dep.commit(bounds, extras, ends);\n  enterInsertedText(session.textEdit, id === null ? null : String(id), extras.kind);\n  return id !== null;\n}\n"],"mappings":";;;;;;;;;;;;;;AAgBA,SAAgB,kBAAkB,UAAmC,IAAmB,MAAoB;CAC1G,IAAI,OAAO,QAAQ,cAAc,IAAI,CAAC,EAAE,MAAM,UAAU,UAAU,IAAI,EAAE,OAAO,EAAE,CAAC;AACpF;;;AAIA,SAAgB,aACd,SACM;CACN,kBAAkB,QAAQ,WAAW,QAAQ,UAAU;CACvD,IAAI,QAAQ,eAAe,SAAS,GAAG,QAAQ,WAAW,IAAI,CAAC,GAAG,QAAQ,cAAc,CAAC;AAC3F;;;;AAKA,SAAgB,aACd,SACA,OACA,QACA,cACS;CAGT,MAAM,WAAW,cAAc,QAAQ,MAAM,MAAM;CAEnD,IAAI,QAAQ,UAAU,SAAS,GAAG;EAChC,MAAM,IAAI,kBAAkB,QAAQ,WAAW,QAAQ,UAAU;EACjE,IAAI,MAAM,MAAM,OAAO;EACvB,IAAI,MAAM,QAAW;GACnB,IAAI,CAAC,QAAQ,OAAO,OAAO;GAC3B,OAAO,iBACL;IACE,OAAO,QAAQ;IACf,UAAU,QAAQ;IAClB,SAAS,qBAAqB,QAAQ,OAAO,QAAQ,WAAW,cAAc;GAChF,GACA,qBAAqB,UAAU,UAAU,QAAQ,SAAS,GAC1D,CACF;EACF;CACF;CAEA,MAAM,EAAE,QAAQ,QAAQ,SAAS,YAAY,UAAU,OAAO,QAAQ,YAAY;CAElF,IAAI,CAAC,oBAAoB,QAAQ,OAAO,IAAI,GAAG,OAAO;CAEtD,MAAM,KAAK,QAAQ,IAAI,OAAO,QAAQ,QAAQ,IAAI;CAClD,kBAAkB,QAAQ,UAAU,OAAO,OAAO,OAAO,OAAO,EAAE,GAAG,OAAO,IAAI;CAChF,OAAO,OAAO;AAChB"}

package/dist/interactions/actions/insert/extras.js

@@ -1,65 +1,87 @@
 //#region src/interactions/actions/insert/extras.ts
-function e(e, t, n, r, i, a) {
-	let o = e?.kind ?? "rect";
-	switch (o) {
+/** Build a typed `InsertExtras` from the static params + gesture context.
+*  Kit-built-in kinds (line / polygon / star / pencil) read kind-specific
+*  fields; unknown kinds pass the raw params through as `{ kind, ... }`. */
+function buildExtras(params, startX, startY, currentX, currentY, points) {
+	const kind = params?.["kind"] ?? "rect";
+	switch (kind) {
 		case "rect":
-		case "ellipse": return { kind: o };
+		case "ellipse": return { kind };
 		case "line": return {
 			kind: "line",
 			a: {
-				x: t,
-				y: n
+				x: startX,
+				y: startY
 			},
 			b: {
-				x: r,
-				y: i
+				x: currentX,
+				y: currentY
 			}
 		};
 		case "polygon": {
-			let a = Number(e?.sides ?? 6), o = r === t && i === n ? 0 : Math.atan2(i - n, r - t), s = {
+			const sides = Number(params?.["sides"] ?? 6);
+			const dragAngle = currentX === startX && currentY === startY ? 0 : Math.atan2(currentY - startY, currentX - startX);
+			const extras = {
 				kind: "polygon",
-				sides: a,
-				rotation: e?.rotation === void 0 ? o : Number(e.rotation)
+				sides,
+				rotation: params?.["rotation"] !== void 0 ? Number(params["rotation"]) : dragAngle
 			};
-			if (e?.originMode === "center") {
-				let e = r - t, a = i - n;
-				s.center = {
-					x: t,
-					y: n
-				}, s.radius = Math.hypot(e, a);
-			} else e?.center !== void 0 && (s.center = e.center), e?.radius !== void 0 && (s.radius = e.radius);
-			return s;
+			if (params?.["originMode"] === "center") {
+				const dx = currentX - startX;
+				const dy = currentY - startY;
+				extras.center = {
+					x: startX,
+					y: startY
+				};
+				extras.radius = Math.hypot(dx, dy);
+			} else {
+				if (params?.["center"] !== void 0) extras.center = params["center"];
+				if (params?.["radius"] !== void 0) extras.radius = params["radius"];
+			}
+			return extras;
 		}
 		case "star": {
-			let a = Number(e?.points ?? 5), o = Number(e?.innerRadiusRatio ?? .5), s = r === t && i === n ? 0 : Math.atan2(i - n, r - t), c = {
+			const pts = Number(params?.["points"] ?? 5);
+			const ir = Number(params?.["innerRadiusRatio"] ?? .5);
+			const dragAngle = currentX === startX && currentY === startY ? 0 : Math.atan2(currentY - startY, currentX - startX);
+			const extras = {
 				kind: "star",
-				points: a,
-				innerRadiusRatio: o,
-				rotation: e?.rotation === void 0 ? s : Number(e.rotation)
+				points: pts,
+				innerRadiusRatio: ir,
+				rotation: params?.["rotation"] !== void 0 ? Number(params["rotation"]) : dragAngle
 			};
-			if (e?.originMode === "center") {
-				let e = r - t, a = i - n;
-				c.center = {
-					x: t,
-					y: n
-				}, c.outerRadius = Math.hypot(e, a);
-			} else e?.center !== void 0 && (c.center = e.center), e?.outerRadius !== void 0 && (c.outerRadius = e.outerRadius);
-			return c;
+			if (params?.["originMode"] === "center") {
+				const dx = currentX - startX;
+				const dy = currentY - startY;
+				extras.center = {
+					x: startX,
+					y: startY
+				};
+				extras.outerRadius = Math.hypot(dx, dy);
+			} else {
+				if (params?.["center"] !== void 0) extras.center = params["center"];
+				if (params?.["outerRadius"] !== void 0) extras.outerRadius = params["outerRadius"];
+			}
+			return extras;
 		}
 		case "pencil": return {
 			kind: "pencil",
-			samples: e?.samples ?? a ?? []
+			samples: params?.["samples"] ?? points ?? []
 		};
 		default: return {
-			...e ?? {},
-			kind: o
+			...params ?? {},
+			kind
 		};
 	}
 }
-function t(e, t) {
-	t !== 0 && (e.kind === "star" || e.kind === "polygon") && (e.rotation += t);
+/** Add a user-driven rotation offset onto kinds that carry rotation. Rect
+*  / ellipse / line / pencil don't expose a rotation field on their
+*  extras today, so they ignore the offset. */
+function applyUserRotation(extras, userRotation) {
+	if (userRotation === 0) return;
+	if (extras.kind === "star" || extras.kind === "polygon") extras.rotation += userRotation;
 }
-//#endregion
-export { t as applyUserRotation, e as buildExtras };
 
+//#endregion
+export { applyUserRotation, buildExtras };
 //# sourceMappingURL=extras.js.map

package/dist/interactions/actions/insert/extras.js.map

@@ -1 +1 @@
-{"version":3,"file":"extras.js","names":["buildExtras","kind","params","\"kind\"","startX","startY","currentX","currentY","sides","\"sides\"","dragAngle","extras","\"rotation\"","\"originMode\"","dx","dy","\"center\"","\"radius\"","pts","\"points\"","ir","\"innerRadiusRatio\"","\"outerRadius\"","\"samples\"","points","applyUserRotation","userRotation"],"sources":["../../../../src/interactions/actions/insert/extras.ts"],"sourcesContent":["import type { DragSample } from '@weasel-js/routing';\nimport type { InsertExtras } from '../depSchema';\n\n/** Build a typed `InsertExtras` from the static params + gesture context.\n *  Kit-built-in kinds (line / polygon / star / pencil) read kind-specific\n *  fields; unknown kinds pass the raw params through as `{ kind, ... }`. */\nexport function buildExtras(\n  params: Record<string, unknown> | undefined,\n  startX: number,\n  startY: number,\n  currentX: number,\n  currentY: number,\n  points: ReadonlyArray<DragSample> | null,\n): InsertExtras {\n  const kind = ((params?.['kind'] as string | undefined) ?? 'rect');\n  switch (kind) {\n    case 'rect':\n    case 'ellipse':\n      return { kind } as InsertExtras;\n    case 'line':\n      // Use the live drag endpoints (not AABB) so the line preserves the\n      // user's drag direction — drag from bottom-left to top-right makes a\n      // line that slopes up, not the bounds diagonal.\n      return { kind: 'line', a: { x: startX, y: startY }, b: { x: currentX, y: currentY } };\n    case 'polygon': {\n      const sides = Number(params?.['sides'] ?? 6);\n      // When the tool omits rotation, point the first vertex along the\n      // drag vector so dragging in a direction orients the shape that\n      // way. Sub-pixel drags (no direction yet) fall back to 0.\n      const dragAngle = (currentX === startX && currentY === startY)\n        ? 0\n        : Math.atan2(currentY - startY, currentX - startX);\n      const rotation = params?.['rotation'] !== undefined\n        ? Number(params['rotation'])\n        : dragAngle;\n      const extras: InsertExtras = { kind: 'polygon', sides, rotation };\n      // Drag-from-center: tool's Alt binding passes `originMode:'center'`.\n      // Compute polygon center + radius from the drag vector so the shape\n      // anchors on the click point. Without this, the dep falls back to\n      // inscribing in the AABB (drag-from-corner default).\n      if (params?.['originMode'] === 'center') {\n        const dx = currentX - startX;\n        const dy = currentY - startY;\n        (extras as { center?: unknown }).center = { x: startX, y: startY };\n        (extras as { radius?: unknown }).radius = Math.hypot(dx, dy);\n      } else {\n        if (params?.['center'] !== undefined) (extras as { center?: unknown }).center = params['center'];\n        if (params?.['radius'] !== undefined) (extras as { radius?: unknown }).radius = params['radius'];\n      }\n      return extras;\n    }\n    case 'star': {\n      const pts = Number(params?.['points'] ?? 5);\n      const ir = Number(params?.['innerRadiusRatio'] ?? 0.5);\n      const dragAngle = (currentX === startX && currentY === startY)\n        ? 0\n        : Math.atan2(currentY - startY, currentX - startX);\n      const rotation = params?.['rotation'] !== undefined\n        ? Number(params['rotation'])\n        : dragAngle;\n      const extras: InsertExtras = { kind: 'star', points: pts, innerRadiusRatio: ir, rotation };\n      if (params?.['originMode'] === 'center') {\n        const dx = currentX - startX;\n        const dy = currentY - startY;\n        (extras as { center?: unknown }).center = { x: startX, y: startY };\n        (extras as { outerRadius?: unknown }).outerRadius = Math.hypot(dx, dy);\n      } else {\n        if (params?.['center'] !== undefined) (extras as { center?: unknown }).center = params['center'];\n        if (params?.['outerRadius'] !== undefined) (extras as { outerRadius?: unknown }).outerRadius = params['outerRadius'];\n      }\n      return extras;\n    }\n    case 'pencil':\n      // Prefer tool-supplied samples (param) when present — pencil tools may\n      // capture richer per-sample data (pressure/tilt). Fall back to the\n      // dispatcher's accumulated pointer trail.\n      return {\n        kind: 'pencil',\n        samples: (params?.['samples'] as ReadonlyArray<DragSample> | undefined)\n          ?? points\n          ?? [],\n      };\n    default:\n      // Consumer-defined kind: pass everything through so a custom insert\n      // dep can read its own fields.\n      return { ...(params ?? {}), kind } as InsertExtras;\n  }\n}\n\n/** Add a user-driven rotation offset onto kinds that carry rotation. Rect\n *  / ellipse / line / pencil don't expose a rotation field on their\n *  extras today, so they ignore the offset. */\nexport function applyUserRotation(extras: InsertExtras, userRotation: number): void {\n  if (userRotation === 0) return;\n  if (extras.kind === 'star' || extras.kind === 'polygon') {\n    (extras as { rotation: number }).rotation += userRotation;\n  }\n}\n"],"mappings":";AAMA,SAAgBA,EACd,GACA,GACA,GACA,GACA,GACA,GACc;CACd,IAAMC,IAASC,GAASC,QAAkC;CAC1D,QAAQF,GAAR;EACE,KAAK;EACL,KAAK,WACH,OAAO,EAAE,QAAK;EAChB,KAAK,QAIH,OAAO;GAAE,MAAM;GAAQ,GAAG;IAAE,GAAGG;IAAQ,GAAGC;GAAO;GAAG,GAAG;IAAE,GAAGC;IAAU,GAAGC;GAAS;EAAE;EACtF,KAAK,WAAW;GACd,IAAMC,IAAQ,OAAON,GAASO,SAAY,CAAC,GAIrCC,IAAaJ,MAAaF,KAAUG,MAAaF,IACnD,IACA,KAAK,MAAME,IAAWF,GAAQC,IAAWF,CAAM,GAI7CO,IAAuB;IAAE,MAAM;IAAW;IAAO,UAHtCT,GAASU,aAAgB,KAAA,IAEtCF,IADA,OAAOR,EAAOU,QAAW;GAEmC;GAKhE,IAAIV,GAASW,eAAkB,UAAU;IACvC,IAAMC,IAAKR,IAAWF,GAChBW,IAAKR,IAAWF;IAEtB,AADA,EAAiC,SAAS;KAAE,GAAGD;KAAQ,GAAGC;IAAO,GACjE,EAAiC,SAAS,KAAK,MAAMS,GAAIC,CAAE;GAC7D,OAEE,AADIb,GAASc,WAAc,KAAA,MAAW,EAAiC,SAASd,EAAOc,SACnFd,GAASe,WAAc,KAAA,MAAW,EAAiC,SAASf,EAAOe;GAEzF,OAAON;EACT;EACA,KAAK,QAAQ;GACX,IAAMO,IAAM,OAAOhB,GAASiB,UAAa,CAAC,GACpCC,IAAK,OAAOlB,GAASmB,oBAAuB,EAAG,GAC/CX,IAAaJ,MAAaF,KAAUG,MAAaF,IACnD,IACA,KAAK,MAAME,IAAWF,GAAQC,IAAWF,CAAM,GAI7CO,IAAuB;IAAE,MAAM;IAAQ,QAAQO;IAAK,kBAAkBE;IAAI,UAH/DlB,GAASU,aAAgB,KAAA,IAEtCF,IADA,OAAOR,EAAOU,QAAW;GAE4D;GACzF,IAAIV,GAASW,eAAkB,UAAU;IACvC,IAAMC,IAAKR,IAAWF,GAChBW,IAAKR,IAAWF;IAEtB,AADA,EAAiC,SAAS;KAAE,GAAGD;KAAQ,GAAGC;IAAO,GACjE,EAAsC,cAAc,KAAK,MAAMS,GAAIC,CAAE;GACvE,OAEE,AADIb,GAASc,WAAc,KAAA,MAAW,EAAiC,SAASd,EAAOc,SACnFd,GAASoB,gBAAmB,KAAA,MAAW,EAAsC,cAAcpB,EAAOoB;GAExG,OAAOX;EACT;EACA,KAAK,UAIH,OAAO;GACL,MAAM;GACN,SAAUT,GAASqB,WACdC,KACA,CAAC;EACR;EACF,SAGE,OAAO;GAAE,GAAItB,KAAU,CAAC;GAAI;EAAK;CACrC;AACF;AAKA,SAAgBuB,EAAkB,GAAsB,GAA4B;CAClF,AAAIC,MAAiB,MACjBf,EAAO,SAAS,UAAUA,EAAO,SAAS,eAC5C,EAAiC,YAAYe;AAEjD"}
+{"version":3,"file":"extras.js","names":[],"sources":["../../../../src/interactions/actions/insert/extras.ts"],"sourcesContent":["import type { DragSample } from '@weasel-js/routing';\nimport type { InsertExtras } from '../depSchema';\n\n/** Build a typed `InsertExtras` from the static params + gesture context.\n *  Kit-built-in kinds (line / polygon / star / pencil) read kind-specific\n *  fields; unknown kinds pass the raw params through as `{ kind, ... }`. */\nexport function buildExtras(\n  params: Record<string, unknown> | undefined,\n  startX: number,\n  startY: number,\n  currentX: number,\n  currentY: number,\n  points: ReadonlyArray<DragSample> | null,\n): InsertExtras {\n  const kind = ((params?.['kind'] as string | undefined) ?? 'rect');\n  switch (kind) {\n    case 'rect':\n    case 'ellipse':\n      return { kind } as InsertExtras;\n    case 'line':\n      // Use the live drag endpoints (not AABB) so the line preserves the\n      // user's drag direction — drag from bottom-left to top-right makes a\n      // line that slopes up, not the bounds diagonal.\n      return { kind: 'line', a: { x: startX, y: startY }, b: { x: currentX, y: currentY } };\n    case 'polygon': {\n      const sides = Number(params?.['sides'] ?? 6);\n      // When the tool omits rotation, point the first vertex along the\n      // drag vector so dragging in a direction orients the shape that\n      // way. Sub-pixel drags (no direction yet) fall back to 0.\n      const dragAngle = (currentX === startX && currentY === startY)\n        ? 0\n        : Math.atan2(currentY - startY, currentX - startX);\n      const rotation = params?.['rotation'] !== undefined\n        ? Number(params['rotation'])\n        : dragAngle;\n      const extras: InsertExtras = { kind: 'polygon', sides, rotation };\n      // Drag-from-center: tool's Alt binding passes `originMode:'center'`.\n      // Compute polygon center + radius from the drag vector so the shape\n      // anchors on the click point. Without this, the dep falls back to\n      // inscribing in the AABB (drag-from-corner default).\n      if (params?.['originMode'] === 'center') {\n        const dx = currentX - startX;\n        const dy = currentY - startY;\n        (extras as { center?: unknown }).center = { x: startX, y: startY };\n        (extras as { radius?: unknown }).radius = Math.hypot(dx, dy);\n      } else {\n        if (params?.['center'] !== undefined) (extras as { center?: unknown }).center = params['center'];\n        if (params?.['radius'] !== undefined) (extras as { radius?: unknown }).radius = params['radius'];\n      }\n      return extras;\n    }\n    case 'star': {\n      const pts = Number(params?.['points'] ?? 5);\n      const ir = Number(params?.['innerRadiusRatio'] ?? 0.5);\n      const dragAngle = (currentX === startX && currentY === startY)\n        ? 0\n        : Math.atan2(currentY - startY, currentX - startX);\n      const rotation = params?.['rotation'] !== undefined\n        ? Number(params['rotation'])\n        : dragAngle;\n      const extras: InsertExtras = { kind: 'star', points: pts, innerRadiusRatio: ir, rotation };\n      if (params?.['originMode'] === 'center') {\n        const dx = currentX - startX;\n        const dy = currentY - startY;\n        (extras as { center?: unknown }).center = { x: startX, y: startY };\n        (extras as { outerRadius?: unknown }).outerRadius = Math.hypot(dx, dy);\n      } else {\n        if (params?.['center'] !== undefined) (extras as { center?: unknown }).center = params['center'];\n        if (params?.['outerRadius'] !== undefined) (extras as { outerRadius?: unknown }).outerRadius = params['outerRadius'];\n      }\n      return extras;\n    }\n    case 'pencil':\n      // Prefer tool-supplied samples (param) when present — pencil tools may\n      // capture richer per-sample data (pressure/tilt). Fall back to the\n      // dispatcher's accumulated pointer trail.\n      return {\n        kind: 'pencil',\n        samples: (params?.['samples'] as ReadonlyArray<DragSample> | undefined)\n          ?? points\n          ?? [],\n      };\n    default:\n      // Consumer-defined kind: pass everything through so a custom insert\n      // dep can read its own fields.\n      return { ...(params ?? {}), kind } as InsertExtras;\n  }\n}\n\n/** Add a user-driven rotation offset onto kinds that carry rotation. Rect\n *  / ellipse / line / pencil don't expose a rotation field on their\n *  extras today, so they ignore the offset. */\nexport function applyUserRotation(extras: InsertExtras, userRotation: number): void {\n  if (userRotation === 0) return;\n  if (extras.kind === 'star' || extras.kind === 'polygon') {\n    (extras as { rotation: number }).rotation += userRotation;\n  }\n}\n"],"mappings":";;;;AAMA,SAAgB,YACd,QACA,QACA,QACA,UACA,UACA,QACc;CACd,MAAM,OAAS,SAAS,WAAkC;CAC1D,QAAQ,MAAR;EACE,KAAK;EACL,KAAK,WACH,OAAO,EAAE,KAAK;EAChB,KAAK,QAIH,OAAO;GAAE,MAAM;GAAQ,GAAG;IAAE,GAAG;IAAQ,GAAG;GAAO;GAAG,GAAG;IAAE,GAAG;IAAU,GAAG;GAAS;EAAE;EACtF,KAAK,WAAW;GACd,MAAM,QAAQ,OAAO,SAAS,YAAY,CAAC;GAI3C,MAAM,YAAa,aAAa,UAAU,aAAa,SACnD,IACA,KAAK,MAAM,WAAW,QAAQ,WAAW,MAAM;GAInD,MAAM,SAAuB;IAAE,MAAM;IAAW;IAAO,UAHtC,SAAS,gBAAgB,SACtC,OAAO,OAAO,WAAW,IACzB;GAC4D;GAKhE,IAAI,SAAS,kBAAkB,UAAU;IACvC,MAAM,KAAK,WAAW;IACtB,MAAM,KAAK,WAAW;IACtB,OAAiC,SAAS;KAAE,GAAG;KAAQ,GAAG;IAAO;IACjE,OAAiC,SAAS,KAAK,MAAM,IAAI,EAAE;GAC7D,OAAO;IACL,IAAI,SAAS,cAAc,QAAW,OAAiC,SAAS,OAAO;IACvF,IAAI,SAAS,cAAc,QAAW,OAAiC,SAAS,OAAO;GACzF;GACA,OAAO;EACT;EACA,KAAK,QAAQ;GACX,MAAM,MAAM,OAAO,SAAS,aAAa,CAAC;GAC1C,MAAM,KAAK,OAAO,SAAS,uBAAuB,EAAG;GACrD,MAAM,YAAa,aAAa,UAAU,aAAa,SACnD,IACA,KAAK,MAAM,WAAW,QAAQ,WAAW,MAAM;GAInD,MAAM,SAAuB;IAAE,MAAM;IAAQ,QAAQ;IAAK,kBAAkB;IAAI,UAH/D,SAAS,gBAAgB,SACtC,OAAO,OAAO,WAAW,IACzB;GACqF;GACzF,IAAI,SAAS,kBAAkB,UAAU;IACvC,MAAM,KAAK,WAAW;IACtB,MAAM,KAAK,WAAW;IACtB,OAAiC,SAAS;KAAE,GAAG;KAAQ,GAAG;IAAO;IACjE,OAAsC,cAAc,KAAK,MAAM,IAAI,EAAE;GACvE,OAAO;IACL,IAAI,SAAS,cAAc,QAAW,OAAiC,SAAS,OAAO;IACvF,IAAI,SAAS,mBAAmB,QAAW,OAAsC,cAAc,OAAO;GACxG;GACA,OAAO;EACT;EACA,KAAK,UAIH,OAAO;GACL,MAAM;GACN,SAAU,SAAS,cACd,UACA,CAAC;EACR;EACF,SAGE,OAAO;GAAE,GAAI,UAAU,CAAC;GAAI;EAAK;CACrC;AACF;;;;AAKA,SAAgB,kBAAkB,QAAsB,cAA4B;CAClF,IAAI,iBAAiB,GAAG;CACxB,IAAI,OAAO,SAAS,UAAU,OAAO,SAAS,WAC5C,OAAiC,YAAY;AAEjD"}

package/dist/interactions/actions/insert/frame.js

@@ -1,48 +1,74 @@
-import { pointerStateOf as e } from "../pointerState.js";
-import { computeBounds as t, effectiveOriginMode as n, snapTo15Degrees as r } from "./geometry.js";
-import { GESTURE_KEY as i } from "./session.js";
-import { resolveParams as a } from "@weasel-js/routing";
+import { pointerStateOf } from "../pointerState.js";
+import { snapMods } from "../../../features/snap/roles.js";
+import { computeBounds, effectiveOriginMode } from "./geometry.js";
+import { GESTURE_KEY } from "./session.js";
+import { resolveParams } from "@weasel-js/routing";
+
 //#region src/interactions/actions/insert/frame.ts
-function o(o, s, c, l) {
-	let u = a(o.opts?.params), d = u?.kind ?? "rect", f = o.gestureCtx, p = f.origin.get(i), m = {
-		x: c.pointer.x,
-		y: c.pointer.y
-	};
-	if (d === "line" && c.shiftHeld && (m = r(p, m)), m = o.snap(m), o.behaviors.length > 0) {
-		f.modifiers = { ...l.modifiers }, f.pointer = e(c.pointer, l), f.view = s.view(), f.plane = s.plane(), f.current.set(i, m);
-		let r = n(u?.originMode, c.altHeld);
-		for (let e of o.behaviors) {
-			let n = t(p.x, p.y, m.x, m.y, r), i = e.onMove?.(f, {
-				start: p,
-				current: m,
-				bounds: n,
-				pose: n
+/**
+* Shape the raw pointer into the drag's endpoints: the snap session (with
+* the line kind's Shift step as its input subspace, about the snapped
+* start), then each behavior's `onMove`, each seeing the points the one
+* before it returned. A point a snap target holds is not moved by a
+* behavior.
+*/
+function shapeEndpoints(session, readers, raw, moveCtx) {
+	const gctx = session.gestureCtx;
+	let start = gctx.origin.get(GESTURE_KEY);
+	const end = session.snap.end(raw.pointer, snapMods(moveCtx));
+	let current = end.point;
+	if (session.behaviors.length > 0) {
+		const resolved = resolveParams(session.opts?.params);
+		const startHeld = session.snap.startHeld();
+		gctx.modifiers = { ...moveCtx.modifiers };
+		gctx.pointer = pointerStateOf(raw.pointer, moveCtx);
+		gctx.view = readers.view();
+		gctx.plane = readers.plane();
+		gctx.current.set(GESTURE_KEY, current);
+		const mode = effectiveOriginMode(resolved?.["originMode"], raw.altHeld);
+		for (const b of session.behaviors) {
+			const bounds = computeBounds(start.x, start.y, current.x, current.y, mode);
+			const r = b.onMove?.(gctx, {
+				start,
+				current,
+				bounds,
+				pose: bounds
 			});
-			i && (i.start && (p = i.start), i.current && (m = i.current));
+			if (!r) continue;
+			if (r.start && !startHeld) start = r.start;
+			if (r.current && !end.held) current = r.current;
 		}
-		f.current.set(i, m);
+		gctx.current.set(GESTURE_KEY, current);
 	}
 	return {
-		start: p,
-		current: m
+		start,
+		current
 	};
 }
-function s(e, t, n, r) {
-	let i = {
+/** Move the drag's start point by the pointer's step from `from` to `to`, so
+*  the shape travels with the pointer instead of resizing. The start is
+*  carried unsnapped and snapped where it lands. */
+function carryStart(session, from, to, moveCtx) {
+	const landed = session.snap.carry(to.x - from.x, to.y - from.y, snapMods(moveCtx));
+	session.gestureCtx.origin.set(GESTURE_KEY, landed.point);
+}
+/** One pump event's pointer, modifiers, and trail, and the endpoints they
+*  shape to. Each behavior's `onMove` runs once per call. */
+function nextFrame(session, readers, prev, moveCtx) {
+	const raw = {
 		pointer: {
-			x: r.world.x,
-			y: r.world.y
+			x: moveCtx.world.x,
+			y: moveCtx.world.y
 		},
-		altHeld: r.modifiers.alt,
-		shiftHeld: r.modifiers.shift
+		altHeld: moveCtx.modifiers.alt
 	};
 	return {
-		...i,
-		points: r.drag?.points ? r.drag.points : n.points,
-		shaped: o(e, t, i, r)
+		...raw,
+		points: moveCtx.drag?.points ? moveCtx.drag.points : prev.points,
+		shaped: shapeEndpoints(session, readers, raw, moveCtx)
 	};
 }
-//#endregion
-export { s as nextFrame };
 
+//#endregion
+export { carryStart, nextFrame };
 //# sourceMappingURL=frame.js.map

package/dist/interactions/actions/insert/frame.js.map

@@ -1 +1 @@
-{"version":3,"file":"frame.js","names":["shapeEndpoints","resolved","resolveParams","session","kind","\"kind\"","gctx","start","GESTURE_KEY","current","raw","snapTo15Degrees","moveCtx","pointerStateOf","readers","mode","effectiveOriginMode","\"originMode\"","b","bounds","computeBounds","r","nextFrame","prev"],"sources":["../../../../src/interactions/actions/insert/frame.ts"],"sourcesContent":["import type { InvocationCtx } from '@weasel-js/routing';\nimport { pointerStateOf } from '../pointerState';\nimport { resolveParams } from '@weasel-js/routing';\nimport type { GestureReaders } from '../../gestures/shared/screenTolerance';\nimport type { InsertPoint } from '../../gestures/types';\nimport { computeBounds, effectiveOriginMode, snapTo15Degrees } from './geometry';\nimport { GESTURE_KEY, type InsertFrame, type InsertSession } from './session';\n\n/**\n * Shape the raw pointer into the drag's endpoints, in order: the line tool's\n * Shift-constrain (on the raw pointer, around the shaped start, so the locked\n * angle survives), the `snap` dep, then each behavior's `onMove`, each seeing\n * the points the one before it returned.\n */\nfunction shapeEndpoints(\n  session: Pick<InsertSession, 'opts' | 'snap' | 'behaviors' | 'gestureCtx'>,\n  readers: GestureReaders,\n  raw: Pick<InsertFrame, 'pointer' | 'altHeld' | 'shiftHeld'>,\n  moveCtx: Pick<InvocationCtx, 'modifiers' | 'screen'>,\n): { start: InsertPoint; current: InsertPoint } {\n  const resolved = resolveParams(session.opts?.params);\n  const kind = (resolved?.['kind'] as string | undefined) ?? 'rect';\n  const gctx = session.gestureCtx;\n  let start = gctx.origin.get(GESTURE_KEY) as InsertPoint;\n  let current = { x: raw.pointer.x, y: raw.pointer.y };\n  if (kind === 'line' && raw.shiftHeld) {\n    current = snapTo15Degrees(start, current);\n  }\n  current = session.snap(current);\n\n  if (session.behaviors.length > 0) {\n    gctx.modifiers = { ...moveCtx.modifiers };\n    gctx.pointer = pointerStateOf(raw.pointer, moveCtx);\n    gctx.view = readers.view();\n    gctx.plane = readers.plane();\n    gctx.current.set(GESTURE_KEY, current);\n    const mode = effectiveOriginMode(resolved?.['originMode'], raw.altHeld);\n    for (const b of session.behaviors) {\n      const bounds = computeBounds(start.x, start.y, current.x, current.y, mode);\n      const r = b.onMove?.(gctx, { start, current, bounds, pose: bounds });\n      if (!r) continue;\n      if (r.start) start = r.start;\n      if (r.current) current = r.current;\n    }\n    gctx.current.set(GESTURE_KEY, current);\n  }\n  return { start, current };\n}\n\n/** One pump event's pointer, modifiers, and trail, and the endpoints they\n *  shape to. Each behavior's `onMove` runs once per call. */\nexport function nextFrame(\n  session: InsertSession,\n  readers: GestureReaders,\n  prev: Pick<InsertFrame, 'points'>,\n  moveCtx: InvocationCtx,\n): InsertFrame {\n  const raw = {\n    pointer: { x: moveCtx.world.x, y: moveCtx.world.y },\n    // Each pointermove carries fresh modifier state from the dispatcher;\n    // releasing / pressing a key mid-drag takes effect on the next move tick\n    // (true modifier-only events don't fire without a cursor change).\n    altHeld: moveCtx.modifiers.alt,\n    shiftHeld: moveCtx.modifiers.shift,\n  };\n  return {\n    ...raw,\n    // The dispatcher mutates its own per-gesture trail in place but\n    // attaches the array reference to each InvocationCtx.drag — keep\n    // the latest reference in case the dispatcher swaps it.\n    points: moveCtx.drag?.points ? moveCtx.drag.points : prev.points,\n    shaped: shapeEndpoints(session, readers, raw, moveCtx),\n  };\n}\n"],"mappings":";;;;;AAcA,SAASA,EACP,GACA,GACA,GACA,GAC8C;CAC9C,IAAMC,IAAWC,EAAcC,EAAQ,MAAM,MAAM,GAC7CC,IAAQH,GAAWI,QAAkC,QACrDC,IAAOH,EAAQ,YACjBI,IAAQD,EAAK,OAAO,IAAIE,CAAW,GACnCC,IAAU;EAAE,GAAGC,EAAI,QAAQ;EAAG,GAAGA,EAAI,QAAQ;CAAE;CAMnD,IALIN,MAAS,UAAUM,EAAI,cACzB,IAAUC,EAAgBJ,GAAOE,CAAO,IAE1C,IAAUN,EAAQ,KAAKM,CAAO,GAE1BN,EAAQ,UAAU,SAAS,GAAG;EAKhC,AAJA,EAAK,YAAY,EAAE,GAAGS,EAAQ,UAAU,GACxC,EAAK,UAAUC,EAAeH,EAAI,SAASE,CAAO,GAClD,EAAK,OAAOE,EAAQ,KAAK,GACzB,EAAK,QAAQA,EAAQ,MAAM,GAC3BR,EAAK,QAAQ,IAAIE,GAAaC,CAAO;EACrC,IAAMM,IAAOC,EAAoBf,GAAWgB,YAAeP,EAAI,OAAO;EACtE,KAAK,IAAMQ,KAAKf,EAAQ,WAAW;GACjC,IAAMgB,IAASC,EAAcb,EAAM,GAAGA,EAAM,GAAGE,EAAQ,GAAGA,EAAQ,GAAGM,CAAI,GACnEM,IAAIH,EAAE,SAASZ,GAAM;IAAE;IAAO;IAAS;IAAQ,MAAMa;GAAO,CAAC;GACnE,AAAKE,MACDA,EAAE,UAAO,IAAQA,EAAE,QACnBA,EAAE,YAAS,IAAUA,EAAE;EAC7B;EACA,EAAK,QAAQ,IAAIb,GAAaC,CAAO;CACvC;CACA,OAAO;EAAE;EAAO;CAAQ;AAC1B;AAIA,SAAgBa,EACd,GACA,GACA,GACA,GACa;CACb,IAAMZ,IAAM;EACV,SAAS;GAAE,GAAGE,EAAQ,MAAM;GAAG,GAAGA,EAAQ,MAAM;EAAE;EAIlD,SAASA,EAAQ,UAAU;EAC3B,WAAWA,EAAQ,UAAU;CAC/B;CACA,OAAO;EACL,GAAGF;EAIH,QAAQE,EAAQ,MAAM,SAASA,EAAQ,KAAK,SAASW,EAAK;EAC1D,QAAQvB,EAAeG,GAASW,GAASJ,GAAKE,CAAO;CACvD;AACF"}
+{"version":3,"file":"frame.js","names":[],"sources":["../../../../src/interactions/actions/insert/frame.ts"],"sourcesContent":["import type { InvocationCtx } from '@weasel-js/routing';\nimport { pointerStateOf } from '../pointerState';\nimport { resolveParams } from '@weasel-js/routing';\nimport { snapMods } from 'features/snap/roles';\nimport type { GestureReaders } from '../../gestures/shared/screenTolerance';\nimport type { InsertPoint } from '../../gestures/types';\nimport { computeBounds, effectiveOriginMode } from './geometry';\nimport { GESTURE_KEY, type InsertFrame, type InsertSession } from './session';\n\n/**\n * Shape the raw pointer into the drag's endpoints: the snap session (with\n * the line kind's Shift step as its input subspace, about the snapped\n * start), then each behavior's `onMove`, each seeing the points the one\n * before it returned. A point a snap target holds is not moved by a\n * behavior.\n */\nfunction shapeEndpoints(\n  session: Pick<InsertSession, 'opts' | 'snap' | 'behaviors' | 'gestureCtx'>,\n  readers: GestureReaders,\n  raw: Pick<InsertFrame, 'pointer' | 'altHeld'>,\n  moveCtx: Pick<InvocationCtx, 'modifiers' | 'screen' | 'roles'>,\n): { start: InsertPoint; current: InsertPoint } {\n  const gctx = session.gestureCtx;\n  let start = gctx.origin.get(GESTURE_KEY) as InsertPoint;\n  const end = session.snap.end(raw.pointer, snapMods(moveCtx));\n  let current = end.point;\n\n  if (session.behaviors.length > 0) {\n    const resolved = resolveParams(session.opts?.params);\n    const startHeld = session.snap.startHeld();\n    gctx.modifiers = { ...moveCtx.modifiers };\n    gctx.pointer = pointerStateOf(raw.pointer, moveCtx);\n    gctx.view = readers.view();\n    gctx.plane = readers.plane();\n    gctx.current.set(GESTURE_KEY, current);\n    const mode = effectiveOriginMode(resolved?.['originMode'], raw.altHeld);\n    for (const b of session.behaviors) {\n      const bounds = computeBounds(start.x, start.y, current.x, current.y, mode);\n      const r = b.onMove?.(gctx, { start, current, bounds, pose: bounds });\n      if (!r) continue;\n      if (r.start && !startHeld) start = r.start;\n      if (r.current && !end.held) current = r.current;\n    }\n    gctx.current.set(GESTURE_KEY, current);\n  }\n  return { start, current };\n}\n\n/** Move the drag's start point by the pointer's step from `from` to `to`, so\n *  the shape travels with the pointer instead of resizing. The start is\n *  carried unsnapped and snapped where it lands. */\nexport function carryStart(\n  session: Pick<InsertSession, 'snap' | 'gestureCtx'>,\n  from: InsertPoint,\n  to: InsertPoint,\n  moveCtx: Pick<InvocationCtx, 'modifiers' | 'roles'>,\n): void {\n  const landed = session.snap.carry(to.x - from.x, to.y - from.y, snapMods(moveCtx));\n  session.gestureCtx.origin.set(GESTURE_KEY, landed.point);\n}\n\n/** One pump event's pointer, modifiers, and trail, and the endpoints they\n *  shape to. Each behavior's `onMove` runs once per call. */\nexport function nextFrame(\n  session: InsertSession,\n  readers: GestureReaders,\n  prev: Pick<InsertFrame, 'points'>,\n  moveCtx: InvocationCtx,\n): InsertFrame {\n  const raw = {\n    pointer: { x: moveCtx.world.x, y: moveCtx.world.y },\n    // Each pointermove carries fresh modifier state from the dispatcher;\n    // releasing / pressing a key mid-drag takes effect on the next move tick\n    // (true modifier-only events don't fire without a cursor change).\n    altHeld: moveCtx.modifiers.alt,\n  };\n  return {\n    ...raw,\n    // The dispatcher mutates its own per-gesture trail in place but\n    // attaches the array reference to each InvocationCtx.drag — keep\n    // the latest reference in case the dispatcher swaps it.\n    points: moveCtx.drag?.points ? moveCtx.drag.points : prev.points,\n    shaped: shapeEndpoints(session, readers, raw, moveCtx),\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;AAgBA,SAAS,eACP,SACA,SACA,KACA,SAC8C;CAC9C,MAAM,OAAO,QAAQ;CACrB,IAAI,QAAQ,KAAK,OAAO,IAAI,WAAW;CACvC,MAAM,MAAM,QAAQ,KAAK,IAAI,IAAI,SAAS,SAAS,OAAO,CAAC;CAC3D,IAAI,UAAU,IAAI;CAElB,IAAI,QAAQ,UAAU,SAAS,GAAG;EAChC,MAAM,WAAW,cAAc,QAAQ,MAAM,MAAM;EACnD,MAAM,YAAY,QAAQ,KAAK,UAAU;EACzC,KAAK,YAAY,EAAE,GAAG,QAAQ,UAAU;EACxC,KAAK,UAAU,eAAe,IAAI,SAAS,OAAO;EAClD,KAAK,OAAO,QAAQ,KAAK;EACzB,KAAK,QAAQ,QAAQ,MAAM;EAC3B,KAAK,QAAQ,IAAI,aAAa,OAAO;EACrC,MAAM,OAAO,oBAAoB,WAAW,eAAe,IAAI,OAAO;EACtE,KAAK,MAAM,KAAK,QAAQ,WAAW;GACjC,MAAM,SAAS,cAAc,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI;GACzE,MAAM,IAAI,EAAE,SAAS,MAAM;IAAE;IAAO;IAAS;IAAQ,MAAM;GAAO,CAAC;GACnE,IAAI,CAAC,GAAG;GACR,IAAI,EAAE,SAAS,CAAC,WAAW,QAAQ,EAAE;GACrC,IAAI,EAAE,WAAW,CAAC,IAAI,MAAM,UAAU,EAAE;EAC1C;EACA,KAAK,QAAQ,IAAI,aAAa,OAAO;CACvC;CACA,OAAO;EAAE;EAAO;CAAQ;AAC1B;;;;AAKA,SAAgB,WACd,SACA,MACA,IACA,SACM;CACN,MAAM,SAAS,QAAQ,KAAK,MAAM,GAAG,IAAI,KAAK,GAAG,GAAG,IAAI,KAAK,GAAG,SAAS,OAAO,CAAC;CACjF,QAAQ,WAAW,OAAO,IAAI,aAAa,OAAO,KAAK;AACzD;;;AAIA,SAAgB,UACd,SACA,SACA,MACA,SACa;CACb,MAAM,MAAM;EACV,SAAS;GAAE,GAAG,QAAQ,MAAM;GAAG,GAAG,QAAQ,MAAM;EAAE;EAIlD,SAAS,QAAQ,UAAU;CAC7B;CACA,OAAO;EACL,GAAG;EAIH,QAAQ,QAAQ,MAAM,SAAS,QAAQ,KAAK,SAAS,KAAK;EAC1D,QAAQ,eAAe,SAAS,SAAS,KAAK,OAAO;CACvD;AACF"}