@weasel-js/core 1.10.0 → 1.10.1

package/dist/canvas/deps/editAnchors.js

@@ -1,82 +1,77 @@
 import { createTransformOp as e } from "../../core/ops/transform.js";
 import { createSetDataOp as t } from "../../core/ops/setData.js";
-import { createPathEditState as n, isSelectedNode as r } from "../../features/paths/pathEditState.js";
-import { classifyPathStorage as i, resolveEditablePathOf as a } from "../../features/paths/editablePath.js";
-import { worldEditToStorage as o } from "@weasel-js/geom";
-import { useState as s } from "react";
-import { useLatest as c } from "@weasel-js/react";
-import { recordModeSwitch as l } from "@weasel-js/routing";
-import { useDepSource as u } from "@weasel-js/routing/react";
+import { classifyPathStorage as n, resolveEditablePathOf as r, storeEditablePath as i } from "../../features/paths/editablePath.js";
+import { withoutShapeGenerator as a } from "../../features/paths/shapeGenerator.js";
+import { remapSkin as o } from "../../animation/rig/skinBinding.js";
+import { createPathEditState as s, isSelectedNode as c } from "../../features/paths/pathEditState.js";
+import { useState as l } from "react";
+import { useLatest as u } from "@weasel-js/react";
+import { recordModeSwitch as d } from "@weasel-js/routing";
+import { useDepSource as f } from "@weasel-js/routing/react";
 //#region src/canvas/deps/editAnchors.ts
