@weasel-js/core 1.12.0 → 1.13.0-rc.0

package/dist/canvas/doubleClickTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"doubleClickTarget.js","names":[],"sources":["../../src/canvas/doubleClickTarget.ts"],"sourcesContent":["/** How {@link doubleClickTarget} reads the tree. */\nexport interface DoubleClickTree {\n  parentOf: (id: string) => string | null;\n  /** A node's routing kind; a node routed `'group'` is one a double-click can name. */\n  kindOf: (id: string) => string | undefined;\n  /** The group isolation is working inside, or null at the scene root. */\n  scope: string | null;\n}\n\n/**\n * The node a double-click on `hitId` names: the outermost group on the way up from it, stopping\n * below `scope`, or `hitId` itself where no group stands between them. So a double-click on a\n * grouped member names the group, and each one inside an isolated group names the next group in.\n */\nexport function doubleClickTarget(hitId: string, tree: DoubleClickTree): string {\n  const { parentOf, kindOf, scope } = tree;\n  let named = hitId;\n  let id: string | null = hitId;\n  // Capped so a cyclic parent chain cannot hang the pick.\n  for (let depth = 0; id !== null && id !== scope && depth < 10_000; depth++) {\n    if (kindOf(id) === 'group') named = id;\n    id = parentOf(id);\n  }\n  return named;\n}\n"],"mappings":";;;;;;AAcA,SAAgB,kBAAkB,OAAe,MAA+B;CAC9E,MAAM,EAAE,UAAU,QAAQ,UAAU;CACpC,IAAI,QAAQ;CACZ,IAAI,KAAoB;CAExB,KAAK,IAAI,QAAQ,GAAG,OAAO,QAAQ,OAAO,SAAS,QAAQ,KAAQ,SAAS;EAC1E,IAAI,OAAO,EAAE,MAAM,SAAS,QAAQ;EACpC,KAAK,SAAS,EAAE;CAClB;CACA,OAAO;AACT"}
+{"version":3,"file":"doubleClickTarget.js","names":[],"sources":["../../src/canvas/doubleClickTarget.ts"],"sourcesContent":["import { pressTarget } from '../tools/builtin/pressTarget';\n\n/** How {@link doubleClickTarget} reads the tree. */\nexport interface DoubleClickTree {\n  parentOf: (id: string) => string | null;\n  /** A node's routing kind; a node routed `'group'` is one a double-click can name. */\n  kindOf: (id: string) => string | undefined;\n  /** The entered group, or null at the scene root. */\n  scope: string | null;\n}\n\n/**\n * The node a double-click on `hitId` names: what a press there would select, taken inside\n * `scope` (`pressTarget`). So a double-click on a grouped member names the outermost group\n * above it, and each one inside the entered group names the next group in.\n */\nexport function doubleClickTarget(hitId: string, tree: DoubleClickTree): string {\n  return pressTarget(\n    { getParent: tree.parentOf, getNode: (id) => ({ kind: tree.kindOf(id) }) },\n    hitId,\n    tree.scope,\n  );\n}\n"],"mappings":";;;;;;;;AAgBA,SAAgB,kBAAkB,OAAe,MAA+B;CAC9E,OAAO,YACL;EAAE,WAAW,KAAK;EAAU,UAAU,QAAQ,EAAE,MAAM,KAAK,OAAO,EAAE,EAAE;CAAG,GACzE,OACA,KAAK,KACP;AACF"}

package/dist/canvas/drawnBounds.js

@@ -1,7 +1,7 @@
+import { inheritedPaintIn } from "../core/scene/inheritedPaint.js";
 import { axisAlignedBounds, unionBounds } from "../core/geometry/unionBounds.js";
 import { framedBounds, poseDescriptorForNode } from "../core/geometry/poseDescriptor.js";
 import { AUTO_POSE_DESCRIPTOR } from "../core/geometry/autoPoseDescriptor.js";
-import { inheritedPaintIn } from "./inheritedPaints.js";
 import { targetCorners, targetTransformOf, worldToLocal } from "../core/geometry/targetFrame.js";
 import { NO_INK_EXTENTS, inkExtentsBetween, outsetBox } from "../core/geometry/inkExtents.js";
 import { findNodeShape } from "./NodeShape.js";
@@ -18,8 +18,9 @@ import { boundsOfPath, meanScale } from "@weasel-js/geom";
 * The box of `id` drawn at `pose`, stroke included, in the frame the pose is
 * drawn in: a turned node's box comes back turned with it. A node with no
 * stroke, a painter that declares no {@link NodeShapeEntry.drawnBounds}, or
-* `includeStroke: false` answers `framedBounds` unchanged. A container's box
-* reaches as far as its members' boxes do. A node showing a derived path is
+* `includeStroke: false` answers `framedBounds` unchanged. A group's box
+* reaches as far as its members' boxes do; a mark's, as far as its own ink and its
+* children's do. A node showing a derived path is
 * boxed around that path, and its placeholder pose plays no part.
 */
 function drawnBoundsOf(scene, id, pose, opts = {}) {
@@ -40,10 +41,18 @@ function inkExtentsOf(scene, id, pose, opts = {}) {
 		width: own.width,
 		height: own.height
 	};
-	const members = node.kind === "container" ? scene.childrenOf?.(id) ?? [] : [];
-	if (members.length > 0) return membersExtents(scene, members, own, opts);
+	const members = scene.childrenOf?.(id) ?? [];
+	const reached = members.length > 0 ? membersExtents(scene, members, own, opts) : NO_INK_EXTENTS;
+	if (node.kind === "group" && members.length > 0) return reached;
 	const drawn = findShapeDrawnBounds(node, pose, withInherited(scene, node, inkCtx(opts.scale, own)));
-	return drawn === null ? NO_INK_EXTENTS : inkExtentsBetween(normalized(unframed), drawn);
+	if (drawn === null) return reached;
+	const ink = inkExtentsBetween(normalized(unframed), drawn);
+	return {
+		left: Math.max(ink.left, reached.left),
+		top: Math.max(ink.top, reached.top),
+		right: Math.max(ink.right, reached.right),
+		bottom: Math.max(ink.bottom, reached.bottom)
+	};
 }
 /** The box of a node drawn along `path`: the path's own, grown by the stroke
 *  its painter reports. */
@@ -68,7 +77,7 @@ function derivedBoundsOf(scene, id, pose, path, opts) {
 	});
 	return drawn === null ? own : unionBounds([own, drawn]) ?? own;
 }
-/** A container's extents: its members' drawn boxes, taken into its own frame,
+/** A parent's member extents: its members' drawn boxes, taken into its own frame,
 *  past its own box. */
 function membersExtents(scene, members, own, opts) {
 	const xf = targetTransformOf(own);

package/dist/canvas/drawnBounds.js.map

@@ -1 +1 @@
-{"version":3,"file":"drawnBounds.js","names":[],"sources":["../../src/canvas/drawnBounds.ts"],"sourcesContent":["/**\n * The box of a node as drawn — its pose box with the stroke included — which\n * is what selection chrome, resize, rotate, and alignment sit on. Places that\n * store geometry (a group's derived pose, booleans, export) keep reading the\n * pose box through `framedBounds`.\n */\nimport { inheritedPaintIn } from './inheritedPaints';\nimport { framedBounds, poseDescriptorForNode, type PoseDescriptor } from 'core/geometry/poseDescriptor';\nimport {\n  inkExtentsBetween,\n  NO_INK_EXTENTS,\n  outsetBox,\n  type InkExtents,\n} from 'core/geometry/inkExtents';\nimport { targetCorners, targetTransformOf, worldToLocal } from 'core/geometry/targetFrame';\nimport { axisAlignedBounds, unionBounds } from 'core/geometry/unionBounds';\nimport type { Node, NodeId } from 'core/scene/types';\nimport type { Bounds } from 'core/viewport/fitViewToBounds';\nimport { boundsOfPath, meanScale, type Path, type Scale2 } from '@weasel-js/geom';\nimport { AUTO_POSE_DESCRIPTOR } from 'core/geometry/autoPoseDescriptor';\nimport { findNodeShape, type NodeInkCtx } from './NodeShape';\n\n/** The scene reads {@link drawnBoundsOf} makes. `childrenOf` absent: every\n *  node is a leaf. `derivedPathOf` absent: every node is measured by its pose,\n *  a path-derived one included — `drawnBoundsScene` supplies it for a `Scene`. */\nexport interface DrawnBoundsScene {\n  get(id: NodeId): Node<unknown, string, unknown> | undefined;\n  childrenOf?(id: NodeId): readonly NodeId[];\n  /** The path a node shows in place of its pose's, or `null` for one that shows its own. */\n  derivedPathOf?(id: NodeId): Path | null;\n}\n\n/** How {@link drawnBoundsOf} reads a node. */\nexport interface DrawnBoundsOptions {\n  /** How poses are read. Default `AUTO_POSE_DESCRIPTOR`. */\n  descriptor?: PoseDescriptor<unknown>;\n  /** A member's world pose, for boxing a container around its members.\n   *  Default: its pose as stored, which is world unless containers compose. */\n  worldPoseOf?: (id: NodeId) => unknown;\n  /** `false` answers the pose box alone. Default `true`. */\n  includeStroke?: boolean;\n  /** View scale, which a screen-pixel stroke width is resolved at. Default 1. */\n  scale?: number | Scale2;\n}\n\n/**\n * The box of `id` drawn at `pose`, stroke included, in the frame the pose is\n * drawn in: a turned node's box comes back turned with it. A node with no\n * stroke, a painter that declares no {@link NodeShapeEntry.drawnBounds}, or\n * `includeStroke: false` answers `framedBounds` unchanged. A container's box\n * reaches as far as its members' boxes do. A node showing a derived path is\n * boxed around that path, and its placeholder pose plays no part.\n */\nexport function drawnBoundsOf(\n  scene: DrawnBoundsScene,\n  id: NodeId,\n  pose: unknown,\n  opts: DrawnBoundsOptions = {},\n): Bounds {\n  const derived = scene.derivedPathOf?.(id) ?? null;\n  if (derived !== null) return derivedBoundsOf(scene, id, pose, derived, opts);\n  return outsetBox(framedBounds(pose, descriptorFor(scene, id, opts)), inkExtentsOf(scene, id, pose, opts));\n}\n\n/** How far `id`'s ink at `pose` reaches past its pose box on each side, in\n *  the box's own frame: what {@link drawnBoundsOf} grows the pose box by. */\nexport function inkExtentsOf(\n  scene: DrawnBoundsScene,\n  id: NodeId,\n  pose: unknown,\n  opts: DrawnBoundsOptions = {},\n): InkExtents {\n  if (opts.includeStroke === false) return NO_INK_EXTENTS;\n  const node = scene.get(id);\n  if (!node) return NO_INK_EXTENTS;\n  const own = framedBounds(pose, descriptorFor(scene, id, opts));\n  const unframed = { x: own.x, y: own.y, width: own.width, height: own.height };\n  const members = node.kind === 'container' ? scene.childrenOf?.(id) ?? [] : [];\n  if (members.length > 0) return membersExtents(scene, members, own, opts);\n  const drawn = findShapeDrawnBounds(node, pose, withInherited(scene, node, inkCtx(opts.scale, own)));\n  return drawn === null ? NO_INK_EXTENTS : inkExtentsBetween(normalized(unframed), drawn);\n}\n\n/** The box of a node drawn along `path`: the path's own, grown by the stroke\n *  its painter reports. */\nfunction derivedBoundsOf(scene: DrawnBoundsScene, id: NodeId, pose: unknown, path: Path, opts: DrawnBoundsOptions): Bounds {\n  const { x, y, width, height } = boundsOfPath(path);\n  const own = { x, y, width, height };\n  const node = scene.get(id);\n  if (opts.includeStroke === false || !node) return own;\n  const ctx = { ...withInherited(scene, node, inkCtx(opts.scale, { x: 0, y: 0, width: 0, height: 0 })), derivedPath: path };\n  const drawn = findShapeDrawnBounds(node, pose, ctx);\n  return drawn === null ? own : unionBounds([own, drawn]) ?? own;\n}\n\n/** A container's extents: its members' drawn boxes, taken into its own frame,\n *  past its own box. */\nfunction membersExtents(\n  scene: DrawnBoundsScene,\n  members: readonly NodeId[],\n  own: Bounds,\n  opts: DrawnBoundsOptions,\n): InkExtents {\n  const xf = targetTransformOf(own);\n  const worldPoseOf = opts.worldPoseOf ?? ((m: NodeId) => scene.get(m)?.pose);\n  let x0 = Infinity, y0 = Infinity, x1 = -Infinity, y1 = -Infinity;\n  for (const m of members) {\n    const box = drawnBoundsOf(scene, m, worldPoseOf(m), opts);\n    for (const c of targetCorners(box, targetTransformOf(box))) {\n      const p = worldToLocal(xf, c.x, c.y);\n      if (!p) continue;\n      x0 = Math.min(x0, p.x); y0 = Math.min(y0, p.y);\n      x1 = Math.max(x1, p.x); y1 = Math.max(y1, p.y);\n    }\n  }\n  if (x0 === Infinity) return NO_INK_EXTENTS;\n  return inkExtentsBetween(normalized(own), { x: x0, y: y0, width: x1 - x0, height: y1 - y0 });\n}\n\n/** {@link drawnBoundsOf} as an axis-aligned box: what a turned node covers. */\nexport function drawnAABBOf(\n  scene: DrawnBoundsScene,\n  id: NodeId,\n  pose: unknown,\n  opts: DrawnBoundsOptions = {},\n): Bounds {\n  return axisAlignedBounds(drawnBoundsOf(scene, id, pose, opts));\n}\n\n/** The painter's {@link NodeShapeEntry.drawnBounds} for `node`, or `null`\n *  when no painter matches or the one that does declares none. */\nexport function findShapeDrawnBounds<TData, TPose>(\n  node: Node<TData, string, TPose>,\n  pose: TPose,\n  ctx?: NodeInkCtx,\n): Bounds | null {\n  return findNodeShape(node)?.drawnBounds?.(node, pose, ctx) ?? null;\n}\n\nfunction descriptorFor(scene: DrawnBoundsScene, id: NodeId, opts: DrawnBoundsOptions): PoseDescriptor<unknown> {\n  const d = opts.descriptor ?? AUTO_POSE_DESCRIPTOR;\n  const node = scene.get(id);\n  return node ? poseDescriptorForNode(d, node) : d;\n}\n\n/** A per-axis view scale also carries the map from `own`'s frame to screen,\n *  so a `{ px }` stroke is measured there rather than at the mean. */\nfunction inkCtx(scale: number | Scale2 | undefined, own: Bounds): NodeInkCtx | undefined {\n  if (scale === undefined) return undefined;\n  if (typeof scale === 'number') return { scale };\n  const xf = targetTransformOf(own);\n  const [a, b, c, d] = xf.identity ? [1, 0, 0, 1] : xf.toWorld;\n  return { scale: meanScale(scale), screen: [scale.x * a, scale.y * b, scale.x * c, scale.y * d] };\n}\n\nfunction withInherited(\n  scene: DrawnBoundsScene,\n  node: Node<unknown, string, unknown>,\n  ctx: NodeInkCtx | undefined,\n): NodeInkCtx | undefined {\n  const inherited = inheritedPaintIn(scene, node);\n  return inherited === undefined ? ctx : { ...ctx, inherited };\n}\n\nfunction normalized(b: Bounds): Bounds {\n  return {\n    x: Math.min(b.x, b.x + b.width),\n    y: Math.min(b.y, b.y + b.height),\n    width: Math.abs(b.width),\n    height: Math.abs(b.height),\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"drawnBounds.js","names":[],"sources":["../../src/canvas/drawnBounds.ts"],"sourcesContent":["/**\n * The box of a node as drawn — its pose box with the stroke included — which\n * is what selection chrome, resize, rotate, and alignment sit on. Places that\n * store geometry (a group's derived pose, booleans, export) keep reading the\n * pose box through `framedBounds`.\n */\nimport { inheritedPaintIn } from './inheritedPaints';\nimport { framedBounds, poseDescriptorForNode, type PoseDescriptor } from 'core/geometry/poseDescriptor';\nimport {\n  inkExtentsBetween,\n  NO_INK_EXTENTS,\n  outsetBox,\n  type InkExtents,\n} from 'core/geometry/inkExtents';\nimport { targetCorners, targetTransformOf, worldToLocal } from 'core/geometry/targetFrame';\nimport { axisAlignedBounds, unionBounds } from 'core/geometry/unionBounds';\nimport type { Node, NodeId } from 'core/scene/types';\nimport type { Bounds } from 'core/viewport/fitViewToBounds';\nimport { boundsOfPath, meanScale, type Path, type Scale2 } from '@weasel-js/geom';\nimport { AUTO_POSE_DESCRIPTOR } from 'core/geometry/autoPoseDescriptor';\nimport { findNodeShape, type NodeInkCtx } from './NodeShape';\n\n/** The scene reads {@link drawnBoundsOf} makes. `childrenOf` absent: every\n *  node is a leaf. `derivedPathOf` absent: every node is measured by its pose,\n *  a path-derived one included — `drawnBoundsScene` supplies it for a `Scene`. */\nexport interface DrawnBoundsScene {\n  get(id: NodeId): Node<unknown, string, unknown> | undefined;\n  childrenOf?(id: NodeId): readonly NodeId[];\n  /** The path a node shows in place of its pose's, or `null` for one that shows its own. */\n  derivedPathOf?(id: NodeId): Path | null;\n}\n\n/** How {@link drawnBoundsOf} reads a node. */\nexport interface DrawnBoundsOptions {\n  /** How poses are read. Default `AUTO_POSE_DESCRIPTOR`. */\n  descriptor?: PoseDescriptor<unknown>;\n  /** A member's world pose, for boxing a container around its members.\n   *  Default: its pose as stored, which is world unless containers compose. */\n  worldPoseOf?: (id: NodeId) => unknown;\n  /** `false` answers the pose box alone. Default `true`. */\n  includeStroke?: boolean;\n  /** View scale, which a screen-pixel stroke width is resolved at. Default 1. */\n  scale?: number | Scale2;\n}\n\n/**\n * The box of `id` drawn at `pose`, stroke included, in the frame the pose is\n * drawn in: a turned node's box comes back turned with it. A node with no\n * stroke, a painter that declares no {@link NodeShapeEntry.drawnBounds}, or\n * `includeStroke: false` answers `framedBounds` unchanged. A group's box\n * reaches as far as its members' boxes do; a mark's, as far as its own ink and its\n * children's do. A node showing a derived path is\n * boxed around that path, and its placeholder pose plays no part.\n */\nexport function drawnBoundsOf(\n  scene: DrawnBoundsScene,\n  id: NodeId,\n  pose: unknown,\n  opts: DrawnBoundsOptions = {},\n): Bounds {\n  const derived = scene.derivedPathOf?.(id) ?? null;\n  if (derived !== null) return derivedBoundsOf(scene, id, pose, derived, opts);\n  return outsetBox(framedBounds(pose, descriptorFor(scene, id, opts)), inkExtentsOf(scene, id, pose, opts));\n}\n\n/** How far `id`'s ink at `pose` reaches past its pose box on each side, in\n *  the box's own frame: what {@link drawnBoundsOf} grows the pose box by. */\nexport function inkExtentsOf(\n  scene: DrawnBoundsScene,\n  id: NodeId,\n  pose: unknown,\n  opts: DrawnBoundsOptions = {},\n): InkExtents {\n  if (opts.includeStroke === false) return NO_INK_EXTENTS;\n  const node = scene.get(id);\n  if (!node) return NO_INK_EXTENTS;\n  const own = framedBounds(pose, descriptorFor(scene, id, opts));\n  const unframed = { x: own.x, y: own.y, width: own.width, height: own.height };\n  const members = scene.childrenOf?.(id) ?? [];\n  const reached = members.length > 0 ? membersExtents(scene, members, own, opts) : NO_INK_EXTENTS;\n  if (node.kind === 'group' && members.length > 0) return reached;\n  const drawn = findShapeDrawnBounds(node, pose, withInherited(scene, node, inkCtx(opts.scale, own)));\n  if (drawn === null) return reached;\n  const ink = inkExtentsBetween(normalized(unframed), drawn);\n  return {\n    left: Math.max(ink.left, reached.left),\n    top: Math.max(ink.top, reached.top),\n    right: Math.max(ink.right, reached.right),\n    bottom: Math.max(ink.bottom, reached.bottom),\n  };\n}\n\n/** The box of a node drawn along `path`: the path's own, grown by the stroke\n *  its painter reports. */\nfunction derivedBoundsOf(scene: DrawnBoundsScene, id: NodeId, pose: unknown, path: Path, opts: DrawnBoundsOptions): Bounds {\n  const { x, y, width, height } = boundsOfPath(path);\n  const own = { x, y, width, height };\n  const node = scene.get(id);\n  if (opts.includeStroke === false || !node) return own;\n  const ctx = { ...withInherited(scene, node, inkCtx(opts.scale, { x: 0, y: 0, width: 0, height: 0 })), derivedPath: path };\n  const drawn = findShapeDrawnBounds(node, pose, ctx);\n  return drawn === null ? own : unionBounds([own, drawn]) ?? own;\n}\n\n/** A parent's member extents: its members' drawn boxes, taken into its own frame,\n *  past its own box. */\nfunction membersExtents(\n  scene: DrawnBoundsScene,\n  members: readonly NodeId[],\n  own: Bounds,\n  opts: DrawnBoundsOptions,\n): InkExtents {\n  const xf = targetTransformOf(own);\n  const worldPoseOf = opts.worldPoseOf ?? ((m: NodeId) => scene.get(m)?.pose);\n  let x0 = Infinity, y0 = Infinity, x1 = -Infinity, y1 = -Infinity;\n  for (const m of members) {\n    const box = drawnBoundsOf(scene, m, worldPoseOf(m), opts);\n    for (const c of targetCorners(box, targetTransformOf(box))) {\n      const p = worldToLocal(xf, c.x, c.y);\n      if (!p) continue;\n      x0 = Math.min(x0, p.x); y0 = Math.min(y0, p.y);\n      x1 = Math.max(x1, p.x); y1 = Math.max(y1, p.y);\n    }\n  }\n  if (x0 === Infinity) return NO_INK_EXTENTS;\n  return inkExtentsBetween(normalized(own), { x: x0, y: y0, width: x1 - x0, height: y1 - y0 });\n}\n\n/** {@link drawnBoundsOf} as an axis-aligned box: what a turned node covers. */\nexport function drawnAABBOf(\n  scene: DrawnBoundsScene,\n  id: NodeId,\n  pose: unknown,\n  opts: DrawnBoundsOptions = {},\n): Bounds {\n  return axisAlignedBounds(drawnBoundsOf(scene, id, pose, opts));\n}\n\n/** The painter's {@link NodeShapeEntry.drawnBounds} for `node`, or `null`\n *  when no painter matches or the one that does declares none. */\nexport function findShapeDrawnBounds<TData, TPose>(\n  node: Node<TData, string, TPose>,\n  pose: TPose,\n  ctx?: NodeInkCtx,\n): Bounds | null {\n  return findNodeShape(node)?.drawnBounds?.(node, pose, ctx) ?? null;\n}\n\nfunction descriptorFor(scene: DrawnBoundsScene, id: NodeId, opts: DrawnBoundsOptions): PoseDescriptor<unknown> {\n  const d = opts.descriptor ?? AUTO_POSE_DESCRIPTOR;\n  const node = scene.get(id);\n  return node ? poseDescriptorForNode(d, node) : d;\n}\n\n/** A per-axis view scale also carries the map from `own`'s frame to screen,\n *  so a `{ px }` stroke is measured there rather than at the mean. */\nfunction inkCtx(scale: number | Scale2 | undefined, own: Bounds): NodeInkCtx | undefined {\n  if (scale === undefined) return undefined;\n  if (typeof scale === 'number') return { scale };\n  const xf = targetTransformOf(own);\n  const [a, b, c, d] = xf.identity ? [1, 0, 0, 1] : xf.toWorld;\n  return { scale: meanScale(scale), screen: [scale.x * a, scale.y * b, scale.x * c, scale.y * d] };\n}\n\nfunction withInherited(\n  scene: DrawnBoundsScene,\n  node: Node<unknown, string, unknown>,\n  ctx: NodeInkCtx | undefined,\n): NodeInkCtx | undefined {\n  const inherited = inheritedPaintIn(scene, node);\n  return inherited === undefined ? ctx : { ...ctx, inherited };\n}\n\nfunction normalized(b: Bounds): Bounds {\n  return {\n    x: Math.min(b.x, b.x + b.width),\n    y: Math.min(b.y, b.y + b.height),\n    width: Math.abs(b.width),\n    height: Math.abs(b.height),\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAsDA,SAAgB,cACd,OACA,IACA,MACA,OAA2B,CAAC,GACpB;CACR,MAAM,UAAU,MAAM,gBAAgB,EAAE,KAAK;CAC7C,IAAI,YAAY,MAAM,OAAO,gBAAgB,OAAO,IAAI,MAAM,SAAS,IAAI;CAC3E,OAAO,UAAU,aAAa,MAAM,cAAc,OAAO,IAAI,IAAI,CAAC,GAAG,aAAa,OAAO,IAAI,MAAM,IAAI,CAAC;AAC1G;;;AAIA,SAAgB,aACd,OACA,IACA,MACA,OAA2B,CAAC,GAChB;CACZ,IAAI,KAAK,kBAAkB,OAAO,OAAO;CACzC,MAAM,OAAO,MAAM,IAAI,EAAE;CACzB,IAAI,CAAC,MAAM,OAAO;CAClB,MAAM,MAAM,aAAa,MAAM,cAAc,OAAO,IAAI,IAAI,CAAC;CAC7D,MAAM,WAAW;EAAE,GAAG,IAAI;EAAG,GAAG,IAAI;EAAG,OAAO,IAAI;EAAO,QAAQ,IAAI;CAAO;CAC5E,MAAM,UAAU,MAAM,aAAa,EAAE,KAAK,CAAC;CAC3C,MAAM,UAAU,QAAQ,SAAS,IAAI,eAAe,OAAO,SAAS,KAAK,IAAI,IAAI;CACjF,IAAI,KAAK,SAAS,WAAW,QAAQ,SAAS,GAAG,OAAO;CACxD,MAAM,QAAQ,qBAAqB,MAAM,MAAM,cAAc,OAAO,MAAM,OAAO,KAAK,OAAO,GAAG,CAAC,CAAC;CAClG,IAAI,UAAU,MAAM,OAAO;CAC3B,MAAM,MAAM,kBAAkB,WAAW,QAAQ,GAAG,KAAK;CACzD,OAAO;EACL,MAAM,KAAK,IAAI,IAAI,MAAM,QAAQ,IAAI;EACrC,KAAK,KAAK,IAAI,IAAI,KAAK,QAAQ,GAAG;EAClC,OAAO,KAAK,IAAI,IAAI,OAAO,QAAQ,KAAK;EACxC,QAAQ,KAAK,IAAI,IAAI,QAAQ,QAAQ,MAAM;CAC7C;AACF;;;AAIA,SAAS,gBAAgB,OAAyB,IAAY,MAAe,MAAY,MAAkC;CACzH,MAAM,EAAE,GAAG,GAAG,OAAO,WAAW,aAAa,IAAI;CACjD,MAAM,MAAM;EAAE;EAAG;EAAG;EAAO;CAAO;CAClC,MAAM,OAAO,MAAM,IAAI,EAAE;CACzB,IAAI,KAAK,kBAAkB,SAAS,CAAC,MAAM,OAAO;CAElD,MAAM,QAAQ,qBAAqB,MAAM,MAAM;EADjC,GAAG,cAAc,OAAO,MAAM,OAAO,KAAK,OAAO;GAAE,GAAG;GAAG,GAAG;GAAG,OAAO;GAAG,QAAQ;EAAE,CAAC,CAAC;EAAG,aAAa;CACpE,CAAG;CAClD,OAAO,UAAU,OAAO,MAAM,YAAY,CAAC,KAAK,KAAK,CAAC,KAAK;AAC7D;;;AAIA,SAAS,eACP,OACA,SACA,KACA,MACY;CACZ,MAAM,KAAK,kBAAkB,GAAG;CAChC,MAAM,cAAc,KAAK,iBAAiB,MAAc,MAAM,IAAI,CAAC,CAAC,EAAE;CACtE,IAAI,KAAK,UAAU,KAAK,UAAU,KAAK,WAAW,KAAK;CACvD,KAAK,MAAM,KAAK,SAAS;EACvB,MAAM,MAAM,cAAc,OAAO,GAAG,YAAY,CAAC,GAAG,IAAI;EACxD,KAAK,MAAM,KAAK,cAAc,KAAK,kBAAkB,GAAG,CAAC,GAAG;GAC1D,MAAM,IAAI,aAAa,IAAI,EAAE,GAAG,EAAE,CAAC;GACnC,IAAI,CAAC,GAAG;GACR,KAAK,KAAK,IAAI,IAAI,EAAE,CAAC;GAAG,KAAK,KAAK,IAAI,IAAI,EAAE,CAAC;GAC7C,KAAK,KAAK,IAAI,IAAI,EAAE,CAAC;GAAG,KAAK,KAAK,IAAI,IAAI,EAAE,CAAC;EAC/C;CACF;CACA,IAAI,OAAO,UAAU,OAAO;CAC5B,OAAO,kBAAkB,WAAW,GAAG,GAAG;EAAE,GAAG;EAAI,GAAG;EAAI,OAAO,KAAK;EAAI,QAAQ,KAAK;CAAG,CAAC;AAC7F;;AAGA,SAAgB,YACd,OACA,IACA,MACA,OAA2B,CAAC,GACpB;CACR,OAAO,kBAAkB,cAAc,OAAO,IAAI,MAAM,IAAI,CAAC;AAC/D;;;AAIA,SAAgB,qBACd,MACA,MACA,KACe;CACf,OAAO,cAAc,IAAI,CAAC,EAAE,cAAc,MAAM,MAAM,GAAG,KAAK;AAChE;AAEA,SAAS,cAAc,OAAyB,IAAY,MAAmD;CAC7G,MAAM,IAAI,KAAK,cAAc;CAC7B,MAAM,OAAO,MAAM,IAAI,EAAE;CACzB,OAAO,OAAO,sBAAsB,GAAG,IAAI,IAAI;AACjD;;;AAIA,SAAS,OAAO,OAAoC,KAAqC;CACvF,IAAI,UAAU,QAAW,OAAO;CAChC,IAAI,OAAO,UAAU,UAAU,OAAO,EAAE,MAAM;CAC9C,MAAM,KAAK,kBAAkB,GAAG;CAChC,MAAM,CAAC,GAAG,GAAG,GAAG,KAAK,GAAG,WAAW;EAAC;EAAG;EAAG;EAAG;CAAC,IAAI,GAAG;CACrD,OAAO;EAAE,OAAO,UAAU,KAAK;EAAG,QAAQ;GAAC,MAAM,IAAI;GAAG,MAAM,IAAI;GAAG,MAAM,IAAI;GAAG,MAAM,IAAI;EAAC;CAAE;AACjG;AAEA,SAAS,cACP,OACA,MACA,KACwB;CACxB,MAAM,YAAY,iBAAiB,OAAO,IAAI;CAC9C,OAAO,cAAc,SAAY,MAAM;EAAE,GAAG;EAAK;CAAU;AAC7D;AAEA,SAAS,WAAW,GAAmB;CACrC,OAAO;EACL,GAAG,KAAK,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK;EAC9B,GAAG,KAAK,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM;EAC/B,OAAO,KAAK,IAAI,EAAE,KAAK;EACvB,QAAQ,KAAK,IAAI,EAAE,MAAM;CAC3B;AACF"}

package/dist/canvas/inheritedPaints.js

@@ -1,13 +1,7 @@
-import { inheritedPaintOf, inheritsPaint, sceneAncestors } from "../core/scene/inheritedPaint.js";
+import { inheritedPaintIn, inheritedPaintOf, sceneAncestors } from "../core/scene/inheritedPaint.js";
 import { INHERIT } from "@weasel-js/paint";
 
 //#region src/canvas/inheritedPaints.ts
-/** What `node`'s `'inherit'` fields take from its containers in `scene`, or
-*  `undefined` for a node that inherits nothing. */
-function inheritedPaintIn(scene, node) {
-	if (!inheritsPaint(node)) return void 0;
-	return inheritedPaintOf(node, sceneAncestors((id) => scene.get(id), node));
-}
 var INHERITS_BOTH = { data: {
 	fill: INHERIT,
 	stroke: INHERIT
@@ -25,20 +19,37 @@ function sceneInheritedPaintOf(scene) {
 /**
 * Wrap a `drawOne` so a node whose fill or stroke is `'inherit'` arrives at
 * the painter with its containers' paint on `ctx.inherited`, as
-* `withDerivedPaths` does for a derived path. Every other node passes the
-* caller's `ctx` through untouched.
+* `withDerivedPaths` does for a derived path. Every other node, and one whose
+* caller already says what it inherits — a ghost whose containers are mid-edit —
+* passes the caller's `ctx` through untouched.
 */
 function withInheritedPaints(scene, drawOne) {
 	const inheritedOf = sceneInheritedPaintOf(scene);
 	return (node, pose, view, ctx) => {
-		const inherited = inheritedOf(node);
+		const inherited = ctx?.inherited ?? inheritedOf(node);
 		return inherited === void 0 ? drawOne(node, pose, view, ctx) : drawOne(node, pose, view, {
 			...ctx,
 			inherited
 		});
 	};
 }
+/**
+* {@link withInheritedPaints} for a cull's `paintBounds`: a node whose stroke
+* is `'inherit'` is measured with its containers' stroke on `ctx.inherited`,
+* unless its caller already says what it inherits. For a consumer culling its
+* own scene walk with `defaultPaintBounds`, which cannot bound such a node alone.
+*/
+function withInheritedPaintBounds(scene, paintBounds) {
+	const inheritedOf = sceneInheritedPaintOf(scene);
+	return (node, pose, view, ctx) => {
+		const inherited = ctx?.inherited ?? inheritedOf(node);
+		return paintBounds(node, pose, view, inherited === void 0 ? ctx : {
+			...ctx,
+			inherited
+		});
+	};
+}
 
 //#endregion
-export { inheritedPaintIn, paintAbove, sceneInheritedPaintOf, withInheritedPaints };
+export { inheritedPaintIn, paintAbove, sceneInheritedPaintOf, withInheritedPaintBounds, withInheritedPaints };
 //# sourceMappingURL=inheritedPaints.js.map

package/dist/canvas/inheritedPaints.js.map

@@ -1 +1 @@
-{"version":3,"file":"inheritedPaints.js","names":[],"sources":["../../src/canvas/inheritedPaints.ts"],"sourcesContent":["import { INHERIT } from '@weasel-js/paint';\nimport type { Node, NodeId } from 'core/scene/types';\nimport { inheritedPaintOf, inheritsPaint, sceneAncestors, type InheritedPaint } from 'core/scene/inheritedPaint';\nimport type { SceneViewDrawOne } from './nodeShapeTypes';\n\n/** The part of a scene the lookup reads. */\ntype ParentLookup<TNode> = { get(id: NodeId): TNode | undefined };\n\ntype PaintedNode = { data?: unknown; parent?: NodeId | null };\n\n/** What `node`'s `'inherit'` fields take from its containers in `scene`, or\n *  `undefined` for a node that inherits nothing. */\nexport function inheritedPaintIn<TNode extends PaintedNode>(\n  scene: ParentLookup<TNode>,\n  node: TNode,\n): InheritedPaint | undefined {\n  if (!inheritsPaint(node)) return undefined;\n  return inheritedPaintOf(node, sceneAncestors((id: never) => scene.get(id), node));\n}\n\nconst INHERITS_BOTH = { data: { fill: INHERIT, stroke: INHERIT } };\n\n/** What an `'inherit'` fill and stroke on `node` would take from its\n *  containers in `scene`, whatever `node` holds now — what an editor offering\n *  the choice shows it would paint. */\nexport function paintAbove<TNode extends PaintedNode>(scene: ParentLookup<TNode>, node: TNode): InheritedPaint {\n  return inheritedPaintOf(INHERITS_BOTH, sceneAncestors((id: never) => scene.get(id), node));\n}\n\n/** {@link inheritedPaintIn} bound to `scene`. */\nexport function sceneInheritedPaintOf<TNode extends PaintedNode>(\n  scene: ParentLookup<TNode>,\n): (node: TNode) => InheritedPaint | undefined {\n  return (node) => inheritedPaintIn(scene, node);\n}\n\n/**\n * Wrap a `drawOne` so a node whose fill or stroke is `'inherit'` arrives at\n * the painter with its containers' paint on `ctx.inherited`, as\n * `withDerivedPaths` does for a derived path. Every other node passes the\n * caller's `ctx` through untouched.\n */\nexport function withInheritedPaints<TData, TLayer extends string, TPose>(\n  scene: ParentLookup<Node<TData, TLayer, TPose>>,\n  drawOne: SceneViewDrawOne<TData, TLayer, TPose>,\n): SceneViewDrawOne<TData, TLayer, TPose> {\n  const inheritedOf = sceneInheritedPaintOf(scene);\n  return (node, pose, view, ctx) => {\n    const inherited = inheritedOf(node);\n    return inherited === undefined ? drawOne(node, pose, view, ctx) : drawOne(node, pose, view, { ...ctx, inherited });\n  };\n}\n"],"mappings":";;;;;;AAYA,SAAgB,iBACd,OACA,MAC4B;CAC5B,IAAI,CAAC,cAAc,IAAI,GAAG,OAAO;CACjC,OAAO,iBAAiB,MAAM,gBAAgB,OAAc,MAAM,IAAI,EAAE,GAAG,IAAI,CAAC;AAClF;AAEA,IAAM,gBAAgB,EAAE,MAAM;CAAE,MAAM;CAAS,QAAQ;AAAQ,EAAE;;;;AAKjE,SAAgB,WAAsC,OAA4B,MAA6B;CAC7G,OAAO,iBAAiB,eAAe,gBAAgB,OAAc,MAAM,IAAI,EAAE,GAAG,IAAI,CAAC;AAC3F;;AAGA,SAAgB,sBACd,OAC6C;CAC7C,QAAQ,SAAS,iBAAiB,OAAO,IAAI;AAC/C;;;;;;;AAQA,SAAgB,oBACd,OACA,SACwC;CACxC,MAAM,cAAc,sBAAsB,KAAK;CAC/C,QAAQ,MAAM,MAAM,MAAM,QAAQ;EAChC,MAAM,YAAY,YAAY,IAAI;EAClC,OAAO,cAAc,SAAY,QAAQ,MAAM,MAAM,MAAM,GAAG,IAAI,QAAQ,MAAM,MAAM,MAAM;GAAE,GAAG;GAAK;EAAU,CAAC;CACnH;AACF"}
+{"version":3,"file":"inheritedPaints.js","names":[],"sources":["../../src/canvas/inheritedPaints.ts"],"sourcesContent":["import { INHERIT } from '@weasel-js/paint';\nimport type { Node, NodeId } from 'core/scene/types';\nimport { inheritedPaintIn, inheritedPaintOf, sceneAncestors, type InheritedPaint } from 'core/scene/inheritedPaint';\nimport type { SceneViewDrawOne } from './nodeShapeTypes';\nimport type { PaintBoundsFn } from './paintCull';\n\n/** The part of a scene the lookup reads. */\ntype ParentLookup<TNode> = { get(id: NodeId): TNode | undefined };\n\ntype PaintedNode = { data?: unknown; parent?: NodeId | null };\n\nexport { inheritedPaintIn };\n\nconst INHERITS_BOTH = { data: { fill: INHERIT, stroke: INHERIT } };\n\n/** What an `'inherit'` fill and stroke on `node` would take from its\n *  containers in `scene`, whatever `node` holds now — what an editor offering\n *  the choice shows it would paint. */\nexport function paintAbove<TNode extends PaintedNode>(scene: ParentLookup<TNode>, node: TNode): InheritedPaint {\n  return inheritedPaintOf(INHERITS_BOTH, sceneAncestors((id: never) => scene.get(id), node));\n}\n\n/** {@link inheritedPaintIn} bound to `scene`. */\nexport function sceneInheritedPaintOf<TNode extends PaintedNode>(\n  scene: ParentLookup<TNode>,\n): (node: TNode) => InheritedPaint | undefined {\n  return (node) => inheritedPaintIn(scene, node);\n}\n\n/**\n * Wrap a `drawOne` so a node whose fill or stroke is `'inherit'` arrives at\n * the painter with its containers' paint on `ctx.inherited`, as\n * `withDerivedPaths` does for a derived path. Every other node, and one whose\n * caller already says what it inherits — a ghost whose containers are mid-edit —\n * passes the caller's `ctx` through untouched.\n */\nexport function withInheritedPaints<TData, TLayer extends string, TPose>(\n  scene: ParentLookup<Node<TData, TLayer, TPose>>,\n  drawOne: SceneViewDrawOne<TData, TLayer, TPose>,\n): SceneViewDrawOne<TData, TLayer, TPose> {\n  const inheritedOf = sceneInheritedPaintOf(scene);\n  return (node, pose, view, ctx) => {\n    const inherited = ctx?.inherited ?? inheritedOf(node);\n    return inherited === undefined ? drawOne(node, pose, view, ctx) : drawOne(node, pose, view, { ...ctx, inherited });\n  };\n}\n\n/**\n * {@link withInheritedPaints} for a cull's `paintBounds`: a node whose stroke\n * is `'inherit'` is measured with its containers' stroke on `ctx.inherited`,\n * unless its caller already says what it inherits. For a consumer culling its\n * own scene walk with `defaultPaintBounds`, which cannot bound such a node alone.\n */\nexport function withInheritedPaintBounds<TData, TLayer extends string, TPose>(\n  scene: ParentLookup<Node<TData, TLayer, TPose>>,\n  paintBounds: PaintBoundsFn<Node<TData, TLayer, TPose>, TPose>,\n): PaintBoundsFn<Node<TData, TLayer, TPose>, TPose> {\n  const inheritedOf = sceneInheritedPaintOf(scene);\n  return (node, pose, view, ctx) => {\n    const inherited = ctx?.inherited ?? inheritedOf(node);\n    return paintBounds(node, pose, view, inherited === undefined ? ctx : { ...ctx, inherited });\n  };\n}\n"],"mappings":";;;;AAaA,IAAM,gBAAgB,EAAE,MAAM;CAAE,MAAM;CAAS,QAAQ;AAAQ,EAAE;;;;AAKjE,SAAgB,WAAsC,OAA4B,MAA6B;CAC7G,OAAO,iBAAiB,eAAe,gBAAgB,OAAc,MAAM,IAAI,EAAE,GAAG,IAAI,CAAC;AAC3F;;AAGA,SAAgB,sBACd,OAC6C;CAC7C,QAAQ,SAAS,iBAAiB,OAAO,IAAI;AAC/C;;;;;;;;AASA,SAAgB,oBACd,OACA,SACwC;CACxC,MAAM,cAAc,sBAAsB,KAAK;CAC/C,QAAQ,MAAM,MAAM,MAAM,QAAQ;EAChC,MAAM,YAAY,KAAK,aAAa,YAAY,IAAI;EACpD,OAAO,cAAc,SAAY,QAAQ,MAAM,MAAM,MAAM,GAAG,IAAI,QAAQ,MAAM,MAAM,MAAM;GAAE,GAAG;GAAK;EAAU,CAAC;CACnH;AACF;;;;;;;AAQA,SAAgB,yBACd,OACA,aACkD;CAClD,MAAM,cAAc,sBAAsB,KAAK;CAC/C,QAAQ,MAAM,MAAM,MAAM,QAAQ;EAChC,MAAM,YAAY,KAAK,aAAa,YAAY,IAAI;EACpD,OAAO,YAAY,MAAM,MAAM,MAAM,cAAc,SAAY,MAAM;GAAE,GAAG;GAAK;EAAU,CAAC;CAC5F;AACF"}

package/dist/canvas/nodeShapes/nodePaint.js

@@ -6,12 +6,6 @@ import { markerReach, resolveStrokeWidth, widestStrokeWidth } from "@weasel-js/s
 
 //#region src/canvas/nodeShapes/nodePaint.ts
 paintDrawKindRegistry.subscribe(bumpNodeMemoGeneration);
-/** How a container's silhouette is inked: not at all, since it paints nothing. */
-var CONTAINER_INK = Object.freeze({
-	filled: false,
-	outset: 0,
-	inset: 0
-});
 /** Per-side grab reach for a resolved stroke: world units for what the
 *  renderer builds in world, screen pixels for what it builds on screen — a
 *  `{ px }` width, and each head by its own size's units. */
@@ -122,5 +116,5 @@ function pathPaintOf(data, inherited) {
 }
 
 //#endregion
-export { CONTAINER_INK, inkReach, pathPaintOf, strokeOutset, strokeOutsetPerAxis, withAnimatedVertexColors };
+export { inkReach, pathPaintOf, strokeOutset, strokeOutsetPerAxis, withAnimatedVertexColors };
 //# sourceMappingURL=nodePaint.js.map

package/dist/canvas/nodeShapes/nodePaint.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodePaint.js","names":[],"sources":["../../../src/canvas/nodeShapes/nodePaint.ts"],"sourcesContent":["import type { Stroke, Fill, Inherit } from '@weasel-js/paint';\nimport { resolveFill, resolveStroke } from '@weasel-js/paint';\nimport type { NodeInk, NodeInkCtx, NodePaintCtx } from 'canvas/NodeShape';\nimport { countPathAnchors } from '@weasel-js/geom';\nimport { markerReach } from '@weasel-js/stroke';\nimport { resolveStrokeWidth, widestStrokeWidth } from '@weasel-js/stroke';\nimport type { DrawCommand, PathDrawCommand } from '@weasel-js/renderer';\nimport { paintDrawKindRegistry } from '@weasel-js/renderer';\nimport { bumpNodeMemoGeneration } from 'core/scene/nodeMemo';\nimport type { InheritedPaint } from 'core/scene/inheritedPaint';\n\n// The painters memoize a node's paint and resolve a fill's frame inside the\n// memo, so the kind set is ambient state that memo cannot see change.\npaintDrawKindRegistry.subscribe(bumpNodeMemoGeneration);\n\n/** How a container's silhouette is inked: not at all, since it paints nothing. */\nexport const CONTAINER_INK: Readonly<NodeInk> = Object.freeze({ filled: false, outset: 0, inset: 0 });\n\n/** Per-side grab reach for a resolved stroke: world units for what the\n *  renderer builds in world, screen pixels for what it builds on screen — a\n *  `{ px }` width, and each head by its own size's units. */\nexport function inkReach(\n  stroke: Stroke | null,\n  scale: number | undefined,\n): Pick<NodeInk, 'outset' | 'inset' | 'outsetPx' | 'insetPx'> {\n  if (stroke === null) return { outset: 0, inset: 0 };\n  // A marker paints past the path's own end, and the kit's rule is that\n  // visible chrome is hittable — so the reach has to cover it.\n  const heads = markerReach(stroke);\n  const sides = (width: number, headReach: number) => {\n    switch (stroke.align ?? 'center') {\n      case 'inner': return { outset: headReach, inset: width };\n      case 'outer': return { outset: width + headReach, inset: 0 };\n      default: return { outset: width / 2 + headReach, inset: width / 2 };\n    }\n  };\n  const width = stroke.width ?? 1;\n  // Per-vertex widths are world units even on a `{ px }` stroke.\n  const worldWidth = widestStrokeWidth(typeof width === 'object' ? 0 : resolveStrokeWidth(width, scale ?? 1), stroke.vertexWidths);\n  const world = sides(worldWidth, heads.world);\n  if (typeof width !== 'object' && !(heads.px > 0)) return world;\n  const px = sides(typeof width === 'object' ? width.px : 0, heads.px);\n  return { outset: world.outset, inset: world.inset, outsetPx: px.outset, insetPx: px.inset };\n}\n\n/** How far `stroke` reaches outside its outline on every side, world units at\n *  `scale`: {@link inkReach}'s outset with its screen part resolved. */\nexport function strokeOutset(stroke: Stroke | null, scale: number): number {\n  const r = inkReach(stroke, scale);\n  return r.outset + (r.outsetPx ?? 0) / (scale > 0 ? scale : 1);\n}\n\n/** {@link strokeOutset} per axis of the frame `ctx.screen` maps from: `x` past\n *  the left and right sides, `y` past the top and bottom. A `{ px }` reach\n *  is a disk on screen, and its extent along each axis of that frame is the\n *  support of the disk pulled back through the map. */\nexport function strokeOutsetPerAxis(stroke: Stroke | null, ctx: NodeInkCtx | undefined): { x: number; y: number } {\n  const scale = ctx?.scale ?? 1;\n  const screen = ctx?.screen;\n  if (!screen) {\n    const r = strokeOutset(stroke, scale);\n    return { x: r, y: r };\n  }\n  const r = inkReach(stroke, scale);\n  const px = r.outsetPx ?? 0;\n  if (px === 0) return { x: r.outset, y: r.outset };\n  const [a, b, c, d] = screen;\n  const det = Math.abs(a * d - b * c);\n  if (!(det > 0)) return { x: r.outset, y: r.outset };\n  return { x: r.outset + (px * Math.hypot(c, d)) / det, y: r.outset + (px * Math.hypot(a, b)) / det };\n}\n\n/** Apply {@link NodePaintCtx.vertexColors} to a path painter's body — its first\n *  command. Applied outside the paint memo, whose key\n *  cannot see an override: `cmds` comes back as-is when nothing changes, and\n *  otherwise as a copy, since a memoized list is not ours to edit. Colors whose\n *  length does not match the path's anchors are dropped. */\nexport function withAnimatedVertexColors(cmds: DrawCommand[], ctx: NodePaintCtx | undefined): DrawCommand[] {\n  const resolve = ctx?.vertexColors;\n  const body = cmds[0];\n  if (resolve === undefined || body?.kind !== 'path') return cmds;\n  const expected = 4 * countPathAnchors(body.path);\n  const fill = body.fill ? resolve('fill', body.vertexColors) : undefined;\n  const stroke = body.stroke ? resolve('stroke', body.stroke.vertexColors) : undefined;\n  const fillChanged = fill?.length === expected && fill !== body.vertexColors;\n  const strokeChanged = stroke?.length === expected && stroke !== body.stroke?.vertexColors;\n  if (!fillChanged && !strokeChanged) return cmds;\n  const next: PathDrawCommand = {\n    ...body,\n    ...(fillChanged ? { vertexColors: fill as number[] } : {}),\n    ...(strokeChanged ? { stroke: { ...body.stroke!, vertexColors: stroke as number[] } } : {}),\n  };\n  return [next, ...cmds.slice(1)];\n}\n\n/** The paint a path node wears, resolved: what an action that turns ink into\n *  geometry reads from a node and tells a consumer to put on a result. */\nexport interface PathPaint {\n  /** `null` is no fill. */\n  fill: Fill | null;\n  /** Absent for no stroke. */\n  stroke?: Stroke;\n}\n\n/** {@link PathPaint} of a node that keeps its paint in `data.fill` and\n *  `data.stroke`, as the built-in path painter draws it: a stroke or a fill\n *  with no `paint` is none, and an `'inherit'` one is `inherited`'s. */\nexport function pathPaintOf(\n  data: { fill?: Fill | Inherit | null; stroke?: Stroke | Inherit | null },\n  inherited?: InheritedPaint,\n): PathPaint {\n  const stroke = resolveStroke(data.stroke, inherited?.stroke);\n  const fill = resolveFill(data.fill, inherited?.fill);\n  return stroke !== null ? { fill, stroke } : { fill };\n}\n"],"mappings":"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"}
+{"version":3,"file":"nodePaint.js","names":[],"sources":["../../../src/canvas/nodeShapes/nodePaint.ts"],"sourcesContent":["import type { Stroke, Fill, Inherit } from '@weasel-js/paint';\nimport { resolveFill, resolveStroke } from '@weasel-js/paint';\nimport type { NodeInk, NodeInkCtx, NodePaintCtx } from 'canvas/NodeShape';\nimport { countPathAnchors } from '@weasel-js/geom';\nimport { markerReach } from '@weasel-js/stroke';\nimport { resolveStrokeWidth, widestStrokeWidth } from '@weasel-js/stroke';\nimport type { DrawCommand, PathDrawCommand } from '@weasel-js/renderer';\nimport { paintDrawKindRegistry } from '@weasel-js/renderer';\nimport { bumpNodeMemoGeneration } from 'core/scene/nodeMemo';\nimport type { InheritedPaint } from 'core/scene/inheritedPaint';\n\n// The painters memoize a node's paint and resolve a fill's frame inside the\n// memo, so the kind set is ambient state that memo cannot see change.\npaintDrawKindRegistry.subscribe(bumpNodeMemoGeneration);\n\n/** Per-side grab reach for a resolved stroke: world units for what the\n *  renderer builds in world, screen pixels for what it builds on screen — a\n *  `{ px }` width, and each head by its own size's units. */\nexport function inkReach(\n  stroke: Stroke | null,\n  scale: number | undefined,\n): Pick<NodeInk, 'outset' | 'inset' | 'outsetPx' | 'insetPx'> {\n  if (stroke === null) return { outset: 0, inset: 0 };\n  // A marker paints past the path's own end, and the kit's rule is that\n  // visible chrome is hittable — so the reach has to cover it.\n  const heads = markerReach(stroke);\n  const sides = (width: number, headReach: number) => {\n    switch (stroke.align ?? 'center') {\n      case 'inner': return { outset: headReach, inset: width };\n      case 'outer': return { outset: width + headReach, inset: 0 };\n      default: return { outset: width / 2 + headReach, inset: width / 2 };\n    }\n  };\n  const width = stroke.width ?? 1;\n  // Per-vertex widths are world units even on a `{ px }` stroke.\n  const worldWidth = widestStrokeWidth(typeof width === 'object' ? 0 : resolveStrokeWidth(width, scale ?? 1), stroke.vertexWidths);\n  const world = sides(worldWidth, heads.world);\n  if (typeof width !== 'object' && !(heads.px > 0)) return world;\n  const px = sides(typeof width === 'object' ? width.px : 0, heads.px);\n  return { outset: world.outset, inset: world.inset, outsetPx: px.outset, insetPx: px.inset };\n}\n\n/** How far `stroke` reaches outside its outline on every side, world units at\n *  `scale`: {@link inkReach}'s outset with its screen part resolved. */\nexport function strokeOutset(stroke: Stroke | null, scale: number): number {\n  const r = inkReach(stroke, scale);\n  return r.outset + (r.outsetPx ?? 0) / (scale > 0 ? scale : 1);\n}\n\n/** {@link strokeOutset} per axis of the frame `ctx.screen` maps from: `x` past\n *  the left and right sides, `y` past the top and bottom. A `{ px }` reach\n *  is a disk on screen, and its extent along each axis of that frame is the\n *  support of the disk pulled back through the map. */\nexport function strokeOutsetPerAxis(stroke: Stroke | null, ctx: NodeInkCtx | undefined): { x: number; y: number } {\n  const scale = ctx?.scale ?? 1;\n  const screen = ctx?.screen;\n  if (!screen) {\n    const r = strokeOutset(stroke, scale);\n    return { x: r, y: r };\n  }\n  const r = inkReach(stroke, scale);\n  const px = r.outsetPx ?? 0;\n  if (px === 0) return { x: r.outset, y: r.outset };\n  const [a, b, c, d] = screen;\n  const det = Math.abs(a * d - b * c);\n  if (!(det > 0)) return { x: r.outset, y: r.outset };\n  return { x: r.outset + (px * Math.hypot(c, d)) / det, y: r.outset + (px * Math.hypot(a, b)) / det };\n}\n\n/** Apply {@link NodePaintCtx.vertexColors} to a path painter's body — its first\n *  command. Applied outside the paint memo, whose key\n *  cannot see an override: `cmds` comes back as-is when nothing changes, and\n *  otherwise as a copy, since a memoized list is not ours to edit. Colors whose\n *  length does not match the path's anchors are dropped. */\nexport function withAnimatedVertexColors(cmds: DrawCommand[], ctx: NodePaintCtx | undefined): DrawCommand[] {\n  const resolve = ctx?.vertexColors;\n  const body = cmds[0];\n  if (resolve === undefined || body?.kind !== 'path') return cmds;\n  const expected = 4 * countPathAnchors(body.path);\n  const fill = body.fill ? resolve('fill', body.vertexColors) : undefined;\n  const stroke = body.stroke ? resolve('stroke', body.stroke.vertexColors) : undefined;\n  const fillChanged = fill?.length === expected && fill !== body.vertexColors;\n  const strokeChanged = stroke?.length === expected && stroke !== body.stroke?.vertexColors;\n  if (!fillChanged && !strokeChanged) return cmds;\n  const next: PathDrawCommand = {\n    ...body,\n    ...(fillChanged ? { vertexColors: fill as number[] } : {}),\n    ...(strokeChanged ? { stroke: { ...body.stroke!, vertexColors: stroke as number[] } } : {}),\n  };\n  return [next, ...cmds.slice(1)];\n}\n\n/** The paint a path node wears, resolved: what an action that turns ink into\n *  geometry reads from a node and tells a consumer to put on a result. */\nexport interface PathPaint {\n  /** `null` is no fill. */\n  fill: Fill | null;\n  /** Absent for no stroke. */\n  stroke?: Stroke;\n}\n\n/** {@link PathPaint} of a node that keeps its paint in `data.fill` and\n *  `data.stroke`, as the built-in path painter draws it: a stroke or a fill\n *  with no `paint` is none, and an `'inherit'` one is `inherited`'s. */\nexport function pathPaintOf(\n  data: { fill?: Fill | Inherit | null; stroke?: Stroke | Inherit | null },\n  inherited?: InheritedPaint,\n): PathPaint {\n  const stroke = resolveStroke(data.stroke, inherited?.stroke);\n  const fill = resolveFill(data.fill, inherited?.fill);\n  return stroke !== null ? { fill, stroke } : { fill };\n}\n"],"mappings":"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"}

package/dist/canvas/nodeShapes/pathPainter.js

@@ -1,6 +1,6 @@
 import { nodeMemo } from "../../core/scene/nodeMemo.js";
 import { PAINT_SLOT } from "./memo.js";
-import { CONTAINER_INK, inkReach, pathPaintOf, withAnimatedVertexColors } from "./nodePaint.js";
+import { inkReach, pathPaintOf, withAnimatedVertexColors } from "./nodePaint.js";
 import { strokedPoseBox } from "./strokedBounds.js";
 import { DERIVED_PAINTER, derivedDrawnBounds } from "./derivedPainter.js";
 import { paintsPose, poseBoxBounds } from "./poseBox.js";
@@ -15,7 +15,7 @@ var PATH_PAINTER = {
 		if (!paintsPose(node.pose)) return false;
 		return node.data?.path != null;
 	},
-	paint: (node, pose, ctx) => node.kind === "container" ? [] : ctx?.derivedPath != null ? DERIVED_PAINTER.paint(node, pose, ctx) : withAnimatedVertexColors(nodeMemo(node, PAINT_SLOT, pose, () => {
+	paint: (node, pose, ctx) => ctx?.derivedPath != null ? DERIVED_PAINTER.paint(node, pose, ctx) : withAnimatedVertexColors(nodeMemo(node, PAINT_SLOT, pose, () => {
 		const d = node.data;
 		const projected = pathInPoseFrame(d.path, pose);
 		const { fill: declared, stroke: strokeSpec } = pathPaintOf(d, ctx?.inherited);
@@ -35,7 +35,6 @@ var PATH_PAINTER = {
 		return pathInPoseFrame(d.path, pose);
 	},
 	ink: (node, _pose, ctx) => {
-		if (node.kind === "container") return CONTAINER_INK;
 		const { fill, stroke } = pathPaintOf(node.data, ctx?.inherited);
 		return {
 			filled: fill !== null,

package/dist/canvas/nodeShapes/pathPainter.js.map

@@ -1 +1 @@
-{"version":3,"file":"pathPainter.js","names":[],"sources":["../../../src/canvas/nodeShapes/pathPainter.ts"],"sourcesContent":["import type {\n  Path\n} from '@weasel-js/geom';\nimport type { Stroke, Fill, Inherit } from '@weasel-js/paint';\nimport type { NodeShapeEntry } from 'canvas/NodeShape';\nimport { nodeMemo } from 'core/scene/nodeMemo';\nimport type { RectPose } from 'core/scene/types';\nimport { pathInPoseFrame } from '@weasel-js/geom';\nimport { commandFill, commandStroke } from '@weasel-js/renderer';\nimport type { DrawCommand } from '@weasel-js/renderer';\nimport { DERIVED_PAINTER, derivedDrawnBounds } from './derivedPainter';\nimport { PAINT_SLOT } from './memo';\nimport { CONTAINER_INK, inkReach, pathPaintOf, withAnimatedVertexColors } from './nodePaint';\nimport { resolveStroke } from '@weasel-js/paint';\nimport { paintsPose, poseBoxBounds } from './poseBox';\nimport { strokedPoseBox } from './strokedBounds';\n\ntype PathData = { fill?: Fill | Inherit | null; stroke?: Stroke | Inherit | null; vertexColors?: number[] };\n\n// ─── Built-in painters ─────────────────────────────────────────────────\nexport const PATH_PAINTER: NodeShapeEntry<unknown, RectPose> = {\n  id: 'kit:path',\n  matches: (node) => {\n    if (!paintsPose(node.pose)) return false;\n    const d = node.data as { path?: Path } | null;\n    return d?.path != null;\n  },\n  // Memoized: a pure function of `(data, pose)`, and `pathInPoseFrame`\n  // allocates on every call but the identity (`kind: 'rect'`) branch. See\n  // PAINT_SLOT.\n  // As `kit:shape`, a container paints nothing of its own.\n  paint: (node, pose, ctx) => node.kind === 'container' ? [] : ctx?.derivedPath != null\n    // A pose override's path stands in for `data.path`, already where it is drawn.\n    ? DERIVED_PAINTER.paint(node, pose, ctx)\n    : withAnimatedVertexColors(nodeMemo(node, PAINT_SLOT, pose, () => {\n    const d = node.data as PathData & { path: Path };\n    const projected = pathInPoseFrame(d.path, pose);\n    const { fill: declared, stroke: strokeSpec } = pathPaintOf(d, ctx?.inherited);\n    // The pose is baked into `projected` rather than emitted as a transform,\n    // so a box-relative gradient has to be baked onto the same box here or\n    // it would arrive in the renderer referring to a frame that never exists.\n    const fill = declared && commandFill(declared, pose);\n    const stroke = strokeSpec && commandStroke(strokeSpec, pose);\n    const cmd: DrawCommand = {\n      kind: 'path',\n      path: projected,\n      ...(fill ? { fill } : {}),\n      ...(fill && d.vertexColors ? { vertexColors: d.vertexColors } : {}),\n      ...(stroke ? { stroke } : {}),\n    };\n    return [cmd];\n  }, ctx?.inherited), ctx),\n  silhouette: (node, pose, ctx) => {\n    if (ctx?.derivedPath != null) return ctx.derivedPath;\n    const d = node.data as { path: Path };\n    return pathInPoseFrame(d.path, pose);\n  },\n  ink: (node, _pose, ctx) => {\n    if (node.kind === 'container') return CONTAINER_INK;\n    const { fill, stroke } = pathPaintOf(node.data as PathData, ctx?.inherited);\n    return { filled: fill !== null, ...inkReach(stroke ?? null, ctx?.scale) };\n  },\n  // `pathInPoseFrame` fits the path's own bounds to the pose box.\n  bounds: (node, pose, ctx) =>\n    poseBoxBounds(pose, resolveStroke((node.data as PathData).stroke, ctx?.inherited?.stroke), ctx),\n  drawnBounds: (node, pose, ctx) => {\n    if (ctx?.derivedPath != null) return derivedDrawnBounds(node, ctx);\n    const d = node.data as PathData & { path: Path };\n    return strokedPoseBox(node, pose, resolveStroke(d.stroke, ctx?.inherited?.stroke), ctx, (at) => pathInPoseFrame(d.path, at));\n  },\n};\n"],"mappings":";;;;;;;;;;;AAoBA,IAAa,eAAkD;CAC7D,IAAI;CACJ,UAAU,SAAS;EACjB,IAAI,CAAC,WAAW,KAAK,IAAI,GAAG,OAAO;EAEnC,OADU,KAAK,MACL,QAAQ;CACpB;CAKA,QAAQ,MAAM,MAAM,QAAQ,KAAK,SAAS,cAAc,CAAC,IAAI,KAAK,eAAe,OAE7E,gBAAgB,MAAM,MAAM,MAAM,GAAG,IACrC,yBAAyB,SAAS,MAAM,YAAY,YAAY;EAClE,MAAM,IAAI,KAAK;EACf,MAAM,YAAY,gBAAgB,EAAE,MAAM,IAAI;EAC9C,MAAM,EAAE,MAAM,UAAU,QAAQ,eAAe,YAAY,GAAG,KAAK,SAAS;EAI5E,MAAM,OAAO,YAAY,YAAY,UAAU,IAAI;EACnD,MAAM,SAAS,cAAc,cAAc,YAAY,IAAI;EAQ3D,OAAO,CAAC;GANN,MAAM;GACN,MAAM;GACN,GAAI,OAAO,EAAE,KAAK,IAAI,CAAC;GACvB,GAAI,QAAQ,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,IAAI,CAAC;GACjE,GAAI,SAAS,EAAE,OAAO,IAAI,CAAC;EAErB,CAAG;CACb,GAAG,KAAK,SAAS,GAAG,GAAG;CACvB,aAAa,MAAM,MAAM,QAAQ;EAC/B,IAAI,KAAK,eAAe,MAAM,OAAO,IAAI;EACzC,MAAM,IAAI,KAAK;EACf,OAAO,gBAAgB,EAAE,MAAM,IAAI;CACrC;CACA,MAAM,MAAM,OAAO,QAAQ;EACzB,IAAI,KAAK,SAAS,aAAa,OAAO;EACtC,MAAM,EAAE,MAAM,WAAW,YAAY,KAAK,MAAkB,KAAK,SAAS;EAC1E,OAAO;GAAE,QAAQ,SAAS;GAAM,GAAG,SAAS,UAAU,MAAM,KAAK,KAAK;EAAE;CAC1E;CAEA,SAAS,MAAM,MAAM,QACnB,cAAc,MAAM,cAAe,KAAK,KAAkB,QAAQ,KAAK,WAAW,MAAM,GAAG,GAAG;CAChG,cAAc,MAAM,MAAM,QAAQ;EAChC,IAAI,KAAK,eAAe,MAAM,OAAO,mBAAmB,MAAM,GAAG;EACjE,MAAM,IAAI,KAAK;EACf,OAAO,eAAe,MAAM,MAAM,cAAc,EAAE,QAAQ,KAAK,WAAW,MAAM,GAAG,MAAM,OAAO,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC7H;AACF"}
+{"version":3,"file":"pathPainter.js","names":[],"sources":["../../../src/canvas/nodeShapes/pathPainter.ts"],"sourcesContent":["import type {\n  Path\n} from '@weasel-js/geom';\nimport type { Stroke, Fill, Inherit } from '@weasel-js/paint';\nimport type { NodeShapeEntry } from 'canvas/NodeShape';\nimport { nodeMemo } from 'core/scene/nodeMemo';\nimport type { RectPose } from 'core/scene/types';\nimport { pathInPoseFrame } from '@weasel-js/geom';\nimport { commandFill, commandStroke } from '@weasel-js/renderer';\nimport type { DrawCommand } from '@weasel-js/renderer';\nimport { DERIVED_PAINTER, derivedDrawnBounds } from './derivedPainter';\nimport { PAINT_SLOT } from './memo';\nimport { inkReach, pathPaintOf, withAnimatedVertexColors } from './nodePaint';\nimport { resolveStroke } from '@weasel-js/paint';\nimport { paintsPose, poseBoxBounds } from './poseBox';\nimport { strokedPoseBox } from './strokedBounds';\n\ntype PathData = { fill?: Fill | Inherit | null; stroke?: Stroke | Inherit | null; vertexColors?: number[] };\n\n// ─── Built-in painters ─────────────────────────────────────────────────\nexport const PATH_PAINTER: NodeShapeEntry<unknown, RectPose> = {\n  id: 'kit:path',\n  matches: (node) => {\n    if (!paintsPose(node.pose)) return false;\n    const d = node.data as { path?: Path } | null;\n    return d?.path != null;\n  },\n  // Memoized: a pure function of `(data, pose)`, and `pathInPoseFrame`\n  // allocates on every call but the identity (`kind: 'rect'`) branch. See\n  // PAINT_SLOT.\n  paint: (node, pose, ctx) => ctx?.derivedPath != null\n    // A pose override's path stands in for `data.path`, already where it is drawn.\n    ? DERIVED_PAINTER.paint(node, pose, ctx)\n    : withAnimatedVertexColors(nodeMemo(node, PAINT_SLOT, pose, () => {\n    const d = node.data as PathData & { path: Path };\n    const projected = pathInPoseFrame(d.path, pose);\n    const { fill: declared, stroke: strokeSpec } = pathPaintOf(d, ctx?.inherited);\n    // The pose is baked into `projected` rather than emitted as a transform,\n    // so a box-relative gradient has to be baked onto the same box here or\n    // it would arrive in the renderer referring to a frame that never exists.\n    const fill = declared && commandFill(declared, pose);\n    const stroke = strokeSpec && commandStroke(strokeSpec, pose);\n    const cmd: DrawCommand = {\n      kind: 'path',\n      path: projected,\n      ...(fill ? { fill } : {}),\n      ...(fill && d.vertexColors ? { vertexColors: d.vertexColors } : {}),\n      ...(stroke ? { stroke } : {}),\n    };\n    return [cmd];\n  }, ctx?.inherited), ctx),\n  silhouette: (node, pose, ctx) => {\n    if (ctx?.derivedPath != null) return ctx.derivedPath;\n    const d = node.data as { path: Path };\n    return pathInPoseFrame(d.path, pose);\n  },\n  ink: (node, _pose, ctx) => {\n    const { fill, stroke } = pathPaintOf(node.data as PathData, ctx?.inherited);\n    return { filled: fill !== null, ...inkReach(stroke ?? null, ctx?.scale) };\n  },\n  // `pathInPoseFrame` fits the path's own bounds to the pose box.\n  bounds: (node, pose, ctx) =>\n    poseBoxBounds(pose, resolveStroke((node.data as PathData).stroke, ctx?.inherited?.stroke), ctx),\n  drawnBounds: (node, pose, ctx) => {\n    if (ctx?.derivedPath != null) return derivedDrawnBounds(node, ctx);\n    const d = node.data as PathData & { path: Path };\n    return strokedPoseBox(node, pose, resolveStroke(d.stroke, ctx?.inherited?.stroke), ctx, (at) => pathInPoseFrame(d.path, at));\n  },\n};\n"],"mappings":";;;;;;;;;;;AAoBA,IAAa,eAAkD;CAC7D,IAAI;CACJ,UAAU,SAAS;EACjB,IAAI,CAAC,WAAW,KAAK,IAAI,GAAG,OAAO;EAEnC,OADU,KAAK,MACL,QAAQ;CACpB;CAIA,QAAQ,MAAM,MAAM,QAAQ,KAAK,eAAe,OAE5C,gBAAgB,MAAM,MAAM,MAAM,GAAG,IACrC,yBAAyB,SAAS,MAAM,YAAY,YAAY;EAClE,MAAM,IAAI,KAAK;EACf,MAAM,YAAY,gBAAgB,EAAE,MAAM,IAAI;EAC9C,MAAM,EAAE,MAAM,UAAU,QAAQ,eAAe,YAAY,GAAG,KAAK,SAAS;EAI5E,MAAM,OAAO,YAAY,YAAY,UAAU,IAAI;EACnD,MAAM,SAAS,cAAc,cAAc,YAAY,IAAI;EAQ3D,OAAO,CAAC;GANN,MAAM;GACN,MAAM;GACN,GAAI,OAAO,EAAE,KAAK,IAAI,CAAC;GACvB,GAAI,QAAQ,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,IAAI,CAAC;GACjE,GAAI,SAAS,EAAE,OAAO,IAAI,CAAC;EAErB,CAAG;CACb,GAAG,KAAK,SAAS,GAAG,GAAG;CACvB,aAAa,MAAM,MAAM,QAAQ;EAC/B,IAAI,KAAK,eAAe,MAAM,OAAO,IAAI;EACzC,MAAM,IAAI,KAAK;EACf,OAAO,gBAAgB,EAAE,MAAM,IAAI;CACrC;CACA,MAAM,MAAM,OAAO,QAAQ;EACzB,MAAM,EAAE,MAAM,WAAW,YAAY,KAAK,MAAkB,KAAK,SAAS;EAC1E,OAAO;GAAE,QAAQ,SAAS;GAAM,GAAG,SAAS,UAAU,MAAM,KAAK,KAAK;EAAE;CAC1E;CAEA,SAAS,MAAM,MAAM,QACnB,cAAc,MAAM,cAAe,KAAK,KAAkB,QAAQ,KAAK,WAAW,MAAM,GAAG,GAAG;CAChG,cAAc,MAAM,MAAM,QAAQ;EAChC,IAAI,KAAK,eAAe,MAAM,OAAO,mBAAmB,MAAM,GAAG;EACjE,MAAM,IAAI,KAAK;EACf,OAAO,eAAe,MAAM,MAAM,cAAc,EAAE,QAAQ,KAAK,WAAW,MAAM,GAAG,MAAM,OAAO,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC7H;AACF"}

package/dist/canvas/nodeShapes/rectFallbackPainter.js

@@ -5,7 +5,7 @@ import { resolveFill } from "@weasel-js/paint";
 //#region src/canvas/nodeShapes/rectFallbackPainter.ts
 var RECT_FALLBACK_PAINTER = {
 	id: "kit:rect-fallback",
-	matches: (node) => node.kind !== "container" && paintsPose(node.pose),
+	matches: (node) => node.kind !== "group" && paintsPose(node.pose),
 	paint: (node, pose, ctx) => {
 		const d = node.data;
 		const p = pose;

package/dist/canvas/nodeShapes/rectFallbackPainter.js.map

@@ -1 +1 @@
-{"version":3,"file":"rectFallbackPainter.js","names":[],"sources":["../../../src/canvas/nodeShapes/rectFallbackPainter.ts"],"sourcesContent":["import type { Fill, Inherit } from '@weasel-js/paint';\nimport type { NodeShapeEntry } from 'canvas/NodeShape';\nimport type { RectPose } from 'core/scene/types';\nimport { commandFill } from '@weasel-js/renderer';\nimport { resolveFill } from '@weasel-js/paint';\nimport { paintsPose, poseBoxBounds } from './poseBox';\n\n// ─── Built-in painters ─────────────────────────────────────────────────\nexport const RECT_FALLBACK_PAINTER: NodeShapeEntry<unknown, RectPose> = {\n  // Last-resort painter — matches any rect-posed leaf, so it must be\n  // registered last within `'normal'`. A container is a group, not a box: matching\n  // one would also hand it a silhouette, which clips its members. Consumers who want a different\n  // fallback should register their own painter at `'high'` priority and let\n  // this one never fire (or unregister it explicitly).\n  id: 'kit:rect-fallback',\n  matches: (node) => node.kind !== 'container' && paintsPose(node.pose),\n  paint: (node, pose, ctx) => {\n    const d = node.data as { fill?: Fill | Inherit | null } | null;\n    const p = pose;\n    const declared = resolveFill(d?.fill, ctx?.inherited?.fill);\n    const fill = declared && commandFill(declared, p);\n    return [{\n      kind: 'path',\n      path: { kind: 'rect', x: p.x, y: p.y, width: p.width, height: p.height },\n      ...(fill ? { fill } : {}),\n    }];\n  },\n  silhouette: (_node, pose) => {\n    const p = pose;\n    return { kind: 'rect', x: p.x, y: p.y, width: p.width, height: p.height };\n  },\n  bounds: (_node, pose) => poseBoxBounds(pose, null, undefined),\n};\n"],"mappings":";;;;;AAQA,IAAa,wBAA2D;CAMtE,IAAI;CACJ,UAAU,SAAS,KAAK,SAAS,eAAe,WAAW,KAAK,IAAI;CACpE,QAAQ,MAAM,MAAM,QAAQ;EAC1B,MAAM,IAAI,KAAK;EACf,MAAM,IAAI;EACV,MAAM,WAAW,YAAY,GAAG,MAAM,KAAK,WAAW,IAAI;EAC1D,MAAM,OAAO,YAAY,YAAY,UAAU,CAAC;EAChD,OAAO,CAAC;GACN,MAAM;GACN,MAAM;IAAE,MAAM;IAAQ,GAAG,EAAE;IAAG,GAAG,EAAE;IAAG,OAAO,EAAE;IAAO,QAAQ,EAAE;GAAO;GACvE,GAAI,OAAO,EAAE,KAAK,IAAI,CAAC;EACzB,CAAC;CACH;CACA,aAAa,OAAO,SAAS;EAC3B,MAAM,IAAI;EACV,OAAO;GAAE,MAAM;GAAQ,GAAG,EAAE;GAAG,GAAG,EAAE;GAAG,OAAO,EAAE;GAAO,QAAQ,EAAE;EAAO;CAC1E;CACA,SAAS,OAAO,SAAS,cAAc,MAAM,MAAM,MAAS;AAC9D"}
+{"version":3,"file":"rectFallbackPainter.js","names":[],"sources":["../../../src/canvas/nodeShapes/rectFallbackPainter.ts"],"sourcesContent":["import type { Fill, Inherit } from '@weasel-js/paint';\nimport type { NodeShapeEntry } from 'canvas/NodeShape';\nimport type { RectPose } from 'core/scene/types';\nimport { commandFill } from '@weasel-js/renderer';\nimport { resolveFill } from '@weasel-js/paint';\nimport { paintsPose, poseBoxBounds } from './poseBox';\n\n// ─── Built-in painters ─────────────────────────────────────────────────\nexport const RECT_FALLBACK_PAINTER: NodeShapeEntry<unknown, RectPose> = {\n  // Last-resort painter — matches any rect-posed mark, so it must be\n  // registered last within `'normal'`.\n  // Consumers who want a different\n  // fallback should register their own painter at `'high'` priority and let\n  // this one never fire (or unregister it explicitly).\n  id: 'kit:rect-fallback',\n  matches: (node) => node.kind !== 'group' && paintsPose(node.pose),\n  paint: (node, pose, ctx) => {\n    const d = node.data as { fill?: Fill | Inherit | null } | null;\n    const p = pose;\n    const declared = resolveFill(d?.fill, ctx?.inherited?.fill);\n    const fill = declared && commandFill(declared, p);\n    return [{\n      kind: 'path',\n      path: { kind: 'rect', x: p.x, y: p.y, width: p.width, height: p.height },\n      ...(fill ? { fill } : {}),\n    }];\n  },\n  silhouette: (_node, pose) => {\n    const p = pose;\n    return { kind: 'rect', x: p.x, y: p.y, width: p.width, height: p.height };\n  },\n  bounds: (_node, pose) => poseBoxBounds(pose, null, undefined),\n};\n"],"mappings":";;;;;AAQA,IAAa,wBAA2D;CAMtE,IAAI;CACJ,UAAU,SAAS,KAAK,SAAS,WAAW,WAAW,KAAK,IAAI;CAChE,QAAQ,MAAM,MAAM,QAAQ;EAC1B,MAAM,IAAI,KAAK;EACf,MAAM,IAAI;EACV,MAAM,WAAW,YAAY,GAAG,MAAM,KAAK,WAAW,IAAI;EAC1D,MAAM,OAAO,YAAY,YAAY,UAAU,CAAC;EAChD,OAAO,CAAC;GACN,MAAM;GACN,MAAM;IAAE,MAAM;IAAQ,GAAG,EAAE;IAAG,GAAG,EAAE;IAAG,OAAO,EAAE;IAAO,QAAQ,EAAE;GAAO;GACvE,GAAI,OAAO,EAAE,KAAK,IAAI,CAAC;EACzB,CAAC;CACH;CACA,aAAa,OAAO,SAAS;EAC3B,MAAM,IAAI;EACV,OAAO;GAAE,MAAM;GAAQ,GAAG,EAAE;GAAG,GAAG,EAAE;GAAG,OAAO,EAAE;GAAO,QAAQ,EAAE;EAAO;CAC1E;CACA,SAAS,OAAO,SAAS,cAAc,MAAM,MAAM,MAAS;AAC9D"}

package/dist/canvas/nodeShapes/shapePainter.js

@@ -1,6 +1,6 @@
 import { nodeMemo } from "../../core/scene/nodeMemo.js";
 import { PAINT_SLOT } from "./memo.js";
-import { CONTAINER_INK, inkReach, withAnimatedVertexColors } from "./nodePaint.js";
+import { inkReach, withAnimatedVertexColors } from "./nodePaint.js";
 import { outsetPoseBox, strokedPoseBox } from "./strokedBounds.js";
 import { paintsPose, poseBoxBounds } from "./poseBox.js";
 import { commandFill, commandStroke } from "@weasel-js/renderer";
@@ -19,7 +19,7 @@ var SHAPE_PAINTER = {
 		const s = node.data?.shape;
 		return s != null && SHAPE_KINDS.has(s);
 	},
-	paint: (node, pose, ctx) => node.kind === "container" ? [] : withAnimatedVertexColors(nodeMemo(node, PAINT_SLOT, pose, () => {
+	paint: (node, pose, ctx) => withAnimatedVertexColors(nodeMemo(node, PAINT_SLOT, pose, () => {
 		const d = node.data;
 		const path = pathForShape(d, pose);
 		const declaredFill = resolveFill(d.fill, ctx?.inherited?.fill);
@@ -38,7 +38,6 @@ var SHAPE_PAINTER = {
 		return pathForShape(d, pose);
 	},
 	ink: (node, _pose, ctx) => {
-		if (node.kind === "container") return CONTAINER_INK;
 		const d = node.data;
 		return {
 			filled: resolveFill(d.fill, ctx?.inherited?.fill) !== null,

package/dist/canvas/nodeShapes/shapePainter.js.map

@@ -1 +1 @@
-{"version":3,"file":"shapePainter.js","names":[],"sources":["../../../src/canvas/nodeShapes/shapePainter.ts"],"sourcesContent":["import {\n  ellipsePath,\n  regularPolygonPath,\n  starPath,\n  type Path\n} from '@weasel-js/geom';\nimport type { Stroke, Fill, Inherit } from '@weasel-js/paint';\nimport type { NodeShapeEntry } from 'canvas/NodeShape';\nimport { nodeMemo } from 'core/scene/nodeMemo';\nimport type { RectPose } from 'core/scene/types';\nimport { commandFill, commandStroke } from '@weasel-js/renderer';\nimport { PAINT_SLOT } from './memo';\nimport { CONTAINER_INK, inkReach, withAnimatedVertexColors } from './nodePaint';\nimport { resolveFill, resolveStroke } from '@weasel-js/paint';\nimport { paintsPose, poseBoxBounds } from './poseBox';\nimport { outsetPoseBox, strokedPoseBox } from './strokedBounds';\n\ntype ShapeData = {\n  shape: string;\n  fill?: Fill | Inherit | null;\n  stroke?: Stroke | Inherit | null;\n  sides?: number;\n  points?: number;\n};\n\n// ─── Built-in painters ─────────────────────────────────────────────────\n/** Built-in shape dispatcher — matches when `data.shape` names a kit-known\n *  shape kind. Computes both paint and silhouette from the pose so consumer\n *  scenes can declare clipping/rendering directly in JSON without\n *  registering a custom painter. */\nexport const SHAPE_PAINTER: NodeShapeEntry<unknown, RectPose> = {\n  id: 'kit:shape',\n  matches: (node) => {\n    if (!paintsPose(node.pose)) return false;\n    const s = (node.data as { shape?: string } | null)?.shape;\n    return s != null && SHAPE_KINDS.has(s);\n  },\n  // Memoized: a pure function of `(data, pose)`, and `pathForShape` builds a\n  // fresh `Uint8Array` + `Float32Array` for every ellipse, polygon and star.\n  // See PAINT_SLOT.\n  // A container's shape is its clip, and its paint is only what its\n  // children's 'inherit' takes.\n  paint: (node, pose, ctx) => node.kind === 'container' ? [] : withAnimatedVertexColors(nodeMemo(node, PAINT_SLOT, pose, () => {\n    const d = node.data as ShapeData;\n    const path = pathForShape(d, pose);\n    const declaredFill = resolveFill(d.fill, ctx?.inherited?.fill);\n    const shapeFill = declaredFill && commandFill(declaredFill, pose);\n    const strokeSpec = resolveStroke(d.stroke, ctx?.inherited?.stroke);\n    const stroke = strokeSpec && commandStroke(strokeSpec, pose);\n    return [{\n      kind: 'path',\n      path,\n      ...(shapeFill ? { fill: shapeFill } : {}),\n      ...(stroke ? { stroke } : {}),\n    }];\n  }, ctx?.inherited), ctx),\n  silhouette: (node, pose) => {\n    const d = node.data as { shape: string; sides?: number; points?: number };\n    return pathForShape(d, pose);\n  },\n  ink: (node, _pose, ctx) => {\n    if (node.kind === 'container') return CONTAINER_INK;\n    const d = node.data as ShapeData;\n    return {\n      filled: resolveFill(d.fill, ctx?.inherited?.fill) !== null,\n      ...inkReach(resolveStroke(d.stroke, ctx?.inherited?.stroke), ctx?.scale),\n    };\n  },\n  // Every shape kind is inscribed in the pose box.\n  bounds: (node, pose, ctx) =>\n    poseBoxBounds(pose, resolveStroke((node.data as ShapeData).stroke, ctx?.inherited?.stroke), ctx),\n  // A rect's or an ellipse's stroke reaches its box evenly; a polygon's or a\n  // star's corners are sharper than a right angle, so their miters are measured.\n  drawnBounds: (node, pose, ctx) => {\n    const d = node.data as ShapeData;\n    const stroke = resolveStroke(d.stroke, ctx?.inherited?.stroke);\n    return d.shape === 'polygon' || d.shape === 'star'\n      ? strokedPoseBox(node, pose, stroke, ctx, (at) => pathForShape(d, at))\n      : outsetPoseBox(pose, stroke, ctx);\n  },\n};\n\nexport const SHAPE_KINDS = new Set(['rect', 'ellipse', 'polygon', 'star']);\n\nexport function pathForShape(\n  d: { shape: string; sides?: number; points?: number },\n  p: RectPose,\n): Path {\n  switch (d.shape) {\n    case 'ellipse':\n      return ellipsePath(p);\n    case 'polygon': {\n      const cx = p.x + p.width / 2;\n      const cy = p.y + p.height / 2;\n      const r = Math.min(p.width, p.height) / 2;\n      return regularPolygonPath({ x: cx, y: cy }, r, d.sides ?? 6);\n    }\n    case 'star': {\n      const cx = p.x + p.width / 2;\n      const cy = p.y + p.height / 2;\n      const r = Math.min(p.width, p.height) / 2;\n      return starPath({ x: cx, y: cy }, r, d.points ?? 5);\n    }\n    case 'rect':\n    default:\n      return { kind: 'rect', x: p.x, y: p.y, width: p.width, height: p.height };\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;AA8BA,IAAa,gBAAmD;CAC9D,IAAI;CACJ,UAAU,SAAS;EACjB,IAAI,CAAC,WAAW,KAAK,IAAI,GAAG,OAAO;EACnC,MAAM,IAAK,KAAK,MAAoC;EACpD,OAAO,KAAK,QAAQ,YAAY,IAAI,CAAC;CACvC;CAMA,QAAQ,MAAM,MAAM,QAAQ,KAAK,SAAS,cAAc,CAAC,IAAI,yBAAyB,SAAS,MAAM,YAAY,YAAY;EAC3H,MAAM,IAAI,KAAK;EACf,MAAM,OAAO,aAAa,GAAG,IAAI;EACjC,MAAM,eAAe,YAAY,EAAE,MAAM,KAAK,WAAW,IAAI;EAC7D,MAAM,YAAY,gBAAgB,YAAY,cAAc,IAAI;EAChE,MAAM,aAAa,cAAc,EAAE,QAAQ,KAAK,WAAW,MAAM;EACjE,MAAM,SAAS,cAAc,cAAc,YAAY,IAAI;EAC3D,OAAO,CAAC;GACN,MAAM;GACN;GACA,GAAI,YAAY,EAAE,MAAM,UAAU,IAAI,CAAC;GACvC,GAAI,SAAS,EAAE,OAAO,IAAI,CAAC;EAC7B,CAAC;CACH,GAAG,KAAK,SAAS,GAAG,GAAG;CACvB,aAAa,MAAM,SAAS;EAC1B,MAAM,IAAI,KAAK;EACf,OAAO,aAAa,GAAG,IAAI;CAC7B;CACA,MAAM,MAAM,OAAO,QAAQ;EACzB,IAAI,KAAK,SAAS,aAAa,OAAO;EACtC,MAAM,IAAI,KAAK;EACf,OAAO;GACL,QAAQ,YAAY,EAAE,MAAM,KAAK,WAAW,IAAI,MAAM;GACtD,GAAG,SAAS,cAAc,EAAE,QAAQ,KAAK,WAAW,MAAM,GAAG,KAAK,KAAK;EACzE;CACF;CAEA,SAAS,MAAM,MAAM,QACnB,cAAc,MAAM,cAAe,KAAK,KAAmB,QAAQ,KAAK,WAAW,MAAM,GAAG,GAAG;CAGjG,cAAc,MAAM,MAAM,QAAQ;EAChC,MAAM,IAAI,KAAK;EACf,MAAM,SAAS,cAAc,EAAE,QAAQ,KAAK,WAAW,MAAM;EAC7D,OAAO,EAAE,UAAU,aAAa,EAAE,UAAU,SACxC,eAAe,MAAM,MAAM,QAAQ,MAAM,OAAO,aAAa,GAAG,EAAE,CAAC,IACnE,cAAc,MAAM,QAAQ,GAAG;CACrC;AACF;AAEA,IAAa,8BAAc,IAAI,IAAI;CAAC;CAAQ;CAAW;CAAW;AAAM,CAAC;AAEzE,SAAgB,aACd,GACA,GACM;CACN,QAAQ,EAAE,OAAV;EACE,KAAK,WACH,OAAO,YAAY,CAAC;EACtB,KAAK,WAAW;GACd,MAAM,KAAK,EAAE,IAAI,EAAE,QAAQ;GAC3B,MAAM,KAAK,EAAE,IAAI,EAAE,SAAS;GAC5B,MAAM,IAAI,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,IAAI;GACxC,OAAO,mBAAmB;IAAE,GAAG;IAAI,GAAG;GAAG,GAAG,GAAG,EAAE,SAAS,CAAC;EAC7D;EACA,KAAK,QAAQ;GACX,MAAM,KAAK,EAAE,IAAI,EAAE,QAAQ;GAC3B,MAAM,KAAK,EAAE,IAAI,EAAE,SAAS;GAC5B,MAAM,IAAI,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,IAAI;GACxC,OAAO,SAAS;IAAE,GAAG;IAAI,GAAG;GAAG,GAAG,GAAG,EAAE,UAAU,CAAC;EACpD;EAEA,SACE,OAAO;GAAE,MAAM;GAAQ,GAAG,EAAE;GAAG,GAAG,EAAE;GAAG,OAAO,EAAE;GAAO,QAAQ,EAAE;EAAO;CAC5E;AACF"}
+{"version":3,"file":"shapePainter.js","names":[],"sources":["../../../src/canvas/nodeShapes/shapePainter.ts"],"sourcesContent":["import {\n  ellipsePath,\n  regularPolygonPath,\n  starPath,\n  type Path\n} from '@weasel-js/geom';\nimport type { Stroke, Fill, Inherit } from '@weasel-js/paint';\nimport type { NodeShapeEntry } from 'canvas/NodeShape';\nimport { nodeMemo } from 'core/scene/nodeMemo';\nimport type { RectPose } from 'core/scene/types';\nimport { commandFill, commandStroke } from '@weasel-js/renderer';\nimport { PAINT_SLOT } from './memo';\nimport { inkReach, withAnimatedVertexColors } from './nodePaint';\nimport { resolveFill, resolveStroke } from '@weasel-js/paint';\nimport { paintsPose, poseBoxBounds } from './poseBox';\nimport { outsetPoseBox, strokedPoseBox } from './strokedBounds';\n\ntype ShapeData = {\n  shape: string;\n  fill?: Fill | Inherit | null;\n  stroke?: Stroke | Inherit | null;\n  sides?: number;\n  points?: number;\n};\n\n// ─── Built-in painters ─────────────────────────────────────────────────\n/** Built-in shape dispatcher — matches when `data.shape` names a kit-known\n *  shape kind. Computes both paint and silhouette from the pose so consumer\n *  scenes can declare clipping/rendering directly in JSON without\n *  registering a custom painter. */\nexport const SHAPE_PAINTER: NodeShapeEntry<unknown, RectPose> = {\n  id: 'kit:shape',\n  matches: (node) => {\n    if (!paintsPose(node.pose)) return false;\n    const s = (node.data as { shape?: string } | null)?.shape;\n    return s != null && SHAPE_KINDS.has(s);\n  },\n  // Memoized: a pure function of `(data, pose)`, and `pathForShape` builds a\n  // fresh `Uint8Array` + `Float32Array` for every ellipse, polygon and star.\n  // See PAINT_SLOT.\n  paint: (node, pose, ctx) => withAnimatedVertexColors(nodeMemo(node, PAINT_SLOT, pose, () => {\n    const d = node.data as ShapeData;\n    const path = pathForShape(d, pose);\n    const declaredFill = resolveFill(d.fill, ctx?.inherited?.fill);\n    const shapeFill = declaredFill && commandFill(declaredFill, pose);\n    const strokeSpec = resolveStroke(d.stroke, ctx?.inherited?.stroke);\n    const stroke = strokeSpec && commandStroke(strokeSpec, pose);\n    return [{\n      kind: 'path',\n      path,\n      ...(shapeFill ? { fill: shapeFill } : {}),\n      ...(stroke ? { stroke } : {}),\n    }];\n  }, ctx?.inherited), ctx),\n  silhouette: (node, pose) => {\n    const d = node.data as { shape: string; sides?: number; points?: number };\n    return pathForShape(d, pose);\n  },\n  ink: (node, _pose, ctx) => {\n    const d = node.data as ShapeData;\n    return {\n      filled: resolveFill(d.fill, ctx?.inherited?.fill) !== null,\n      ...inkReach(resolveStroke(d.stroke, ctx?.inherited?.stroke), ctx?.scale),\n    };\n  },\n  // Every shape kind is inscribed in the pose box.\n  bounds: (node, pose, ctx) =>\n    poseBoxBounds(pose, resolveStroke((node.data as ShapeData).stroke, ctx?.inherited?.stroke), ctx),\n  // A rect's or an ellipse's stroke reaches its box evenly; a polygon's or a\n  // star's corners are sharper than a right angle, so their miters are measured.\n  drawnBounds: (node, pose, ctx) => {\n    const d = node.data as ShapeData;\n    const stroke = resolveStroke(d.stroke, ctx?.inherited?.stroke);\n    return d.shape === 'polygon' || d.shape === 'star'\n      ? strokedPoseBox(node, pose, stroke, ctx, (at) => pathForShape(d, at))\n      : outsetPoseBox(pose, stroke, ctx);\n  },\n};\n\nexport const SHAPE_KINDS = new Set(['rect', 'ellipse', 'polygon', 'star']);\n\nexport function pathForShape(\n  d: { shape: string; sides?: number; points?: number },\n  p: RectPose,\n): Path {\n  switch (d.shape) {\n    case 'ellipse':\n      return ellipsePath(p);\n    case 'polygon': {\n      const cx = p.x + p.width / 2;\n      const cy = p.y + p.height / 2;\n      const r = Math.min(p.width, p.height) / 2;\n      return regularPolygonPath({ x: cx, y: cy }, r, d.sides ?? 6);\n    }\n    case 'star': {\n      const cx = p.x + p.width / 2;\n      const cy = p.y + p.height / 2;\n      const r = Math.min(p.width, p.height) / 2;\n      return starPath({ x: cx, y: cy }, r, d.points ?? 5);\n    }\n    case 'rect':\n    default:\n      return { kind: 'rect', x: p.x, y: p.y, width: p.width, height: p.height };\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;AA8BA,IAAa,gBAAmD;CAC9D,IAAI;CACJ,UAAU,SAAS;EACjB,IAAI,CAAC,WAAW,KAAK,IAAI,GAAG,OAAO;EACnC,MAAM,IAAK,KAAK,MAAoC;EACpD,OAAO,KAAK,QAAQ,YAAY,IAAI,CAAC;CACvC;CAIA,QAAQ,MAAM,MAAM,QAAQ,yBAAyB,SAAS,MAAM,YAAY,YAAY;EAC1F,MAAM,IAAI,KAAK;EACf,MAAM,OAAO,aAAa,GAAG,IAAI;EACjC,MAAM,eAAe,YAAY,EAAE,MAAM,KAAK,WAAW,IAAI;EAC7D,MAAM,YAAY,gBAAgB,YAAY,cAAc,IAAI;EAChE,MAAM,aAAa,cAAc,EAAE,QAAQ,KAAK,WAAW,MAAM;EACjE,MAAM,SAAS,cAAc,cAAc,YAAY,IAAI;EAC3D,OAAO,CAAC;GACN,MAAM;GACN;GACA,GAAI,YAAY,EAAE,MAAM,UAAU,IAAI,CAAC;GACvC,GAAI,SAAS,EAAE,OAAO,IAAI,CAAC;EAC7B,CAAC;CACH,GAAG,KAAK,SAAS,GAAG,GAAG;CACvB,aAAa,MAAM,SAAS;EAC1B,MAAM,IAAI,KAAK;EACf,OAAO,aAAa,GAAG,IAAI;CAC7B;CACA,MAAM,MAAM,OAAO,QAAQ;EACzB,MAAM,IAAI,KAAK;EACf,OAAO;GACL,QAAQ,YAAY,EAAE,MAAM,KAAK,WAAW,IAAI,MAAM;GACtD,GAAG,SAAS,cAAc,EAAE,QAAQ,KAAK,WAAW,MAAM,GAAG,KAAK,KAAK;EACzE;CACF;CAEA,SAAS,MAAM,MAAM,QACnB,cAAc,MAAM,cAAe,KAAK,KAAmB,QAAQ,KAAK,WAAW,MAAM,GAAG,GAAG;CAGjG,cAAc,MAAM,MAAM,QAAQ;EAChC,MAAM,IAAI,KAAK;EACf,MAAM,SAAS,cAAc,EAAE,QAAQ,KAAK,WAAW,MAAM;EAC7D,OAAO,EAAE,UAAU,aAAa,EAAE,UAAU,SACxC,eAAe,MAAM,MAAM,QAAQ,MAAM,OAAO,aAAa,GAAG,EAAE,CAAC,IACnE,cAAc,MAAM,QAAQ,GAAG;CACrC;AACF;AAEA,IAAa,8BAAc,IAAI,IAAI;CAAC;CAAQ;CAAW;CAAW;AAAM,CAAC;AAEzE,SAAgB,aACd,GACA,GACM;CACN,QAAQ,EAAE,OAAV;EACE,KAAK,WACH,OAAO,YAAY,CAAC;EACtB,KAAK,WAAW;GACd,MAAM,KAAK,EAAE,IAAI,EAAE,QAAQ;GAC3B,MAAM,KAAK,EAAE,IAAI,EAAE,SAAS;GAC5B,MAAM,IAAI,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,IAAI;GACxC,OAAO,mBAAmB;IAAE,GAAG;IAAI,GAAG;GAAG,GAAG,GAAG,EAAE,SAAS,CAAC;EAC7D;EACA,KAAK,QAAQ;GACX,MAAM,KAAK,EAAE,IAAI,EAAE,QAAQ;GAC3B,MAAM,KAAK,EAAE,IAAI,EAAE,SAAS;GAC5B,MAAM,IAAI,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,IAAI;GACxC,OAAO,SAAS;IAAE,GAAG;IAAI,GAAG;GAAG,GAAG,GAAG,EAAE,UAAU,CAAC;EACpD;EAEA,SACE,OAAO;GAAE,MAAM;GAAQ,GAAG,EAAE;GAAG,GAAG,EAAE;GAAG,OAAO,EAAE;GAAO,QAAQ,EAAE;EAAO;CAC5E;AACF"}

package/dist/canvas/ownClip.js

@@ -0,0 +1,24 @@
+import { findShapeSilhouette } from "./NodeShape.js";
+
+//#region src/canvas/ownClip.ts
+/**
+* What a node declaring `clip: 'outline'` clips its children to, in world
+* coordinates: the silhouette of whichever painter claims it, the rect
+* fallback's box included, or `null` when none does. `derived` supplies a
+* derived path when there is one.
+*/
+function clipOutline(node, pose, derived) {
+	return findShapeSilhouette(node, pose, { derivedPath: derived?.() ?? null });
+}
+/** The clip a node imposes on its children, or null when it imposes none:
+*  its `clipFromPose` when it has one, else its {@link clipOutline} when it
+*  declares `clip: 'outline'`. */
+function ownClipOf(node, pose, derived) {
+	if (typeof node.clipFromPose === "function") return node.clipFromPose(pose);
+	if (node.clip !== "outline") return null;
+	return clipOutline(node, pose, derived);
+}
+
+//#endregion
+export { clipOutline, ownClipOf };
+//# sourceMappingURL=ownClip.js.map

package/dist/canvas/ownClip.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ownClip.js","names":[],"sources":["../../src/canvas/ownClip.ts"],"sourcesContent":["import type { Path } from '@weasel-js/geom';\nimport { findShapeSilhouette } from 'canvas/NodeShape';\nimport type { ClipFromPoseFn, Node, NodeClip } from 'core/scene/types';\n\n/** What {@link ownClipOf} reads of a node. */\nexport interface ClipBearing<TPose> {\n  clipFromPose?: ClipFromPoseFn<TPose>;\n  clip?: NodeClip;\n}\n\n/**\n * What a node declaring `clip: 'outline'` clips its children to, in world\n * coordinates: the silhouette of whichever painter claims it, the rect\n * fallback's box included, or `null` when none does. `derived` supplies a\n * derived path when there is one.\n */\nexport function clipOutline<TPose>(\n  node: Node<unknown, string, TPose>,\n  pose: TPose,\n  derived?: () => Path | null | undefined,\n): Path | null {\n  return findShapeSilhouette(node, pose, { derivedPath: derived?.() ?? null });\n}\n\n/** The clip a node imposes on its children, or null when it imposes none:\n *  its `clipFromPose` when it has one, else its {@link clipOutline} when it\n *  declares `clip: 'outline'`. */\nexport function ownClipOf<TPose>(\n  node: ClipBearing<TPose>,\n  pose: TPose,\n  derived?: () => Path | null | undefined,\n): Path | null {\n  if (typeof node.clipFromPose === 'function') return node.clipFromPose(pose);\n  if (node.clip !== 'outline') return null;\n  return clipOutline(node as unknown as Node<unknown, string, TPose>, pose, derived);\n}\n"],"mappings":";;;;;;;;;AAgBA,SAAgB,YACd,MACA,MACA,SACa;CACb,OAAO,oBAAoB,MAAM,MAAM,EAAE,aAAa,UAAU,KAAK,KAAK,CAAC;AAC7E;;;;AAKA,SAAgB,UACd,MACA,MACA,SACa;CACb,IAAI,OAAO,KAAK,iBAAiB,YAAY,OAAO,KAAK,aAAa,IAAI;CAC1E,IAAI,KAAK,SAAS,WAAW,OAAO;CACpC,OAAO,YAAY,MAAiD,MAAM,OAAO;AACnF"}

package/dist/canvas/paintCull.js.map

@@ -1 +1 @@
-{"version":3,"file":"paintCull.js","names":["viewToMat3","mat3"],"sources":["../../src/canvas/paintCull.ts"],"sourcesContent":["import type { View } from 'core/viewport/view';\nimport type { Bounds } from 'core/viewport/fitViewToBounds';\nimport { poseFrameOf } from '@weasel-js/geom';\nimport { boundsMissRect, type CullRect } from '@weasel-js/renderer';\nimport { mat3, viewToMat3 } from '@weasel-js/geom';\n\n/** Where a node's paint can reach, before its pose frame — the scene\n *  slot's `paintBounds`. `null` means unknown, and the node is painted. */\nexport type PaintBoundsFn<TNode, TPose> = (node: TNode, pose: TPose, view: View) => Bounds | null;\n\n/**\n * A predicate true for the nodes whose paint cannot reach `rect` (screen\n * pixels) under `view`, by `paintBounds` taken through the pose frame\n * (`poseFrameOf`) `wrapNodeOutput` applies and then the view. A node `paintBounds` cannot\n * bound is never culled.\n */\nexport function paintMissesView<TNode, TPose>(\n  paintBounds: PaintBoundsFn<TNode, TPose>,\n  view: View,\n  rect: CullRect,\n): (node: TNode, pose: TPose, layerView?: View) => boolean {\n  // `layerView` is a parallax plane's own view; planes are few, so one slot\n  // of memo covers a walk that meets them layer by layer.\n  let last = view;\n  let toScreen = viewToMat3(view);\n  return (node, pose, layerView = view) => {\n    if (layerView !== last) { last = layerView; toScreen = viewToMat3(layerView); }\n    const b = paintBounds(node, pose, layerView);\n    if (!b) return false;\n    const frame = poseFrameOf(pose);\n    const m = frame ? mat3.multiply(toScreen, mat3.fromAffine(frame)) : toScreen;\n    return boundsMissRect(b, m, rect);\n  };\n}\n"],"mappings":";;;;;;;;;;AAgBA,SAAgB,gBACd,aACA,MACA,MACyD;CAGzD,IAAI,OAAO;CACX,IAAI,WAAWA,aAAW,IAAI;CAC9B,QAAQ,MAAM,MAAM,YAAY,SAAS;EACvC,IAAI,cAAc,MAAM;GAAE,OAAO;GAAW,WAAWA,aAAW,SAAS;EAAG;EAC9E,MAAM,IAAI,YAAY,MAAM,MAAM,SAAS;EAC3C,IAAI,CAAC,GAAG,OAAO;EACf,MAAM,QAAQ,YAAY,IAAI;EAC9B,MAAM,IAAI,QAAQC,OAAK,SAAS,UAAUA,OAAK,WAAW,KAAK,CAAC,IAAI;EACpE,OAAO,eAAe,GAAG,GAAG,IAAI;CAClC;AACF"}
+{"version":3,"file":"paintCull.js","names":["viewToMat3","mat3"],"sources":["../../src/canvas/paintCull.ts"],"sourcesContent":["import type { View } from 'core/viewport/view';\nimport type { Bounds } from 'core/viewport/fitViewToBounds';\nimport { poseFrameOf } from '@weasel-js/geom';\nimport { boundsMissRect, type CullRect } from '@weasel-js/renderer';\nimport { mat3, viewToMat3 } from '@weasel-js/geom';\nimport type { NodePaintCtx } from './nodeShapeTypes';\n\n/** Where a node's paint can reach, before its pose frame — the scene\n *  slot's `paintBounds`. `null` means unknown, and the node is painted.\n *  `ctx.inherited` is what its `'inherit'` fill and stroke take, as `drawOne` gets it. */\nexport type PaintBoundsFn<TNode, TPose> = (\n  node: TNode, pose: TPose, view: View, ctx?: Pick<NodePaintCtx, 'inherited'>,\n) => Bounds | null;\n\n/**\n * A predicate true for the nodes whose paint cannot reach `rect` (screen\n * pixels) under `view`, by `paintBounds` taken through the pose frame\n * (`poseFrameOf`) `wrapNodeOutput` applies and then the view. A node `paintBounds` cannot\n * bound is never culled.\n */\nexport function paintMissesView<TNode, TPose>(\n  paintBounds: PaintBoundsFn<TNode, TPose>,\n  view: View,\n  rect: CullRect,\n): (node: TNode, pose: TPose, layerView?: View) => boolean {\n  // `layerView` is a parallax plane's own view; planes are few, so one slot\n  // of memo covers a walk that meets them layer by layer.\n  let last = view;\n  let toScreen = viewToMat3(view);\n  return (node, pose, layerView = view) => {\n    if (layerView !== last) { last = layerView; toScreen = viewToMat3(layerView); }\n    const b = paintBounds(node, pose, layerView);\n    if (!b) return false;\n    const frame = poseFrameOf(pose);\n    const m = frame ? mat3.multiply(toScreen, mat3.fromAffine(frame)) : toScreen;\n    return boundsMissRect(b, m, rect);\n  };\n}\n"],"mappings":";;;;;;;;;;AAoBA,SAAgB,gBACd,aACA,MACA,MACyD;CAGzD,IAAI,OAAO;CACX,IAAI,WAAWA,aAAW,IAAI;CAC9B,QAAQ,MAAM,MAAM,YAAY,SAAS;EACvC,IAAI,cAAc,MAAM;GAAE,OAAO;GAAW,WAAWA,aAAW,SAAS;EAAG;EAC9E,MAAM,IAAI,YAAY,MAAM,MAAM,SAAS;EAC3C,IAAI,CAAC,GAAG,OAAO;EACf,MAAM,QAAQ,YAAY,IAAI;EAC9B,MAAM,IAAI,QAAQC,OAAK,SAAS,UAAUA,OAAK,WAAW,KAAK,CAAC,IAAI;EACpE,OAAO,eAAe,GAAG,GAAG,IAAI;CAClC;AACF"}

package/dist/canvas/pickIndex/nodeBroadBox.js

@@ -0,0 +1,86 @@
+import { framedBounds, poseDescriptorForNode } from "../../core/geometry/poseDescriptor.js";
+import { AUTO_POSE_DESCRIPTOR, isPathLike, isRectPose } from "../../core/geometry/autoPoseDescriptor.js";
+import { findShapeInk } from "../NodeShape.js";
+import { regionBoundsOf } from "../../core/geometry/regionHit.js";
+import { applyToPoint, boundsOfPath, poseFrameOf } from "@weasel-js/geom";
+
+//#region src/canvas/pickIndex/nodeBroadBox.ts
+/**
+* One node's box in the pick index: a world box that every query's `hits`
+* accepts only inside of, before that query's own screen-pixel slop.
+*
+* The point query and the region query read a node differently, so the box is
+* the union of both: the region's `regionBoundsOf` through the node's own
+* descriptor, and the frame box the point query's `poseContainsRotated` tests,
+* grown in the pose's own frame by the ink's `outset`. A derived node is read
+* by its path alone, as both queries read it.
+*/
+function grow(out, b, by) {
+	const x1 = b.x + b.width, y1 = b.y + b.height;
+	out[0] = Math.min(out[0], Math.min(b.x, x1) - by);
+	out[1] = Math.min(out[1], Math.min(b.y, y1) - by);
+	out[2] = Math.max(out[2], Math.max(b.x, x1) + by);
+	out[3] = Math.max(out[3], Math.max(b.y, y1) + by);
+}
+/** The local box `poseContainsRotated` tests, grown by `by` and carried through
+*  the pose's frame, as that function reads it. */
+function framedBox(out, pose, d, by) {
+	const local = isPathLike(pose) ? boundsOfPath(pose) : d.getBounds(pose);
+	const framed = d === AUTO_POSE_DESCRIPTOR ? pose : framedBounds(pose, d);
+	const frame = poseFrameOf(framed);
+	if (!frame) {
+		grow(out, local, by);
+		return;
+	}
+	const x0 = local.x - by, y0 = local.y - by;
+	const x1 = local.x + local.width + by, y1 = local.y + local.height + by;
+	for (const [x, y] of [
+		[x0, y0],
+		[x1, y0],
+		[x1, y1],
+		[x0, y1]
+	]) {
+		const [wx, wy] = applyToPoint(frame, x, y);
+		grow(out, {
+			x: wx,
+			y: wy,
+			width: 0,
+			height: 0
+		}, 0);
+	}
+}
+/** Float error in a frame's round trip must not put an accepted point just outside. */
+function pad(b) {
+	const e = 1e-9 * (1 + Math.max(Math.abs(b[0]), Math.abs(b[1]), Math.abs(b[2]), Math.abs(b[3])));
+	b[0] -= e;
+	b[1] -= e;
+	b[2] += e;
+	b[3] += e;
+}
+var UNINHERITED = Object.freeze({ scale: 1 });
+/** Writes the box into `out` and returns the ink's reach measured on screen,
+*  which no world box can hold. */
+function nodeBroadBox(node, pose, derived, inherited, descriptor, out) {
+	const ink = findShapeInk(node, pose, inherited === void 0 ? UNINHERITED : {
+		scale: 1,
+		inherited
+	});
+	const outset = Math.max(0, ink?.outset ?? 0);
+	out[0] = out[1] = Infinity;
+	out[2] = out[3] = -Infinity;
+	if (derived) grow(out, boundsOfPath(derived), outset);
+	else {
+		const own = poseDescriptorForNode(descriptor, node);
+		if (descriptor === AUTO_POSE_DESCRIPTOR && own === descriptor && isRectPose(pose) && poseFrameOf(pose) === null) grow(out, pose, outset);
+		else {
+			grow(out, regionBoundsOf(node, pose, own), outset);
+			framedBox(out, pose, descriptor, outset);
+		}
+	}
+	pad(out);
+	return Math.max(0, ink?.outsetPx ?? 0);
+}
+
+//#endregion
+export { nodeBroadBox };
+//# sourceMappingURL=nodeBroadBox.js.map

package/dist/canvas/pickIndex/nodeBroadBox.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nodeBroadBox.js","names":[],"sources":["../../../src/canvas/pickIndex/nodeBroadBox.ts"],"sourcesContent":["/**\n * One node's box in the pick index: a world box that every query's `hits`\n * accepts only inside of, before that query's own screen-pixel slop.\n *\n * The point query and the region query read a node differently, so the box is\n * the union of both: the region's `regionBoundsOf` through the node's own\n * descriptor, and the frame box the point query's `poseContainsRotated` tests,\n * grown in the pose's own frame by the ink's `outset`. A derived node is read\n * by its path alone, as both queries read it.\n */\nimport { applyToPoint, boundsOfPath, poseFrameOf, type Path } from '@weasel-js/geom';\nimport { findShapeInk } from 'canvas/NodeShape';\nimport { AUTO_POSE_DESCRIPTOR, isPathLike, isRectPose } from 'core/geometry/autoPoseDescriptor';\nimport { framedBounds } from 'core/geometry/poseDescriptor';\nimport { regionBoundsOf } from 'core/geometry/regionHit';\nimport type { InheritedPaint } from 'core/scene/inheritedPaint';\nimport { poseDescriptorForNode, type PoseDescriptor } from 'interactions/actions/resize/geometry';\n\n/** `[minX, minY, maxX, maxY]`, the layout `createBvh(2)` takes. */\nexport type Box2 = [number, number, number, number];\n\ntype Rect = { x: number; y: number; width: number; height: number };\n\nfunction grow(out: Box2, b: Rect, by: number): void {\n  const x1 = b.x + b.width, y1 = b.y + b.height;\n  out[0] = Math.min(out[0], Math.min(b.x, x1) - by);\n  out[1] = Math.min(out[1], Math.min(b.y, y1) - by);\n  out[2] = Math.max(out[2], Math.max(b.x, x1) + by);\n  out[3] = Math.max(out[3], Math.max(b.y, y1) + by);\n}\n\n/** The local box `poseContainsRotated` tests, grown by `by` and carried through\n *  the pose's frame, as that function reads it. */\nfunction framedBox(out: Box2, pose: unknown, d: PoseDescriptor<unknown>, by: number): void {\n  const local: Rect = isPathLike(pose) ? boundsOfPath(pose) : d.getBounds(pose);\n  const framed = d === AUTO_POSE_DESCRIPTOR ? pose : framedBounds(pose, d);\n  const frame = poseFrameOf(framed);\n  if (!frame) {\n    grow(out, local, by);\n    return;\n  }\n  const x0 = local.x - by, y0 = local.y - by;\n  const x1 = local.x + local.width + by, y1 = local.y + local.height + by;\n  for (const [x, y] of [[x0, y0], [x1, y0], [x1, y1], [x0, y1]] as const) {\n    const [wx, wy] = applyToPoint(frame, x, y);\n    grow(out, { x: wx, y: wy, width: 0, height: 0 }, 0);\n  }\n}\n\n/** Float error in a frame's round trip must not put an accepted point just outside. */\nfunction pad(b: Box2): void {\n  const e = 1e-9 * (1 + Math.max(Math.abs(b[0]), Math.abs(b[1]), Math.abs(b[2]), Math.abs(b[3])));\n  b[0] -= e; b[1] -= e; b[2] += e; b[3] += e;\n}\n\nconst UNINHERITED = Object.freeze({ scale: 1 });\n\n/** Writes the box into `out` and returns the ink's reach measured on screen,\n *  which no world box can hold. */\nexport function nodeBroadBox(\n  node: object,\n  pose: unknown,\n  derived: Path | null | undefined,\n  inherited: InheritedPaint | undefined,\n  descriptor: PoseDescriptor<unknown>,\n  out: Box2,\n): number {\n  const ink = findShapeInk(node as never, pose, inherited === undefined ? UNINHERITED : { scale: 1, inherited });\n  const outset = Math.max(0, ink?.outset ?? 0);\n  out[0] = out[1] = Infinity;\n  out[2] = out[3] = -Infinity;\n  if (derived) {\n    grow(out, boundsOfPath(derived), outset);\n  } else {\n    const own = poseDescriptorForNode(descriptor, node);\n    if (descriptor === AUTO_POSE_DESCRIPTOR && own === descriptor && isRectPose(pose) && poseFrameOf(pose) === null) {\n      // Both reads come to the pose rect itself.\n      grow(out, pose, outset);\n    } else {\n      grow(out, regionBoundsOf(node, pose, own), outset);\n      framedBox(out, pose, descriptor, outset);\n    }\n  }\n  pad(out);\n  return Math.max(0, ink?.outsetPx ?? 0);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAuBA,SAAS,KAAK,KAAW,GAAS,IAAkB;CAClD,MAAM,KAAK,EAAE,IAAI,EAAE,OAAO,KAAK,EAAE,IAAI,EAAE;CACvC,IAAI,KAAK,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE;CAChD,IAAI,KAAK,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE;CAChD,IAAI,KAAK,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE;CAChD,IAAI,KAAK,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE;AAClD;;;AAIA,SAAS,UAAU,KAAW,MAAe,GAA4B,IAAkB;CACzF,MAAM,QAAc,WAAW,IAAI,IAAI,aAAa,IAAI,IAAI,EAAE,UAAU,IAAI;CAC5E,MAAM,SAAS,MAAM,uBAAuB,OAAO,aAAa,MAAM,CAAC;CACvE,MAAM,QAAQ,YAAY,MAAM;CAChC,IAAI,CAAC,OAAO;EACV,KAAK,KAAK,OAAO,EAAE;EACnB;CACF;CACA,MAAM,KAAK,MAAM,IAAI,IAAI,KAAK,MAAM,IAAI;CACxC,MAAM,KAAK,MAAM,IAAI,MAAM,QAAQ,IAAI,KAAK,MAAM,IAAI,MAAM,SAAS;CACrE,KAAK,MAAM,CAAC,GAAG,MAAM;EAAC,CAAC,IAAI,EAAE;EAAG,CAAC,IAAI,EAAE;EAAG,CAAC,IAAI,EAAE;EAAG,CAAC,IAAI,EAAE;CAAC,GAAY;EACtE,MAAM,CAAC,IAAI,MAAM,aAAa,OAAO,GAAG,CAAC;EACzC,KAAK,KAAK;GAAE,GAAG;GAAI,GAAG;GAAI,OAAO;GAAG,QAAQ;EAAE,GAAG,CAAC;CACpD;AACF;;AAGA,SAAS,IAAI,GAAe;CAC1B,MAAM,IAAI,QAAQ,IAAI,KAAK,IAAI,KAAK,IAAI,EAAE,EAAE,GAAG,KAAK,IAAI,EAAE,EAAE,GAAG,KAAK,IAAI,EAAE,EAAE,GAAG,KAAK,IAAI,EAAE,EAAE,CAAC;CAC7F,EAAE,MAAM;CAAG,EAAE,MAAM;CAAG,EAAE,MAAM;CAAG,EAAE,MAAM;AAC3C;AAEA,IAAM,cAAc,OAAO,OAAO,EAAE,OAAO,EAAE,CAAC;;;AAI9C,SAAgB,aACd,MACA,MACA,SACA,WACA,YACA,KACQ;CACR,MAAM,MAAM,aAAa,MAAe,MAAM,cAAc,SAAY,cAAc;EAAE,OAAO;EAAG;CAAU,CAAC;CAC7G,MAAM,SAAS,KAAK,IAAI,GAAG,KAAK,UAAU,CAAC;CAC3C,IAAI,KAAK,IAAI,KAAK;CAClB,IAAI,KAAK,IAAI,KAAK;CAClB,IAAI,SACF,KAAK,KAAK,aAAa,OAAO,GAAG,MAAM;MAClC;EACL,MAAM,MAAM,sBAAsB,YAAY,IAAI;EAClD,IAAI,eAAe,wBAAwB,QAAQ,cAAc,WAAW,IAAI,KAAK,YAAY,IAAI,MAAM,MAEzG,KAAK,KAAK,MAAM,MAAM;OACjB;GACL,KAAK,KAAK,eAAe,MAAM,MAAM,GAAG,GAAG,MAAM;GACjD,UAAU,KAAK,MAAM,YAAY,MAAM;EACzC;CACF;CACA,IAAI,GAAG;CACP,OAAO,KAAK,IAAI,GAAG,KAAK,YAAY,CAAC;AACvC"}