-var d = /* @__PURE__ */ new Set();
-function f(f, p, m, h) {
-	let g = c(f), _ = c(p), v = c(m), [y] = s(() => n({ isSelectedNode: (e) => r(g.current, _.current, e) })), b = c(h ?? y);
-	u("editAnchors", () => {
-		let n = g.current, r = v.current, s = b.current, c = s.getEditingId(), u = c ? s.getSelectedAnchors() : d, f = c ? s.getMarquee() : null, p = (r, a, s) => {
-			let c = a, l = n.get(r);
-			if (!l) return [];
-			let u = i(l);
-			if (!u) return [];
-			if (u.kind === "pose") return [e({
-				id: r,
-				from: l.pose,
-				to: c,
-				label: s
-			})];
-			let { pose: d, path: f } = o(u.pose, c);
-			return [e({
-				id: r,
-				from: l.pose,
-				to: d,
-				label: s
-			}), t({
-				id: r,
-				from: l.data,
+var p = /* @__PURE__ */ new Set();
+function m(m, h, g, _) {
+	let v = u(m), y = u(h), b = u(g), [x] = l(() => s({ isSelectedNode: (e) => c(v.current, y.current, e) })), S = u(_ ?? x);
+	f("editAnchors", () => {
+		let s = v.current, c = b.current, l = S.current, u = l.getEditingId(), f = u ? l.getSelectedAnchors() : p, m = u ? l.getMarquee() : null, h = (n, r, c, l) => {
+			let u = r, d = s.get(n);
+			if (!d) return [];
+			let f = i(d, u);
+			if (!f) return [];
+			let p = d.data?.skin, m = p && l ? { skin: o(p, l) } : null, h = e({
+				id: n,
+				from: d.pose,
+				to: f.pose,
+				label: c
+			}), g = f.data === d.data ? d.data : a(f.data);
+			return g === d.data && !m ? [h] : [h, t({
+				id: n,
+				from: d.data,
 				to: {
-					...l.data,
-					path: f
+					...g,
+					...m
 				},
-				label: s
+				label: c
 			})];
 		};
 		return {
-			editingId: c,
+			editingId: u,
 			setEditingId(e) {
 				let t = e ?? "";
-				c !== t && (l("editAnchors.editingId", c || null, t || null, t ? "enter" : "exit"), s.setSelectedAnchors(d), s.setMarquee(null)), b.current.setEditingId(e);
+				u !== t && (d("editAnchors.editingId", u || null, t || null, t ? "enter" : "exit"), l.setSelectedAnchors(p), l.setMarquee(null)), S.current.setEditingId(e);
 			},
-			selectedAnchors: u,
+			selectedAnchors: f,
 			setSelectedAnchors(e) {
-				c && s.setSelectedAnchors(new Set(e));
+				u && l.setSelectedAnchors(new Set(e));
 			},
-			marquee: f,
+			marquee: m,
 			setMarquee(e) {
-				c && s.setMarquee(e);
+				u && l.setMarquee(e);
 			},
 			getEditablePath(e) {
-				let t = n.get(e);
-				return a(t);
+				let t = s.get(e);
+				return r(t);
 			},
 			getStorageKind(e) {
-				let t = n.get(e);
-				return i(t)?.kind ?? null;
+				let t = s.get(e);
+				return n(t)?.kind ?? null;
 			},
 			getNodeShape(e) {
-				let t = n.get(e);
+				let t = s.get(e);
 				return t ? {
 					pose: t.pose,
 					data: t.data
 				} : null;
 			},
-			applyEdit(e, t, n) {
-				let i = p(e, t, n);
-				i.length > 0 && r.applyOps(i, n);
+			applyEdit(e, t, n, r) {
+				let i = h(e, t, n, r);
+				i.length > 0 && c.applyOps(i, n);
 			},
-			editOps: p
+			editOps: h
 		};
 	});
 }
 //#endregion
-export { a as resolveEditablePathOf, f as useEditAnchorsDepSource };
+export { r as resolveEditablePathOf, m as useEditAnchorsDepSource };
 
 //# sourceMappingURL=editAnchors.js.map

package/dist/canvas/deps/editAnchors.js.map

@@ -1 +1 @@
-{"version":3,"file":"editAnchors.js","names":["EMPTY_ANCHOR_SELECTION","useEditAnchorsDepSource","sceneRef","useLatest","scene","selectionRef","selection","adapterRef","adapter","ownState","useState","createPathEditState","isSelectedNode","id","stateRef","externalState","sc","ad","state","effectiveId","selectedAnchors","marquee","editOps","wp","worldPath","node","storage","classifyPathStorage","createTransformOp","newPose","aligned","worldEditToStorage","createSetDataOp","next","recordModeSwitch","rect","resolveEditablePathOf","ops","label"],"sources":["../../../src/canvas/deps/editAnchors.ts"],"sourcesContent":["/**\n * `useEditAnchorsDepSource` — wires the `editAnchors` dep.\n *\n * A node's editable polygon lives in one of two places: the pose itself\n * (`pose.kind === 'polygon'`), or `data.path` with a rect pose, stored pose-local.\n * `getEditablePath` returns it in **world coords** either way, and `applyEdit` commits in the\n * correct storage shape as one undoable batch, preserving the render invariant\n * `pathInWorld(stored, pose) === world`. Live previews ride the standard\n * `OngoingHandle.previewIds/Pose/Data` triple — this dep doesn't own preview state.\n */\nimport { useState } from 'react';\nimport { useDepSource } from '@weasel-js/routing/react';\nimport { useLatest } from '@weasel-js/react';\nimport type { EditAnchorsDep } from 'interactions/actions/depSchema';\nimport type { Scene, NodeId } from 'core/scene/types';\nimport type { SelectionApi } from 'core/selection/useSelection';\nimport type { PolygonPath } from '@weasel-js/geom';\nimport { worldEditToStorage } from '@weasel-js/geom';\nimport { classifyPathStorage, resolveEditablePathOf } from 'features/paths/editablePath';\nimport { createPathEditState, isSelectedNode, type PathEditState } from 'features/paths/pathEditState';\nimport { recordModeSwitch } from '@weasel-js/routing';\nimport type { Op } from 'core/ops/types';\nimport { createTransformOp } from 'core/ops/transform';\nimport { createSetDataOp } from 'core/ops/setData';\n\ninterface OpsApplier {\n  applyOps(ops: Op[], label?: string): void;\n}\n\n/** The part of a `PathEditState` the dep reads and writes. */\nexport type EditAnchorsStateRef = Omit<PathEditState, 'subscribe' | 'getEditingIds'>;\n\nexport { resolveEditablePathOf };\n\nconst EMPTY_ANCHOR_SELECTION: ReadonlySet<number> = new Set<number>();\n\nexport function useEditAnchorsDepSource(\n  scene: Scene<unknown, string, unknown>,\n  selection: SelectionApi,\n  adapter: OpsApplier,\n  externalState?: EditAnchorsStateRef,\n): void {\n  const sceneRef = useLatest(scene);\n  const selectionRef = useLatest(selection);\n  const adapterRef = useLatest(adapter);\n\n  // A caller that shares the state with nothing else gets one of its own.\n  const [ownState] = useState(() => createPathEditState({\n    isSelectedNode: (id) => isSelectedNode(sceneRef.current, selectionRef.current, id),\n  }));\n  const stateRef = useLatest(externalState ?? ownState);\n\n  useDepSource('editAnchors', (): EditAnchorsDep => {\n    const sc = sceneRef.current;\n    const ad = adapterRef.current;\n    const state = stateRef.current;\n    const effectiveId = state.getEditingId();\n    // Anchor selection and the marquee belong to one specific edited node, so never\n    // hand them out alongside an empty id.\n    const selectedAnchors = effectiveId ? state.getSelectedAnchors() : EMPTY_ANCHOR_SELECTION;\n    const marquee = effectiveId ? state.getMarquee() : null;\n    const editOps = (id: string, worldPath: unknown, label: string): Op[] => {\n      const wp = worldPath as PolygonPath;\n      const node = sc.get(id as NodeId);\n      if (!node) return [];\n      const storage = classifyPathStorage(node as { pose: unknown; data: unknown });\n      if (!storage) return [];\n      if (storage.kind === 'pose') return [createTransformOp({ id, from: node.pose, to: wp, label })];\n      // The edited path arrives in world coords; invert it back to the unrotated stored\n      // shape so `pose.rotation` is preserved and edits round-trip.\n      const { pose: newPose, path: aligned } = worldEditToStorage(storage.pose, wp);\n      return [\n        createTransformOp({ id, from: node.pose, to: newPose, label }),\n        createSetDataOp({ id, from: node.data, to: { ...(node.data as object), path: aligned }, label }),\n      ];\n    };\n    return {\n      editingId: effectiveId,\n      setEditingId(id: string | null) {\n        const next = id ?? '';\n        if (effectiveId !== next) {\n          recordModeSwitch(\n            'editAnchors.editingId',\n            effectiveId || null,\n            next || null,\n            next ? 'enter' : 'exit',\n          );\n          // Anchor indices only mean something relative to one path.\n          state.setSelectedAnchors(EMPTY_ANCHOR_SELECTION);\n          state.setMarquee(null);\n        }\n        stateRef.current.setEditingId(id);\n      },\n      selectedAnchors,\n      setSelectedAnchors(next: Iterable<number>) {\n        if (!effectiveId) return;\n        state.setSelectedAnchors(new Set(next));\n      },\n      marquee,\n      setMarquee(rect) {\n        if (!effectiveId) return;\n        state.setMarquee(rect);\n      },\n      getEditablePath(id: string): PolygonPath | null {\n        const node = sc.get(id as NodeId);\n        return resolveEditablePathOf(node as { pose: unknown; data: unknown });\n      },\n      getStorageKind(id: string): 'pose' | 'data' | null {\n        const node = sc.get(id as NodeId);\n        const storage = classifyPathStorage(node as { pose: unknown; data: unknown });\n        return storage?.kind ?? null;\n      },\n      getNodeShape(id: string): { pose: unknown; data: unknown } | null {\n        const node = sc.get(id as NodeId);\n        if (!node) return null;\n        return { pose: node.pose, data: node.data };\n      },\n      applyEdit(id: string, worldPath: unknown, label: string) {\n        const ops = editOps(id, worldPath, label);\n        if (ops.length > 0) ad.applyOps(ops, label);\n      },\n      editOps,\n    };\n  });\n}\n"],"mappings":";;;;;;;;;;AAkCA,IAAMA,oBAA8C,IAAI,IAAY;AAEpE,SAAgBC,EACd,GACA,GACA,GACA,GACM;CACN,IAAMC,IAAWC,EAAUC,CAAK,GAC1BC,IAAeF,EAAUG,CAAS,GAClCC,IAAaJ,EAAUK,CAAO,GAG9B,CAACC,KAAYC,QAAeC,EAAoB,EACpD,iBAAiB,MAAOC,EAAeV,EAAS,SAASG,EAAa,SAASQ,CAAE,EACnF,CAAC,CAAC,GACIC,IAAWX,EAAUY,KAAiBN,CAAQ;CAEpD,EAAa,qBAAqC;EAChD,IAAMO,IAAKd,EAAS,SACde,IAAKV,EAAW,SAChBW,IAAQJ,EAAS,SACjBK,IAAcD,EAAM,aAAa,GAGjCE,IAAkBD,IAAcD,EAAM,mBAAmB,IAAIlB,GAC7DqB,IAAUF,IAAcD,EAAM,WAAW,IAAI,MAC7CI,KAAW,GAAY,GAAoB,MAAwB;GACvE,IAAMC,IAAKC,GACLC,IAAOT,EAAG,IAAIH,CAAY;GAChC,IAAI,CAACY,GAAM,OAAO,CAAC;GACnB,IAAMC,IAAUC,EAAoBF,CAAwC;GAC5E,IAAI,CAACC,GAAS,OAAO,CAAC;GACtB,IAAIA,EAAQ,SAAS,QAAQ,OAAO,CAACE,EAAkB;IAAE;IAAI,MAAMH,EAAK;IAAM,IAAIF;IAAI;GAAM,CAAC,CAAC;GAG9F,IAAM,EAAE,MAAMM,GAAS,MAAMC,MAAYC,EAAmBL,EAAQ,MAAMH,CAAE;GAC5E,OAAO,CACLK,EAAkB;IAAE;IAAI,MAAMH,EAAK;IAAM,IAAII;IAAS;GAAM,CAAC,GAC7DG,EAAgB;IAAE;IAAI,MAAMP,EAAK;IAAM,IAAI;KAAE,GAAIA,EAAK;KAAiB,MAAMK;IAAQ;IAAG;GAAM,CAAC,CACjG;EACF;EACA,OAAO;GACL,WAAWX;GACX,aAAa,GAAmB;IAC9B,IAAMc,IAAOpB,KAAM;IAYnB,AAXIM,MAAgBc,MAClBC,EACE,yBACAf,KAAe,MACfc,KAAQ,MACRA,IAAO,UAAU,MACnB,GAEAf,EAAM,mBAAmBlB,CAAsB,GAC/CkB,EAAM,WAAW,IAAI,IAEvBJ,EAAS,QAAQ,aAAaD,CAAE;GAClC;GACA;GACA,mBAAmB,GAAwB;IACzC,AAAKM,KACLD,EAAM,mBAAmB,IAAI,IAAIe,CAAI,CAAC;GACxC;GACA;GACA,WAAW,GAAM;IACf,AAAKd,KACLD,EAAM,WAAWiB,CAAI;GACvB;GACA,gBAAgB,GAAgC;IAC9C,IAAMV,IAAOT,EAAG,IAAIH,CAAY;IAChC,OAAOuB,EAAsBX,CAAwC;GACvE;GACA,eAAe,GAAoC;IACjD,IAAMA,IAAOT,EAAG,IAAIH,CAAY;IAEhC,OADgBc,EAAoBF,CAC7B,CAAA,EAAS,QAAQ;GAC1B;GACA,aAAa,GAAqD;IAChE,IAAMA,IAAOT,EAAG,IAAIH,CAAY;IAEhC,OADKY,IACE;KAAE,MAAMA,EAAK;KAAM,MAAMA,EAAK;IAAK,IADxB;GAEpB;GACA,UAAU,GAAY,GAAoB,GAAe;IACvD,IAAMY,IAAMf,EAAQT,GAAIW,GAAWc,CAAK;IACxC,AAAID,EAAI,SAAS,KAAGpB,EAAG,SAASoB,GAAKC,CAAK;GAC5C;GACA;EACF;CACF,CAAC;AACH"}
+{"version":3,"file":"editAnchors.js","names":["EMPTY_ANCHOR_SELECTION","useEditAnchorsDepSource","sceneRef","useLatest","scene","selectionRef","selection","adapterRef","adapter","ownState","useState","createPathEditState","isSelectedNode","id","stateRef","externalState","sc","ad","state","effectiveId","selectedAnchors","marquee","editOps","wp","worldPath","node","next","storeEditablePath","skin","reskinned","origins","remapSkin","reshape","createTransformOp","data","withoutShapeGenerator","createSetDataOp","recordModeSwitch","rect","resolveEditablePathOf","classifyPathStorage","ops","label"],"sources":["../../../src/canvas/deps/editAnchors.ts"],"sourcesContent":["/**\n * `useEditAnchorsDepSource` — wires the `editAnchors` dep.\n *\n * A node's editable polygon lives in one of two places: the pose itself\n * (`pose.kind === 'polygon'`), or `data.path` with a rect pose, stored pose-local.\n * `getEditablePath` returns it in **world coords** either way, and `applyEdit` commits in the\n * correct storage shape as one undoable batch, preserving the render invariant\n * `pathInWorld(stored, pose) === world`. A node with a `data.skin` has it renumbered in that\n * batch when the caller says where the points came from. Live previews ride the standard\n * `OngoingHandle.previewIds/Pose/Data` triple — this dep doesn't own preview state.\n */\nimport { useState } from 'react';\nimport { useDepSource } from '@weasel-js/routing/react';\nimport { useLatest } from '@weasel-js/react';\nimport type { EditAnchorsDep } from 'interactions/actions/depSchema';\nimport type { Scene, NodeId } from 'core/scene/types';\nimport type { SelectionApi } from 'core/selection/useSelection';\nimport type { PointOrigin, PolygonPath } from '@weasel-js/geom';\nimport type { Skin } from '@weasel-js/animator';\nimport { remapSkin } from '../../animation/rig/skinBinding';\nimport { classifyPathStorage, resolveEditablePathOf, storeEditablePath } from 'features/paths/editablePath';\nimport { withoutShapeGenerator } from 'features/paths/shapeGenerator';\nimport { createPathEditState, isSelectedNode, type PathEditState } from 'features/paths/pathEditState';\nimport { recordModeSwitch } from '@weasel-js/routing';\nimport type { Op } from 'core/ops/types';\nimport { createTransformOp } from 'core/ops/transform';\nimport { createSetDataOp } from 'core/ops/setData';\n\ninterface OpsApplier {\n  applyOps(ops: Op[], label?: string): void;\n}\n\n/** The part of a `PathEditState` the dep reads and writes. */\nexport type EditAnchorsStateRef = Omit<PathEditState, 'subscribe' | 'getEditingIds'>;\n\nexport { resolveEditablePathOf };\n\nconst EMPTY_ANCHOR_SELECTION: ReadonlySet<number> = new Set<number>();\n\nexport function useEditAnchorsDepSource(\n  scene: Scene<unknown, string, unknown>,\n  selection: SelectionApi,\n  adapter: OpsApplier,\n  externalState?: EditAnchorsStateRef,\n): void {\n  const sceneRef = useLatest(scene);\n  const selectionRef = useLatest(selection);\n  const adapterRef = useLatest(adapter);\n\n  // A caller that shares the state with nothing else gets one of its own.\n  const [ownState] = useState(() => createPathEditState({\n    isSelectedNode: (id) => isSelectedNode(sceneRef.current, selectionRef.current, id),\n  }));\n  const stateRef = useLatest(externalState ?? ownState);\n\n  useDepSource('editAnchors', (): EditAnchorsDep => {\n    const sc = sceneRef.current;\n    const ad = adapterRef.current;\n    const state = stateRef.current;\n    const effectiveId = state.getEditingId();\n    // Anchor selection and the marquee belong to one specific edited node, so never\n    // hand them out alongside an empty id.\n    const selectedAnchors = effectiveId ? state.getSelectedAnchors() : EMPTY_ANCHOR_SELECTION;\n    const marquee = effectiveId ? state.getMarquee() : null;\n    const editOps = (id: string, worldPath: unknown, label: string, origins?: readonly (PointOrigin | null)[]): Op[] => {\n      const wp = worldPath as PolygonPath;\n      const node = sc.get(id as NodeId);\n      if (!node) return [];\n      const next = storeEditablePath(node as { pose: unknown; data: unknown }, wp);\n      if (!next) return [];\n      const skin = (node.data as { skin?: Skin } | null)?.skin;\n      const reskinned = skin && origins ? { skin: remapSkin(skin, origins) } : null;\n      const reshape = createTransformOp({ id, from: node.pose, to: next.pose, label });\n      // A path edited by hand is no longer what its generator makes: it becomes plain geometry.\n      const data = next.data === node.data ? node.data : withoutShapeGenerator(next.data);\n      if (data === node.data && !reskinned) return [reshape];\n      return [reshape, createSetDataOp({ id, from: node.data, to: { ...(data as object), ...reskinned }, label })];\n    };\n    return {\n      editingId: effectiveId,\n      setEditingId(id: string | null) {\n        const next = id ?? '';\n        if (effectiveId !== next) {\n          recordModeSwitch(\n            'editAnchors.editingId',\n            effectiveId || null,\n            next || null,\n            next ? 'enter' : 'exit',\n          );\n          // Anchor indices only mean something relative to one path.\n          state.setSelectedAnchors(EMPTY_ANCHOR_SELECTION);\n          state.setMarquee(null);\n        }\n        stateRef.current.setEditingId(id);\n      },\n      selectedAnchors,\n      setSelectedAnchors(next: Iterable<number>) {\n        if (!effectiveId) return;\n        state.setSelectedAnchors(new Set(next));\n      },\n      marquee,\n      setMarquee(rect) {\n        if (!effectiveId) return;\n        state.setMarquee(rect);\n      },\n      getEditablePath(id: string): PolygonPath | null {\n        const node = sc.get(id as NodeId);\n        return resolveEditablePathOf(node as { pose: unknown; data: unknown });\n      },\n      getStorageKind(id: string): 'pose' | 'data' | null {\n        const node = sc.get(id as NodeId);\n        const storage = classifyPathStorage(node as { pose: unknown; data: unknown });\n        return storage?.kind ?? null;\n      },\n      getNodeShape(id: string): { pose: unknown; data: unknown } | null {\n        const node = sc.get(id as NodeId);\n        if (!node) return null;\n        return { pose: node.pose, data: node.data };\n      },\n      applyEdit(id: string, worldPath: unknown, label: string, origins?: readonly (PointOrigin | null)[]) {\n        const ops = editOps(id, worldPath, label, origins);\n        if (ops.length > 0) ad.applyOps(ops, label);\n      },\n      editOps,\n    };\n  });\n}\n"],"mappings":";;;;;;;;;;;AAqCA,IAAMA,oBAA8C,IAAI,IAAY;AAEpE,SAAgBC,EACd,GACA,GACA,GACA,GACM;CACN,IAAMC,IAAWC,EAAUC,CAAK,GAC1BC,IAAeF,EAAUG,CAAS,GAClCC,IAAaJ,EAAUK,CAAO,GAG9B,CAACC,KAAYC,QAAeC,EAAoB,EACpD,iBAAiB,MAAOC,EAAeV,EAAS,SAASG,EAAa,SAASQ,CAAE,EACnF,CAAC,CAAC,GACIC,IAAWX,EAAUY,KAAiBN,CAAQ;CAEpD,EAAa,qBAAqC;EAChD,IAAMO,IAAKd,EAAS,SACde,IAAKV,EAAW,SAChBW,IAAQJ,EAAS,SACjBK,IAAcD,EAAM,aAAa,GAGjCE,IAAkBD,IAAcD,EAAM,mBAAmB,IAAIlB,GAC7DqB,IAAUF,IAAcD,EAAM,WAAW,IAAI,MAC7CI,KAAW,GAAY,GAAoB,GAAe,MAAoD;GAClH,IAAMC,IAAKC,GACLC,IAAOT,EAAG,IAAIH,CAAY;GAChC,IAAI,CAACY,GAAM,OAAO,CAAC;GACnB,IAAMC,IAAOC,EAAkBF,GAA0CF,CAAE;GAC3E,IAAI,CAACG,GAAM,OAAO,CAAC;GACnB,IAAME,IAAQH,EAAK,MAAiC,MAC9CI,IAAYD,KAAQE,IAAU,EAAE,MAAMC,EAAUH,GAAME,CAAO,EAAE,IAAI,MACnEE,IAAUC,EAAkB;IAAE;IAAI,MAAMR,EAAK;IAAM,IAAIC,EAAK;IAAM;GAAM,CAAC,GAEzEQ,IAAOR,EAAK,SAASD,EAAK,OAAOA,EAAK,OAAOU,EAAsBT,EAAK,IAAI;GAElF,OADIQ,MAAST,EAAK,QAAQ,CAACI,IAAkB,CAACG,CAAO,IAC9C,CAACA,GAASI,EAAgB;IAAE;IAAI,MAAMX,EAAK;IAAM,IAAI;KAAE,GAAIS;KAAiB,GAAGL;IAAU;IAAG;GAAM,CAAC,CAAC;EAC7G;EACA,OAAO;GACL,WAAWV;GACX,aAAa,GAAmB;IAC9B,IAAMO,IAAOb,KAAM;IAYnB,AAXIM,MAAgBO,MAClBW,EACE,yBACAlB,KAAe,MACfO,KAAQ,MACRA,IAAO,UAAU,MACnB,GAEAR,EAAM,mBAAmBlB,CAAsB,GAC/CkB,EAAM,WAAW,IAAI,IAEvBJ,EAAS,QAAQ,aAAaD,CAAE;GAClC;GACA;GACA,mBAAmB,GAAwB;IACzC,AAAKM,KACLD,EAAM,mBAAmB,IAAI,IAAIQ,CAAI,CAAC;GACxC;GACA;GACA,WAAW,GAAM;IACf,AAAKP,KACLD,EAAM,WAAWoB,CAAI;GACvB;GACA,gBAAgB,GAAgC;IAC9C,IAAMb,IAAOT,EAAG,IAAIH,CAAY;IAChC,OAAO0B,EAAsBd,CAAwC;GACvE;GACA,eAAe,GAAoC;IACjD,IAAMA,IAAOT,EAAG,IAAIH,CAAY;IAEhC,OADgB2B,EAAoBf,CAC7B,CAAA,EAAS,QAAQ;GAC1B;GACA,aAAa,GAAqD;IAChE,IAAMA,IAAOT,EAAG,IAAIH,CAAY;IAEhC,OADKY,IACE;KAAE,MAAMA,EAAK;KAAM,MAAMA,EAAK;IAAK,IADxB;GAEpB;GACA,UAAU,GAAY,GAAoB,GAAe,GAA2C;IAClG,IAAMgB,IAAMnB,EAAQT,GAAIW,GAAWkB,GAAOZ,CAAO;IACjD,AAAIW,EAAI,SAAS,KAAGxB,EAAG,SAASwB,GAAKC,CAAK;GAC5C;GACA;EACF;CACF,CAAC;AACH"}

package/dist/canvas/deps/hitTestArea.js

@@ -4,9 +4,9 @@ import { AUTO_POSE_DESCRIPTOR as i } from "../../core/geometry/autoPoseDescripto
 import { findShapeInk as a, findShapeSilhouette as o } from "../NodeShape.js";
 import { pickWalk as s, scenePickSource as c } from "../pickWalk.js";
 import { polygonRegion as l, poseOutline as u, rectRegion as d, regionBoundsOf as f, regionOf as p, regionTakes as m } from "../../core/geometry/regionHit.js";
-import { pathIntersectsRect as h } from "@weasel-js/geom";
+import { applyToPoint as h, pathIntersectsRect as g } from "@weasel-js/geom";
 //#region src/canvas/deps/hitTestArea.ts
-function g(e, t) {
+function _(e, t) {
 	let n = e?.get?.();
 	return {
 		...t ? { alphaOf: t } : {},
@@ -14,35 +14,36 @@ function g(e, t) {
 		...n ? { camera: n } : {}
 	};
 }
-function _(e, t, n, r = i, a = {}) {
-	return b(e, d(t), "intersect", n, r, a);
+function v(e, t, n, r = i, a = {}) {
+	return x(e, d(t), "intersect", n, r, a);
 }
-function v(e, t, n, r, a = i, o = {}) {
+function y(e, t, n, r, a = i, o = {}) {
 	let s = l(t);
-	return s ? b(e, s, n, r, a, o) : [];
+	return s ? x(e, s, n, r, a, o) : [];
 }
-function y(e, t) {
+function b(e, t) {
 	return t?.kind === "polygon" ? e() ? t : {
 		...t,
 		openFill: "none"
 	} : t;
 }
-function b(e, t, i, l, d, p) {
-	let g = (e) => ({
+function x(e, t, i, l, d, p) {
+	let h = (e) => ({
 		includeContainers: p.includeContainers === !0,
 		clipAdmits: (t, i, a) => {
 			let o = n(d, i);
-			return h(t, r(a, o)) && h(t, e.bounds);
+			return g(t, r(a, o)) && g(t, e.bounds);
 		},
 		hits: (t, r) => {
 			let s = n(d, t), c = f(t, r, s), l, p = () => l ??= a(t, r)?.filled !== !1;
-			return m(e, i, y(p, r), c, () => y(p, o(t, r) ?? u(r, c)), p);
+			return m(e, i, b(p, r), c, () => b(p, o(t, r) ?? u(r, c)), p);
 		},
-		inPlane: (t) => g(x(e, t))
+		inPlane: (t) => h(S(e, t)),
+		inCopy: (t) => h(C(e, t))
 	});
-	return s(c(e, l), g(t));
+	return s(c(e, l), h(t));
 }
-function x(n, r) {
+function S(n, r) {
 	let i = [];
 	for (let e of n.verts) {
 		let n = t(r, e);
@@ -50,7 +51,21 @@ function x(n, r) {
 	}
 	return p(i, e(r, n.bounds), n.isRect);
 }
+function C(e, t) {
+	let n = [], r = Infinity, i = Infinity, a = -Infinity, o = -Infinity;
+	for (let s of e.verts) {
+		let [e, c] = h(t, s.x, s.y);
+		n.push(e, c), r = Math.min(r, e), i = Math.min(i, c), a = Math.max(a, e), o = Math.max(o, c);
+	}
+	let s = t[1] === 0 && t[2] === 0 || t[0] === 0 && t[3] === 0;
+	return p(n, {
+		x: r,
+		y: i,
+		width: a - r,
+		height: o - i
+	}, e.isRect && s);
+}
 //#endregion
-export { _ as hitTestArea, v as hitTestLassoPolygon, g as regionPickOptions };
+export { v as hitTestArea, y as hitTestLassoPolygon, _ as regionPickOptions };
 
 //# sourceMappingURL=hitTestArea.js.map

package/dist/canvas/deps/hitTestArea.js.map

@@ -1 +1 @@
-{"version":3,"file":"hitTestArea.js","names":["regionPickOptions","camera","view","alphaOf","layer","hitTestArea","AUTO_POSE_DESCRIPTOR","walkArea","scene","rectRegion","bounds","opts","descriptor","query","hitTestLassoPolygon","region","polygonRegion","polygon","mode","asInked","shape","filled","regionQuery","g","poseDescriptorForNode","node","pathIntersectsRect","clip","visualBoundsViaDescriptor","pose","r","b","regionBoundsOf","ink","findShapeInk","regionTakes","findShapeSilhouette","poseOutline","regionInPlane","m","pickWalk","scenePickSource","coords","v","p","toPlane","regionOf","rectToPlane"],"sources":["../../../src/canvas/deps/hitTestArea.ts"],"sourcesContent":["/**\n * Silhouette-aware area hit-test for marquee and lasso selection.\n *\n * The per-node decision is `regionTakes` (`core/geometry/regionHit`). This\n * module supplies the scene walk and the node's drawn outline: the painter's\n * world-frame silhouette (`findShapeSilhouette`), or with no painter the pose\n * rect, rotated if the pose is.\n */\nimport type { Scene, NodeId } from 'core/scene/types';\nimport { pathIntersectsRect } from '@weasel-js/geom';\nimport type { LassoHitMode } from 'core/adapters/types';\nimport {\n  poseDescriptorForNode,\n  visualBoundsViaDescriptor,\n  type PoseDescriptor,\n} from 'interactions/actions/resize/geometry';\nimport { AUTO_POSE_DESCRIPTOR } from 'core/geometry/autoPoseDescriptor';\nimport {\n  pickWalk,\n  scenePickSource,\n  type PickQuery,\n  type ScenePickSourceOptions,\n} from 'canvas/pickWalk';\nimport { rectToPlane, toPlane, type PlaneMap } from 'core/viewport/parallax';\n\nexport { hiddenLayerIds } from 'canvas/pickWalk';\nimport type { HitTestView } from 'interactions/actions/depSchema';\nimport { findShapeInk, findShapeSilhouette } from 'canvas/NodeShape';\nimport {\n  polygonRegion,\n  poseOutline,\n  rectRegion,\n  regionBoundsOf,\n  regionOf,\n  regionTakes,\n  type SelectRegion,\n} from 'core/geometry/regionHit';\n\nexport interface AABBBounds {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n}\n\n/** What a region query takes back beyond leaves. */\nexport interface RegionQueryOptions {\n  /** Default `false`: a region that takes a container and its children\n   *  selects the same ink twice. A bare-adapter consumer, which has nothing\n   *  to fold children back into their container, asks for them. */\n  includeContainers?: boolean;\n}\n\n\n/** The pick options a region dep hands the shared walk: the asking view's\n *  layer gate and camera, and the surface's alpha. */\nexport function regionPickOptions(\n  view: HitTestView | undefined,\n  alphaOf: ((id: string) => number) | undefined,\n): ScenePickSourceOptions<unknown> {\n  const camera = view?.get?.();\n  return {\n    ...(alphaOf ? { alphaOf } : {}),\n    ...(view?.layerIsPainted ? { layerIsPainted: (layer: string) => view.layerIsPainted!(layer) } : {}),\n    ...(camera ? { camera } : {}),\n  };\n}\n\n/** Marquee entry point: every node the rect `bounds` meets. */\nexport function hitTestArea(\n  scene: Scene<unknown, string, unknown>,\n  bounds: AABBBounds,\n  opts?: ScenePickSourceOptions<unknown>,\n  descriptor: PoseDescriptor<unknown> = AUTO_POSE_DESCRIPTOR,\n  query: RegionQueryOptions = {},\n): NodeId[] {\n  return walkArea(scene, rectRegion(bounds), 'intersect', opts, descriptor, query);\n}\n\n/**\n * Every node an arbitrary closed area polygon meets. `area` is interleaved\n * `[x0,y0,x1,y1,…]`; `areaBounds` is its AABB, derived when omitted.\n */\nexport function hitTestAreaPolygon(\n  scene: Scene<unknown, string, unknown>,\n  area: ArrayLike<number>,\n  areaBounds?: AABBBounds,\n  /** True when `area` IS its own bounding rect, so `areaBounds` containment\n   *  implies containment in the area proper. Never pass this for a lasso\n   *  polygon — a node inside the hull's box can miss the hull. */\n  areaIsRect = false,\n  /** The asking view's alpha and layer accessors. A bare scene answers for\n   *  itself; a view that dims or reorders layers has to supply its own. */\n  opts?: ScenePickSourceOptions<unknown>,\n  /** How to read this scene's poses. Default `AUTO_POSE_DESCRIPTOR`. */\n  descriptor: PoseDescriptor<unknown> = AUTO_POSE_DESCRIPTOR,\n  query: RegionQueryOptions = {},\n): NodeId[] {\n  const region = regionOf(area, areaBounds, areaIsRect);\n  return region ? walkArea(scene, region, 'intersect', opts, descriptor, query) : [];\n}\n\n/**\n * Lasso entry point: which nodes a closed lasso polygon picks under `mode`\n * (see `regionTakes`).\n */\nexport function hitTestLassoPolygon(\n  scene: Scene<unknown, string, unknown>,\n  polygon: ReadonlyArray<{ x: number; y: number }>,\n  mode: LassoHitMode,\n  opts?: ScenePickSourceOptions<unknown>,\n  descriptor: PoseDescriptor<unknown> = AUTO_POSE_DESCRIPTOR,\n  query: RegionQueryOptions = {},\n): NodeId[] {\n  const region = polygonRegion(polygon);\n  return region ? walkArea(scene, region, mode, opts, descriptor, query) : [];\n}\n\n/** `shape` as a region reads it: a polygon path's open subpaths enclose\n *  nothing when the node's painter lays down no fill. */\nfunction asInked<T>(filled: () => boolean, shape: T): T {\n  if ((shape as { kind?: unknown } | null)?.kind !== 'polygon') return shape;\n  return filled() ? shape : { ...shape, openFill: 'none' };\n}\n\n/** The walk every region query shares: skip containers unless asked, gate on\n *  the clip, and let `regionTakes` decide each node. */\nfunction walkArea(\n  scene: Scene<unknown, string, unknown>,\n  region: SelectRegion,\n  mode: LassoHitMode,\n  opts: ScenePickSourceOptions<unknown> | undefined,\n  descriptor: PoseDescriptor<unknown>,\n  query: RegionQueryOptions,\n): NodeId[] {\n  const regionQuery = (r: SelectRegion): PickQuery<unknown> => ({\n    includeContainers: query.includeContainers === true,\n    clipAdmits: (clip, node, pose) => {\n      const g = poseDescriptorForNode(descriptor, node);\n      return pathIntersectsRect(clip, visualBoundsViaDescriptor(pose, g))\n        && pathIntersectsRect(clip, r.bounds);\n    },\n    hits: (node, pose) => {\n      // The descriptor sees the node here, so a pose shape whose extent\n      // depends on `node.data` bounds itself rather than its pose's default.\n      const g = poseDescriptorForNode(descriptor, node);\n      const b = regionBoundsOf(node as object, pose, g);\n      let ink: boolean | undefined;\n      const filled = (): boolean => ink ??= findShapeInk(node as never, pose)?.filled !== false;\n      return regionTakes(r, mode, asInked(filled, pose), b, () =>\n        asInked(filled, findShapeSilhouette(node as never, pose) ?? poseOutline(pose, b)), filled);\n    },\n    inPlane: (m) => regionQuery(regionInPlane(r, m)),\n  });\n  return pickWalk<unknown>(scenePickSource(scene, opts), regionQuery(region)) as NodeId[];\n}\n\n/** `r` carried into a plane's world. The map is axis-aligned, so a rect stays\n *  one; a flipped axis reverses the winding, which no region test reads. */\nfunction regionInPlane(r: SelectRegion, m: PlaneMap): SelectRegion {\n  const coords: number[] = [];\n  for (const v of r.verts) {\n    const p = toPlane(m, v);\n    coords.push(p.x, p.y);\n  }\n  return regionOf(coords, rectToPlane(m, r.bounds), r.isRect)!;\n}\n"],"mappings":";;;;;;;;AAwDA,SAAgBA,EACd,GACA,GACiC;CACjC,IAAMC,IAASC,GAAM,MAAM;CAC3B,OAAO;EACL,GAAIC,IAAU,EAAE,WAAQ,IAAI,CAAC;EAC7B,GAAID,GAAM,iBAAiB,EAAE,iBAAiB,MAAkBA,EAAK,eAAgBE,CAAK,EAAE,IAAI,CAAC;EACjG,GAAIH,IAAS,EAAE,UAAO,IAAI,CAAC;CAC7B;AACF;AAGA,SAAgBI,EACd,GACA,GACA,GACA,IAAsCC,GACtC,IAA4B,CAAC,GACnB;CACV,OAAOC,EAASC,GAAOC,EAAWC,CAAM,GAAG,aAAaC,GAAMC,GAAYC,CAAK;AACjF;AA6BA,SAAgBC,EACd,GACA,GACA,GACA,GACA,IAAsCR,GACtC,IAA4B,CAAC,GACnB;CACV,IAAMS,IAASC,EAAcC,CAAO;CACpC,OAAOF,IAASR,EAASC,GAAOO,GAAQG,GAAMP,GAAMC,GAAYC,CAAK,IAAI,CAAC;AAC5E;AAIA,SAASM,EAAW,GAAuB,GAAa;CAEtD,OADKC,GAAqC,SAAS,YAC5CC,EAAO,IAAID,IAAQ;EAAE,GAAGA;EAAO,UAAU;CAAO,IADcA;AAEvE;AAIA,SAASb,EACP,GACA,GACA,GACA,GACA,GACA,GACU;CACV,IAAMe,KAAe,OAAyC;EAC5D,mBAAmBT,EAAM,sBAAsB;EAC/C,aAAa,GAAM,GAAM,MAAS;GAChC,IAAMU,IAAIC,EAAsBZ,GAAYa,CAAI;GAChD,OAAOC,EAAmBC,GAAMC,EAA0BC,GAAMN,CAAC,CAAC,KAC7DG,EAAmBC,GAAMG,EAAE,MAAM;EACxC;EACA,OAAO,GAAM,MAAS;GAGpB,IAAMP,IAAIC,EAAsBZ,GAAYa,CAAI,GAC1CM,IAAIC,EAAeP,GAAgBI,GAAMN,CAAC,GAC5CU,GACEZ,UAAwB,MAAQa,EAAaT,GAAeI,CAAI,CAAC,EAAE,WAAW;GACpF,OAAOM,EAAYL,GAAGZ,GAAMC,EAAQE,GAAQQ,CAAI,GAAGE,SACjDZ,EAAQE,GAAQe,EAAoBX,GAAeI,CAAI,KAAKQ,EAAYR,GAAME,CAAC,CAAC,GAAGV,CAAM;EAC7F;EACA,UAAU,MAAMC,EAAYgB,EAAcR,GAAGS,CAAC,CAAC;CACjD;CACA,OAAOC,EAAkBC,EAAgBjC,GAAOG,CAAI,GAAGW,EAAYP,CAAM,CAAC;AAC5E;AAIA,SAASuB,EAAc,GAAiB,GAA2B;CACjE,IAAMI,IAAmB,CAAC;CAC1B,KAAK,IAAMC,KAAKb,EAAE,OAAO;EACvB,IAAMc,IAAIC,EAAQN,GAAGI,CAAC;EACtB,EAAO,KAAKC,EAAE,GAAGA,EAAE,CAAC;CACtB;CACA,OAAOE,EAASJ,GAAQK,EAAYR,GAAGT,EAAE,MAAM,GAAGA,EAAE,MAAM;AAC5D"}
+{"version":3,"file":"hitTestArea.js","names":["regionPickOptions","camera","view","alphaOf","layer","hitTestArea","AUTO_POSE_DESCRIPTOR","walkArea","scene","rectRegion","bounds","opts","descriptor","query","hitTestLassoPolygon","region","polygonRegion","polygon","mode","asInked","shape","filled","regionQuery","g","poseDescriptorForNode","node","pathIntersectsRect","clip","visualBoundsViaDescriptor","pose","r","b","regionBoundsOf","ink","findShapeInk","regionTakes","findShapeSilhouette","poseOutline","regionInPlane","m","regionInCopy","pickWalk","scenePickSource","coords","v","p","toPlane","regionOf","rectToPlane","x0","y0","x1","y1","x","y","applyToPoint","keepsAxes"],"sources":["../../../src/canvas/deps/hitTestArea.ts"],"sourcesContent":["/**\n * Silhouette-aware area hit-test for marquee and lasso selection.\n *\n * The per-node decision is `regionTakes` (`core/geometry/regionHit`). This\n * module supplies the scene walk and the node's drawn outline: the painter's\n * world-frame silhouette (`findShapeSilhouette`), or with no painter the pose\n * rect, rotated if the pose is.\n */\nimport type { Scene, NodeId } from 'core/scene/types';\nimport { applyToPoint, pathIntersectsRect, type Affine } from '@weasel-js/geom';\nimport type { LassoHitMode } from 'core/adapters/types';\nimport {\n  poseDescriptorForNode,\n  visualBoundsViaDescriptor,\n  type PoseDescriptor,\n} from 'interactions/actions/resize/geometry';\nimport { AUTO_POSE_DESCRIPTOR } from 'core/geometry/autoPoseDescriptor';\nimport {\n  pickWalk,\n  scenePickSource,\n  type PickQuery,\n  type ScenePickSourceOptions,\n} from 'canvas/pickWalk';\nimport { rectToPlane, toPlane, type PlaneMap } from 'core/viewport/parallax';\n\nexport { hiddenLayerIds } from 'canvas/pickWalk';\nimport type { HitTestView } from 'interactions/actions/depSchema';\nimport { findShapeInk, findShapeSilhouette } from 'canvas/NodeShape';\nimport {\n  polygonRegion,\n  poseOutline,\n  rectRegion,\n  regionBoundsOf,\n  regionOf,\n  regionTakes,\n  type SelectRegion,\n} from 'core/geometry/regionHit';\n\nexport interface AABBBounds {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n}\n\n/** What a region query takes back beyond leaves. */\nexport interface RegionQueryOptions {\n  /** Default `false`: a region that takes a container and its children\n   *  selects the same ink twice. A bare-adapter consumer, which has nothing\n   *  to fold children back into their container, asks for them. */\n  includeContainers?: boolean;\n}\n\n\n/** The pick options a region dep hands the shared walk: the asking view's\n *  layer gate and camera, and the surface's alpha. */\nexport function regionPickOptions(\n  view: HitTestView | undefined,\n  alphaOf: ((id: string) => number) | undefined,\n): ScenePickSourceOptions<unknown> {\n  const camera = view?.get?.();\n  return {\n    ...(alphaOf ? { alphaOf } : {}),\n    ...(view?.layerIsPainted ? { layerIsPainted: (layer: string) => view.layerIsPainted!(layer) } : {}),\n    ...(camera ? { camera } : {}),\n  };\n}\n\n/** Marquee entry point: every node the rect `bounds` meets. */\nexport function hitTestArea(\n  scene: Scene<unknown, string, unknown>,\n  bounds: AABBBounds,\n  opts?: ScenePickSourceOptions<unknown>,\n  descriptor: PoseDescriptor<unknown> = AUTO_POSE_DESCRIPTOR,\n  query: RegionQueryOptions = {},\n): NodeId[] {\n  return walkArea(scene, rectRegion(bounds), 'intersect', opts, descriptor, query);\n}\n\n/**\n * Every node an arbitrary closed area polygon meets. `area` is interleaved\n * `[x0,y0,x1,y1,…]`; `areaBounds` is its AABB, derived when omitted.\n */\nexport function hitTestAreaPolygon(\n  scene: Scene<unknown, string, unknown>,\n  area: ArrayLike<number>,\n  areaBounds?: AABBBounds,\n  /** True when `area` IS its own bounding rect, so `areaBounds` containment\n   *  implies containment in the area proper. Never pass this for a lasso\n   *  polygon — a node inside the hull's box can miss the hull. */\n  areaIsRect = false,\n  /** The asking view's alpha and layer accessors. A bare scene answers for\n   *  itself; a view that dims or reorders layers has to supply its own. */\n  opts?: ScenePickSourceOptions<unknown>,\n  /** How to read this scene's poses. Default `AUTO_POSE_DESCRIPTOR`. */\n  descriptor: PoseDescriptor<unknown> = AUTO_POSE_DESCRIPTOR,\n  query: RegionQueryOptions = {},\n): NodeId[] {\n  const region = regionOf(area, areaBounds, areaIsRect);\n  return region ? walkArea(scene, region, 'intersect', opts, descriptor, query) : [];\n}\n\n/**\n * Lasso entry point: which nodes a closed lasso polygon picks under `mode`\n * (see `regionTakes`).\n */\nexport function hitTestLassoPolygon(\n  scene: Scene<unknown, string, unknown>,\n  polygon: ReadonlyArray<{ x: number; y: number }>,\n  mode: LassoHitMode,\n  opts?: ScenePickSourceOptions<unknown>,\n  descriptor: PoseDescriptor<unknown> = AUTO_POSE_DESCRIPTOR,\n  query: RegionQueryOptions = {},\n): NodeId[] {\n  const region = polygonRegion(polygon);\n  return region ? walkArea(scene, region, mode, opts, descriptor, query) : [];\n}\n\n/** `shape` as a region reads it: a polygon path's open subpaths enclose\n *  nothing when the node's painter lays down no fill. */\nfunction asInked<T>(filled: () => boolean, shape: T): T {\n  if ((shape as { kind?: unknown } | null)?.kind !== 'polygon') return shape;\n  return filled() ? shape : { ...shape, openFill: 'none' };\n}\n\n/** The walk every region query shares: skip containers unless asked, gate on\n *  the clip, and let `regionTakes` decide each node. */\nfunction walkArea(\n  scene: Scene<unknown, string, unknown>,\n  region: SelectRegion,\n  mode: LassoHitMode,\n  opts: ScenePickSourceOptions<unknown> | undefined,\n  descriptor: PoseDescriptor<unknown>,\n  query: RegionQueryOptions,\n): NodeId[] {\n  const regionQuery = (r: SelectRegion): PickQuery<unknown> => ({\n    includeContainers: query.includeContainers === true,\n    clipAdmits: (clip, node, pose) => {\n      const g = poseDescriptorForNode(descriptor, node);\n      return pathIntersectsRect(clip, visualBoundsViaDescriptor(pose, g))\n        && pathIntersectsRect(clip, r.bounds);\n    },\n    hits: (node, pose) => {\n      // The descriptor sees the node here, so a pose shape whose extent\n      // depends on `node.data` bounds itself rather than its pose's default.\n      const g = poseDescriptorForNode(descriptor, node);\n      const b = regionBoundsOf(node as object, pose, g);\n      let ink: boolean | undefined;\n      const filled = (): boolean => ink ??= findShapeInk(node as never, pose)?.filled !== false;\n      return regionTakes(r, mode, asInked(filled, pose), b, () =>\n        asInked(filled, findShapeSilhouette(node as never, pose) ?? poseOutline(pose, b)), filled);\n    },\n    inPlane: (m) => regionQuery(regionInPlane(r, m)),\n    inCopy: (m) => regionQuery(regionInCopy(r, m)),\n  });\n  return pickWalk<unknown>(scenePickSource(scene, opts), regionQuery(region)) as NodeId[];\n}\n\n/** `r` carried into a plane's world. The map is axis-aligned, so a rect stays\n *  one; a flipped axis reverses the winding, which no region test reads. */\nfunction regionInPlane(r: SelectRegion, m: PlaneMap): SelectRegion {\n  const coords: number[] = [];\n  for (const v of r.verts) {\n    const p = toPlane(m, v);\n    coords.push(p.x, p.y);\n  }\n  return regionOf(coords, rectToPlane(m, r.bounds), r.isRect)!;\n}\n\n/** `r` carried by an affine into a copy's source frame. A rect stays one only\n *  while the map keeps the axes; a turn makes it a polygon. */\nfunction regionInCopy(r: SelectRegion, m: Affine): SelectRegion {\n  const coords: number[] = [];\n  let x0 = Infinity, y0 = Infinity, x1 = -Infinity, y1 = -Infinity;\n  for (const v of r.verts) {\n    const [x, y] = applyToPoint(m, v.x, v.y);\n    coords.push(x, y);\n    x0 = Math.min(x0, x); y0 = Math.min(y0, y); x1 = Math.max(x1, x); y1 = Math.max(y1, y);\n  }\n  const keepsAxes = (m[1] === 0 && m[2] === 0) || (m[0] === 0 && m[3] === 0);\n  return regionOf(coords, { x: x0, y: y0, width: x1 - x0, height: y1 - y0 }, r.isRect && keepsAxes)!;\n}\n"],"mappings":"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"}

package/dist/canvas/deps/insert.js

@@ -1,18 +1,20 @@
-import { insertPreviewExtent as e } from "../insertPreviewExtent.js";
-import { cycleFill as t, solid as n, strokeOf as r } from "../../util/paint.js";
-import { createInsertOp as i } from "../../core/ops/create.js";
-import { ellipsePath as a, linePath as o, polygonFromPoints as s, rectPath as c, regularPolygonPath as l, schneiderFit as u, starPath as d } from "@weasel-js/geom";
-import { useRef as f } from "react";
-import { useLatest as p } from "@weasel-js/react";
-import { useDepSource as m } from "@weasel-js/routing/react";
+import { composeWorldPose as e, composesFrames as t } from "../../core/scene/composeFrame.js";
+import { definesFrame as n } from "../../core/scene/effectivePose.js";
+import { insertPreviewExtent as r } from "../insertPreviewExtent.js";
+import { cycleFill as i, solid as a, strokeOf as o } from "../../util/paint.js";
+import { createInsertOp as s } from "../../core/ops/create.js";
+import { ellipsePath as c, linePath as l, polygonFromPoints as u, rectPath as d, regularPolygonPath as f, schneiderFit as p, starPath as m } from "@weasel-js/geom";
+import { useRef as h } from "react";
+import { useLatest as g } from "@weasel-js/react";
+import { useDepRegistry as _, useDepSource as v } from "@weasel-js/routing/react";
 //#region src/canvas/deps/insert.ts
-function h({ fill: e, stroke: t }) {
+function y({ fill: e, stroke: t }) {
 	return {
 		...e === void 0 ? {} : { fill: e },
 		...t === void 0 ? {} : { stroke: t }
 	};
 }
-function g(e, t) {
+function b(e, t) {
 	let n = e?.path;
 	return t === void 0 || n === void 0 || !("fillRule" in n) ? e : {
 		...e,
@@ -22,134 +24,166 @@ function g(e, t) {
 		}
 	};
 }
-var _ = (e, i) => {
-	let a = t(i);
-	return e === "line" || e === "pencil" ? { stroke: r(a, 2) } : e === "path" ? {
-		fill: { paint: n(a) },
-		stroke: r(a, 2)
-	} : { fill: { paint: n(a) } };
+var x = (e, t) => {
+	let n = i(t);
+	return e === "line" || e === "pencil" ? { stroke: o(n, 2) } : e === "path" ? {
+		fill: { paint: a(n) },
+		stroke: o(n, 2)
+	} : { fill: { paint: a(n) } };
 };
-function v(t, n, r, v = _) {
-	let y = p(t), b = p(n), x = p(r), S = p(v), C = f(0), w = f({ gesture: null });
-	m("insertLive", () => w.current), m("insert", () => {
-		let t = y.current, n = b.current, r = t.layers[0]?.id ?? "default", f = (n, f) => {
-			let p = f.kind, m = ++C.current, _ = t.mintId(), v, y = (e = p) => h(v = S.current(e, m)), b = e({
-				shape: p,
-				bounds: n,
-				extras: f
-			}), w = b.bounds, T = x.current?.[p];
-			if (T) {
-				let e = T(n, f);
+function S(e, t, n, r) {
+	switch (e) {
+		case "rect": return {
+			path: d(0, 0, t.width, t.height),
+			...r()
+		};
+		case "ellipse": return {
+			path: c(t),
+			...r()
+		};
+		case "path": {
+			let e = n;
+			return {
+				path: e.path,
+				...r(),
+				...e.closed ? {} : { fill: null }
+			};
+		}
+		case "text": return { text: n.text ?? "" };
+		case "image": {
+			let e = n;
+			return { image: {
+				src: e.src ?? "",
+				...e.opacity === void 0 ? {} : { opacity: e.opacity }
+			} };
+		}
+		default: return null;
+	}
+}
+function C(r, i) {
+	let a = i == null ? void 0 : r.get(i);
+	if (a === void 0 || a.kind !== "container") return {
+		parent: null,
+		layer: r.layers[0]?.id ?? "default",
+		local: (e) => e
+	};
+	let o = r.composition;
+	if (o === void 0 || !t(o)) return {
+		parent: a.id,
+		layer: a.layer,
+		local: (e) => e
+	};
+	let s = e({
+		getPose: (e) => r.get(e).pose,
+		getParent: (e) => r.get(e)?.parent ?? null,
+		definesFrame: (e) => n(r.get(e) ?? {})
+	}, a.id, o.compose);
+	return {
+		parent: a.id,
+		layer: a.layer,
+		local: (e) => o.decompose(s, e)
+	};
+}
+function w(e, t, n, i = x) {
+	let a = g(e), o = g(t), c = g(n), w = g(i), T = _(), E = h(0), D = h({ gesture: null });
+	v("insertLive", () => D.current), v("insert", () => {
+		let e = a.current, t = o.current, n = () => C(e, T.get("insertInto")?.get()), i = (t, i) => {
+			let a = i.kind, { parent: o, layer: h, local: g } = n(), _ = ++E.current, v = e.mintId(), x, C = (e = a) => y(x = w.current(e, _)), T = r({
+				shape: a,
+				bounds: t,
+				extras: i
+			}), D = T.bounds, O = c.current?.[a];
+			if (O) {
+				let e = O(t, i);
 				return e === null ? null : {
-					id: _,
-					ops: [i({
+					id: v,
+					ops: [s({
 						node: {
-							id: _,
+							id: v,
 							kind: "leaf",
-							layer: r,
-							pose: e.pose ?? w,
+							layer: h,
+							parent: o,
+							pose: g(e.pose ?? D),
 							data: e.data
 						},
-						label: `Insert ${p}`
+						label: `Insert ${a}`
 					})]
 				};
 			}
-			let E = b.geometry, D;
-			switch (E.kind) {
+			let k = T.geometry, A;
+			switch (k.kind) {
 				case "line":
-					D = {
-						path: o(E.a, E.b),
-						...y(),
+					A = {
+						path: l(k.a, k.b),
+						...C(),
 						fill: null
 					};
 					break;
 				case "polygon":
-					D = {
-						path: l(E.center, E.radius, E.sides, E.rotation),
-						...y()
+					A = {
+						path: f(k.center, k.radius, k.sides, k.rotation),
+						generator: {
+							kind: "polygon",
+							sides: k.sides,
+							rotation: k.rotation
+						},
+						...C()
 					};
 					break;
 				case "star":
-					D = {
-						path: d(E.center, E.outerRadius, E.points, E.innerRadius, E.rotation),
-						...y()
+					A = {
+						path: m(k.center, k.outerRadius, k.points, k.innerRadius, k.rotation),
+						generator: {
+							kind: "star",
+							points: k.points,
+							innerRadiusRatio: k.outerRadius === 0 ? .5 : k.innerRadius / k.outerRadius,
+							rotation: k.rotation
+						},
+						...C()
 					};
 					break;
 				case "pencil": {
-					let e = E.samples;
-					D = e.length >= 4 ? {
-						path: u(e, 2),
-						...y()
+					let e = k.samples;
+					A = e.length >= 4 ? {
+						path: p(e, 2),
+						...C()
 					} : e.length >= 2 ? {
-						path: s(e),
-						...y()
+						path: u(e),
+						...C()
 					} : {
-						path: c(0, 0, b.bounds.width, b.bounds.height),
-						...y("rect")
+						path: d(0, 0, T.bounds.width, T.bounds.height),
+						...C("rect")
 					};
 					break;
 				}
-				case "box": switch (p) {
-					case "rect":
-						D = {
-							path: c(0, 0, b.bounds.width, b.bounds.height),
-							...y()
-						};
-						break;
-					case "ellipse":
-						D = {
-							path: a(b.bounds),
-							...y()
-						};
-						break;
-					case "path": {
-						let e = f;
-						D = {
-							path: e.path,
-							...y(),
-							...e.closed ? {} : { fill: null }
-						};
-						break;
-					}
-					case "text":
-						D = { text: f.text ?? "" };
-						break;
-					case "image": {
-						let e = f;
-						D = { image: {
-							src: e.src ?? "",
-							...e.opacity === void 0 ? {} : { opacity: e.opacity }
-						} };
-						break;
-					}
-					default: return console.warn(`weasel insertDep: no factory for kind="${p}". Skipping insert.`), null;
-				}
+				case "box": if (A = S(a, T.bounds, i, C), A === null) return console.warn(`weasel insertDep: no factory for kind="${a}". Skipping insert.`), null;
 			}
-			return D = g(D, v?.fillRule), {
-				id: _,
-				ops: [i({
+			return A = b(A, x?.fillRule), {
+				id: v,
+				ops: [s({
 					node: {
-						id: _,
+						id: v,
 						kind: "leaf",
-						layer: r,
-						pose: w,
-						data: D
+						layer: h,
+						parent: o,
+						pose: g(D),
+						data: A
 					},
-					label: `Insert ${p}`
+					label: `Insert ${a}`
 				})]
 			};
 		};
 		return {
-			layer: () => r,
-			build: f,
-			commit(e, t) {
-				let r = f(e, t);
-				return r === null ? null : (n.applyOps(r.ops, `Insert ${t.kind}`), r.id);
+			layer: () => n().layer,
+			build: i,
+			commit(e, n) {
+				let r = i(e, n);
+				return r === null ? null : (t.applyOps(r.ops, `Insert ${n.kind}`), r.id);
 			}
 		};
 	});
 }
 //#endregion
-export { _ as paletteInsertPaint, v as useInsertDepSource };
+export { x as paletteInsertPaint, w as useInsertDepSource };
 
 //# sourceMappingURL=insert.js.map