@retikz/core 0.1.0-alpha.3 → 0.1.0-alpha.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (199) hide show
  1. package/dist/es/compile/compile.d.ts +9 -10
  2. package/dist/es/compile/compile.d.ts.map +1 -1
  3. package/dist/es/compile/compile.js +31 -8
  4. package/dist/es/compile/node.d.ts +56 -54
  5. package/dist/es/compile/node.d.ts.map +1 -1
  6. package/dist/es/compile/node.js +137 -39
  7. package/dist/es/compile/parseTarget.d.ts +3 -8
  8. package/dist/es/compile/parseTarget.d.ts.map +1 -1
  9. package/dist/es/compile/parseTarget.js +7 -19
  10. package/dist/es/compile/path.d.ts +2 -19
  11. package/dist/es/compile/path.d.ts.map +1 -1
  12. package/dist/es/compile/path.js +232 -213
  13. package/dist/es/compile/position.d.ts +4 -5
  14. package/dist/es/compile/position.d.ts.map +1 -1
  15. package/dist/es/compile/position.js +32 -5
  16. package/dist/es/compile/text-metrics.d.ts +2 -4
  17. package/dist/es/compile/text-metrics.d.ts.map +1 -1
  18. package/dist/es/compile/view-box.d.ts +1 -4
  19. package/dist/es/compile/view-box.d.ts.map +1 -1
  20. package/dist/es/compile/view-box.js +1 -4
  21. package/dist/es/geometry/arc.d.ts +3 -28
  22. package/dist/es/geometry/arc.d.ts.map +1 -1
  23. package/dist/es/geometry/arc.js +4 -31
  24. package/dist/es/geometry/bend.d.ts +2 -13
  25. package/dist/es/geometry/bend.d.ts.map +1 -1
  26. package/dist/es/geometry/bend.js +2 -13
  27. package/dist/es/geometry/circle.d.ts +5 -13
  28. package/dist/es/geometry/circle.d.ts.map +1 -1
  29. package/dist/es/geometry/circle.js +1 -4
  30. package/dist/es/geometry/diamond.d.ts +9 -24
  31. package/dist/es/geometry/diamond.d.ts.map +1 -1
  32. package/dist/es/geometry/diamond.js +4 -14
  33. package/dist/es/geometry/ellipse.d.ts +9 -15
  34. package/dist/es/geometry/ellipse.d.ts.map +1 -1
  35. package/dist/es/geometry/ellipse.js +4 -8
  36. package/dist/es/geometry/point.d.ts +8 -9
  37. package/dist/es/geometry/point.d.ts.map +1 -1
  38. package/dist/es/geometry/point.js +8 -9
  39. package/dist/es/geometry/polar.d.ts +12 -21
  40. package/dist/es/geometry/polar.d.ts.map +1 -1
  41. package/dist/es/geometry/polar.js +7 -14
  42. package/dist/es/geometry/rect.d.ts +8 -32
  43. package/dist/es/geometry/rect.d.ts.map +1 -1
  44. package/dist/es/geometry/rect.js +7 -33
  45. package/dist/es/geometry/segment.d.ts +11 -18
  46. package/dist/es/geometry/segment.d.ts.map +1 -1
  47. package/dist/es/geometry/segment.js +9 -16
  48. package/dist/es/index.d.ts +6 -10
  49. package/dist/es/index.d.ts.map +1 -1
  50. package/dist/es/index.js +7 -4
  51. package/dist/es/ir/coordinate.d.ts +65 -0
  52. package/dist/es/ir/coordinate.d.ts.map +1 -0
  53. package/dist/es/ir/coordinate.js +22 -0
  54. package/dist/es/ir/index.d.ts +1 -0
  55. package/dist/es/ir/index.d.ts.map +1 -1
  56. package/dist/es/ir/node.d.ts +290 -50
  57. package/dist/es/ir/node.d.ts.map +1 -1
  58. package/dist/es/ir/node.js +32 -38
  59. package/dist/es/ir/path/arrow.d.ts +210 -12
  60. package/dist/es/ir/path/arrow.d.ts.map +1 -1
  61. package/dist/es/ir/path/arrow.js +39 -12
  62. package/dist/es/ir/path/path.d.ts +477 -153
  63. package/dist/es/ir/path/path.d.ts.map +1 -1
  64. package/dist/es/ir/path/path.js +2 -2
  65. package/dist/es/ir/path/step.d.ts +395 -223
  66. package/dist/es/ir/path/step.d.ts.map +1 -1
  67. package/dist/es/ir/path/step.js +13 -14
  68. package/dist/es/ir/path/target.d.ts +25 -16
  69. package/dist/es/ir/path/target.d.ts.map +1 -1
  70. package/dist/es/ir/path/target.js +8 -6
  71. package/dist/es/ir/position/at-position.d.ts +43 -0
  72. package/dist/es/ir/position/at-position.d.ts.map +1 -0
  73. package/dist/es/ir/position/at-position.js +23 -0
  74. package/dist/es/ir/position/index.d.ts +2 -0
  75. package/dist/es/ir/position/index.d.ts.map +1 -1
  76. package/dist/es/ir/position/offset-position.d.ts +14 -0
  77. package/dist/es/ir/position/offset-position.d.ts.map +1 -0
  78. package/dist/es/ir/position/offset-position.js +14 -0
  79. package/dist/es/ir/position/polar-position.d.ts +1 -4
  80. package/dist/es/ir/position/polar-position.d.ts.map +1 -1
  81. package/dist/es/ir/position/polar-position.js +1 -4
  82. package/dist/es/ir/scene.d.ts +1736 -386
  83. package/dist/es/ir/scene.d.ts.map +1 -1
  84. package/dist/es/ir/scene.js +6 -1
  85. package/dist/es/parsers/parseTargetSugar.d.ts.map +1 -1
  86. package/dist/es/parsers/parseTargetSugar.js +6 -19
  87. package/dist/es/parsers/parseWay.d.ts +26 -118
  88. package/dist/es/parsers/parseWay.d.ts.map +1 -1
  89. package/dist/es/parsers/parseWay.js +19 -61
  90. package/dist/es/primitive/ellipse.d.ts +4 -14
  91. package/dist/es/primitive/ellipse.d.ts.map +1 -1
  92. package/dist/es/primitive/group.d.ts +21 -3
  93. package/dist/es/primitive/group.d.ts.map +1 -1
  94. package/dist/es/primitive/path.d.ts +67 -7
  95. package/dist/es/primitive/path.d.ts.map +1 -1
  96. package/dist/es/primitive/scene.d.ts +2 -4
  97. package/dist/es/primitive/scene.d.ts.map +1 -1
  98. package/dist/es/primitive/text.d.ts +9 -32
  99. package/dist/es/primitive/text.d.ts.map +1 -1
  100. package/dist/lib/compile/compile.cjs +31 -8
  101. package/dist/lib/compile/compile.d.ts +9 -10
  102. package/dist/lib/compile/compile.d.ts.map +1 -1
  103. package/dist/lib/compile/node.cjs +137 -39
  104. package/dist/lib/compile/node.d.ts +56 -54
  105. package/dist/lib/compile/node.d.ts.map +1 -1
  106. package/dist/lib/compile/parseTarget.cjs +7 -19
  107. package/dist/lib/compile/parseTarget.d.ts +3 -8
  108. package/dist/lib/compile/parseTarget.d.ts.map +1 -1
  109. package/dist/lib/compile/path.cjs +231 -212
  110. package/dist/lib/compile/path.d.ts +2 -19
  111. package/dist/lib/compile/path.d.ts.map +1 -1
  112. package/dist/lib/compile/position.cjs +32 -5
  113. package/dist/lib/compile/position.d.ts +4 -5
  114. package/dist/lib/compile/position.d.ts.map +1 -1
  115. package/dist/lib/compile/text-metrics.d.ts +2 -4
  116. package/dist/lib/compile/text-metrics.d.ts.map +1 -1
  117. package/dist/lib/compile/view-box.cjs +1 -4
  118. package/dist/lib/compile/view-box.d.ts +1 -4
  119. package/dist/lib/compile/view-box.d.ts.map +1 -1
  120. package/dist/lib/geometry/arc.cjs +3 -31
  121. package/dist/lib/geometry/arc.d.ts +3 -28
  122. package/dist/lib/geometry/arc.d.ts.map +1 -1
  123. package/dist/lib/geometry/bend.cjs +2 -13
  124. package/dist/lib/geometry/bend.d.ts +2 -13
  125. package/dist/lib/geometry/bend.d.ts.map +1 -1
  126. package/dist/lib/geometry/circle.cjs +1 -4
  127. package/dist/lib/geometry/circle.d.ts +5 -13
  128. package/dist/lib/geometry/circle.d.ts.map +1 -1
  129. package/dist/lib/geometry/diamond.cjs +4 -14
  130. package/dist/lib/geometry/diamond.d.ts +9 -24
  131. package/dist/lib/geometry/diamond.d.ts.map +1 -1
  132. package/dist/lib/geometry/ellipse.cjs +4 -8
  133. package/dist/lib/geometry/ellipse.d.ts +9 -15
  134. package/dist/lib/geometry/ellipse.d.ts.map +1 -1
  135. package/dist/lib/geometry/point.cjs +8 -9
  136. package/dist/lib/geometry/point.d.ts +8 -9
  137. package/dist/lib/geometry/point.d.ts.map +1 -1
  138. package/dist/lib/geometry/polar.cjs +7 -14
  139. package/dist/lib/geometry/polar.d.ts +12 -21
  140. package/dist/lib/geometry/polar.d.ts.map +1 -1
  141. package/dist/lib/geometry/rect.cjs +7 -33
  142. package/dist/lib/geometry/rect.d.ts +8 -32
  143. package/dist/lib/geometry/rect.d.ts.map +1 -1
  144. package/dist/lib/geometry/segment.cjs +9 -16
  145. package/dist/lib/geometry/segment.d.ts +11 -18
  146. package/dist/lib/geometry/segment.d.ts.map +1 -1
  147. package/dist/lib/index.cjs +15 -2
  148. package/dist/lib/index.d.ts +6 -10
  149. package/dist/lib/index.d.ts.map +1 -1
  150. package/dist/lib/ir/coordinate.cjs +22 -0
  151. package/dist/lib/ir/coordinate.d.ts +65 -0
  152. package/dist/lib/ir/coordinate.d.ts.map +1 -0
  153. package/dist/lib/ir/index.d.ts +1 -0
  154. package/dist/lib/ir/index.d.ts.map +1 -1
  155. package/dist/lib/ir/node.cjs +32 -37
  156. package/dist/lib/ir/node.d.ts +290 -50
  157. package/dist/lib/ir/node.d.ts.map +1 -1
  158. package/dist/lib/ir/path/arrow.cjs +43 -11
  159. package/dist/lib/ir/path/arrow.d.ts +210 -12
  160. package/dist/lib/ir/path/arrow.d.ts.map +1 -1
  161. package/dist/lib/ir/path/path.cjs +1 -1
  162. package/dist/lib/ir/path/path.d.ts +477 -153
  163. package/dist/lib/ir/path/path.d.ts.map +1 -1
  164. package/dist/lib/ir/path/step.cjs +13 -14
  165. package/dist/lib/ir/path/step.d.ts +395 -223
  166. package/dist/lib/ir/path/step.d.ts.map +1 -1
  167. package/dist/lib/ir/path/target.cjs +9 -7
  168. package/dist/lib/ir/path/target.d.ts +25 -16
  169. package/dist/lib/ir/path/target.d.ts.map +1 -1
  170. package/dist/lib/ir/position/at-position.cjs +24 -0
  171. package/dist/lib/ir/position/at-position.d.ts +43 -0
  172. package/dist/lib/ir/position/at-position.d.ts.map +1 -0
  173. package/dist/lib/ir/position/index.d.ts +2 -0
  174. package/dist/lib/ir/position/index.d.ts.map +1 -1
  175. package/dist/lib/ir/position/offset-position.cjs +14 -0
  176. package/dist/lib/ir/position/offset-position.d.ts +14 -0
  177. package/dist/lib/ir/position/offset-position.d.ts.map +1 -0
  178. package/dist/lib/ir/position/polar-position.cjs +1 -4
  179. package/dist/lib/ir/position/polar-position.d.ts +1 -4
  180. package/dist/lib/ir/position/polar-position.d.ts.map +1 -1
  181. package/dist/lib/ir/scene.cjs +6 -1
  182. package/dist/lib/ir/scene.d.ts +1736 -386
  183. package/dist/lib/ir/scene.d.ts.map +1 -1
  184. package/dist/lib/parsers/parseTargetSugar.cjs +6 -19
  185. package/dist/lib/parsers/parseTargetSugar.d.ts.map +1 -1
  186. package/dist/lib/parsers/parseWay.cjs +19 -61
  187. package/dist/lib/parsers/parseWay.d.ts +26 -118
  188. package/dist/lib/parsers/parseWay.d.ts.map +1 -1
  189. package/dist/lib/primitive/ellipse.d.ts +4 -14
  190. package/dist/lib/primitive/ellipse.d.ts.map +1 -1
  191. package/dist/lib/primitive/group.d.ts +21 -3
  192. package/dist/lib/primitive/group.d.ts.map +1 -1
  193. package/dist/lib/primitive/path.d.ts +67 -7
  194. package/dist/lib/primitive/path.d.ts.map +1 -1
  195. package/dist/lib/primitive/scene.d.ts +2 -4
  196. package/dist/lib/primitive/scene.d.ts.map +1 -1
  197. package/dist/lib/primitive/text.d.ts +9 -32
  198. package/dist/lib/primitive/text.d.ts.map +1 -1
  199. package/package.json +1 -1
@@ -8,20 +8,19 @@ export type CompileOptions = {
8
8
  /** viewBox 周围的留白(user units),默认 10 */
9
9
  padding?: number;
10
10
  /**
11
- * 输出坐标的小数位精度;默认 2(保留 2 位小数四舍五入)。
12
- * 仅在写入 Scene primitive / path d 字符串 / viewBox 时生效;
13
- * 内部几何计算保持完整 double 精度,避免误差累积。
11
+ * 输出坐标的小数位精度;默认 2
12
+ * @description 仅作用于 Scene primitive / path d / viewBox;内部几何计算保持完整 double 精度
14
13
  */
15
14
  precision?: number;
15
+ /**
16
+ * 相对定位的默认距离(对应 TikZ `node distance`,user units)
17
+ * @description `Node.position` 为 `{ direction, of }` 且未自带 `distance` 时取此值;未配回退到 1
18
+ */
19
+ nodeDistance?: number;
16
20
  };
17
21
  /**
18
- * IR → Scene。纯函数。
19
- * 这是所有 adapter 共享的最深层共享代码。
20
- *
21
- * 流程:
22
- * 1. Pass 1:按 IR children 源码顺序处理 Node——计算 layout、注册 nodeIndex、发出 RectPrim/TextPrim、累积 bbox 角点
23
- * 2. Pass 2:处理 Path——解析每个 step 端点(节点 ref 走 boundaryPoint,其他走 resolvePosition),写 d 字符串
24
- * 3. 末端用 computeViewBox 折算最终 viewBox(按 precision 四舍五入)
22
+ * IR → Scene 纯函数转换,所有 adapter 共享
23
+ * @description Pass 1 处理 Node/coordinate 并注册 nodeIndex、发 primitive、累积 bbox;Pass 2 解析 Path 端点写 d 字符串;末端按 precision 折算 viewBox
25
24
  */
26
25
  export declare const compileToScene: (ir: IR, options?: CompileOptions) => Scene;
27
26
  //# sourceMappingURL=compile.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/compile/compile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAc,MAAM,OAAO,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAkB,MAAM,cAAc,CAAC;AAI1D,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,gBAAgB,CAAC;AAGrE,2BAA2B;AAC3B,MAAM,MAAM,cAAc,GAAG;IAC3B,oCAAoC;IACpC,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,sCAAsC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,GAAI,IAAI,EAAE,EAAE,UAAS,cAAmB,KAAG,KA2CrE,CAAC"}
1
+ {"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/compile/compile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAc,MAAM,OAAO,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAkB,MAAM,cAAc,CAAC;AAK1D,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,gBAAgB,CAAC;AAuBrE,2BAA2B;AAC3B,MAAM,MAAM,cAAc,GAAG;IAC3B,oCAAoC;IACpC,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,sCAAsC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,IAAI,EAAE,EAAE,UAAS,cAAmB,KAAG,KAsDrE,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import { rect } from "../geometry/rect.js";
2
+ import { resolvePosition } from "./position.js";
2
3
  import { emitNodePrimitives, layoutNode } from "./node.js";
3
4
  import { fallbackMeasurer } from "./text-metrics.js";
4
5
  import { emitPathPrimitive } from "./path.js";
@@ -6,26 +7,48 @@ import { makeRound } from "./precision.js";
6
7
  import { computeViewBox } from "./view-box.js";
7
8
  //#region src/compile/compile.ts
8
9
  /**
9
- * IR Scene。纯函数。
10
- * 这是所有 adapter 共享的最深层共享代码。
11
- *
12
- * 流程:
13
- * 1. Pass 1:按 IR children 源码顺序处理 Node——计算 layout、注册 nodeIndex、发出 RectPrim/TextPrim、累积 bbox 角点
14
- * 2. Pass 2:处理 Path——解析每个 step 端点(节点 ref 走 boundaryPoint,其他走 resolvePosition),写 d 字符串
15
- * 3. 末端用 computeViewBox 折算最终 viewBox(按 precision 四舍五入)
10
+ * coordinate 注册成 0×0 NodeLayout
11
+ * @description 让后续 path target / `at.of` 引用时 boundaryPoint 命中中心,符合"占位无形状边界"语义
12
+ */
13
+ var coordinateAsLayout = (id, center) => ({
14
+ id,
15
+ shape: "rectangle",
16
+ rect: {
17
+ x: center[0],
18
+ y: center[1],
19
+ width: 0,
20
+ height: 0,
21
+ rotate: 0
22
+ },
23
+ rotateDeg: 0,
24
+ margin: 0,
25
+ textWidth: 0,
26
+ textHeight: 0,
27
+ align: "middle",
28
+ lineHeight: 0,
29
+ fontSize: 0
30
+ });
31
+ /**
32
+ * IR → Scene 纯函数转换,所有 adapter 共享
33
+ * @description Pass 1 处理 Node/coordinate 并注册 nodeIndex、发 primitive、累积 bbox;Pass 2 解析 Path 端点写 d 字符串;末端按 precision 折算 viewBox
16
34
  */
17
35
  var compileToScene = (ir, options = {}) => {
18
36
  const measureText = options.measureText ?? fallbackMeasurer;
19
37
  const viewBoxPadding = options.padding ?? 10;
20
38
  const round = makeRound(options.precision ?? 2);
39
+ const nodeDistance = options.nodeDistance;
21
40
  const primitives = [];
22
41
  const nodeIndex = /* @__PURE__ */ new Map();
23
42
  const allPoints = [];
24
43
  for (const child of ir.children) if (child.type === "node") {
25
- const layout = layoutNode(child, measureText, nodeIndex);
44
+ const layout = layoutNode(child, measureText, nodeIndex, nodeDistance);
26
45
  if (child.id) nodeIndex.set(child.id, layout);
27
46
  for (const prim of emitNodePrimitives(layout, round)) primitives.push(prim);
28
47
  allPoints.push(rect.anchor(layout.rect, "north-west"), rect.anchor(layout.rect, "north-east"), rect.anchor(layout.rect, "south-west"), rect.anchor(layout.rect, "south-east"));
48
+ } else if (child.type === "coordinate") {
49
+ const center = resolvePosition(child.position, nodeIndex, nodeDistance);
50
+ if (!center) throw new Error(`Cannot resolve position for coordinate ${child.id}; polar.origin or at.of may reference an undefined node`);
51
+ nodeIndex.set(child.id, coordinateAsLayout(child.id, center));
29
52
  }
30
53
  for (const child of ir.children) if (child.type === "path") {
31
54
  const result = emitPathPrimitive(child, nodeIndex, round, measureText);
@@ -1,102 +1,104 @@
1
1
  import { Position } from '../geometry/point';
2
2
  import { Rect, RectAnchor } from '../geometry/rect';
3
- import { IRNode, NodeShape } from '../ir';
3
+ import { AtDirection, IRNode, NodeShape } from '../ir';
4
4
  import { ScenePrimitive, TextLine } from '../primitive';
5
5
  import { TextMeasurer } from './text-metrics';
6
6
  export type NodeLayout = {
7
- /** 节点 id(如 IR Node 提供);其他位置可通过 id 引用本节点 */
7
+ /** 节点 id(其他位置可引用) */
8
8
  id?: string;
9
- /** 节点形状——所有几何 / boundaryPoint 计算按 shape 多态 */
9
+ /** 节点形状,所有几何 / boundaryPoint shape 多态 */
10
10
  shape: NodeShape;
11
11
  /**
12
- * 节点视觉边界框(所有 shape 共享语义):
13
- * - rectangle: rect 即矩形本身
14
- * - circle: rect.width = rect.height = 2 × radius(外接正方形)
15
- * - ellipse: rect.width = 2 × rx,rect.height = 2 × ry(外接矩形)
16
- * - diamond: rect.width = 2 × halfA,rect.height = 2 × halfB(外接矩形)
17
- *
18
- * x, y 是几何中心;rotate 是弧度(与 packages/core/AGENTS.md 对齐)。
12
+ * 节点视觉边界框(所有 shape 共享语义)
13
+ * @description rectangle: rect 本身;circle: width=height=2×radius;ellipse: 2×rx,2×ry;diamond: 2×halfA,2×halfB。x,y 是几何中心,rotate 弧度
19
14
  */
20
15
  rect: Rect;
21
- /** IR 中原始的旋转角(度数),保留供 emit 阶段写 SVG transform */
16
+ /** IR 原始旋转角(度数),供 emit SVG transform */
22
17
  rotateDeg: number;
23
- /** 外边距(user units,≥ 0);path 附着到形状外扩 margin 的虚拟边界上 */
18
+ /** 外边距(≥ 0),path 附着到外扩 margin 的虚拟边界 */
24
19
  margin: number;
25
20
  /**
26
- * 节点文本行;undefined 表示无文本,否则非空数组。
27
- * 每行可带覆盖样式(fill / opacity / fontSize / fontFamily / fontWeight / fontStyle);
28
- * 未覆盖的字段在 emit 阶段不写出,由下游走 TextPrim 块级默认。
21
+ * 节点文本行(undefined 表示无文本,否则非空数组)
22
+ * @description 每行可带覆盖样式(fill/opacity/fontSize/fontFamily/fontWeight/fontStyle),未覆盖字段 emit 阶段不写出由下游走块级默认
29
23
  */
30
24
  lines?: Array<TextLine>;
31
- /** 文本块宽度(user units)= max(per-line measureText.width) */
25
+ /** 文本块宽度 = max(per-line measureText.width) */
32
26
  textWidth: number;
33
- /** 文本块高度(user units)≈ lines × lineHeight */
27
+ /** 文本块高度 lines × lineHeight */
34
28
  textHeight: number;
35
- /** 文本对齐(已映射到 SVG textAnchor 三态);emit 时透传给 TextPrim.align */
29
+ /** 文本对齐(已映射到 SVG textAnchor 三态) */
36
30
  align: 'start' | 'middle' | 'end';
37
- /** 行高(user units),已应用默认值;emit 时透传给 TextPrim.lineHeight */
31
+ /** 行高(已应用默认值) */
38
32
  lineHeight: number;
39
- /** 文本字号(user units),已应用默认值 */
33
+ /** 文本字号(已应用默认值) */
40
34
  fontSize: number;
41
- /** 字体族;CSS font-family;emit 时透传给 TextPrim */
35
+ /** 字体族(CSS font-family */
42
36
  fontFamily?: string;
43
- /** 字重;emit 时透传给 TextPrim */
37
+ /** 字重 */
44
38
  fontWeight?: string | number;
45
- /** 字形:normal / italic / oblique;emit 时透传给 TextPrim */
39
+ /** 字形 */
46
40
  fontStyle?: 'normal' | 'italic' | 'oblique';
47
- /** 节点背景色,CSS 颜色字符串;emit 时用 'transparent' 兜底 */
41
+ /** 节点背景色,emit 'transparent' 兜底 */
48
42
  fill?: string;
49
- /** 节点填充透明度 0~1;透传 shape primitive */
43
+ /** 填充透明度 0~1 */
50
44
  fillOpacity?: number;
51
- /** 节点边框色,CSS 颜色字符串;emit 时用 'currentColor' 兜底 */
45
+ /** 节点边框色,emit 'currentColor' 兜底 */
52
46
  stroke?: string;
53
- /** 节点描边透明度 0~1TikZ `draw opacity`,透传 shape primitive */
47
+ /** 描边透明度 0~1TikZ `draw opacity`) */
54
48
  strokeOpacity?: number;
55
- /** 节点边框宽度(user units);emit 时用 1 兜底 */
49
+ /** 边框宽度,emit 1 兜底 */
56
50
  strokeWidth?: number;
57
- /** SVG stroke-dasharray 字符串;compile 已把 dashed / dotted 预设解析为具体 pattern */
51
+ /** SVG stroke-dasharray,已把 dashed/dotted 预设解析为具体 pattern */
58
52
  strokeDasharray?: string;
59
- /** rectangle shape 的圆角半径(user units);非 rect shape 该字段无效 */
53
+ /** rectangle 圆角半径(非 rect shape 无效) */
60
54
  roundedCorners?: number;
61
- /** 文字颜色;emit 时透传给 TextPrim.fill,兜底 'currentColor' */
55
+ /** 文字颜色,emit 'currentColor' 兜底 */
62
56
  textColor?: string;
63
- /** 整节点透明度 0~1;emit 时同时挂 shape 与 text primitive */
57
+ /** 整节点透明度 0~1(同时挂 shape 与 text primitive */
64
58
  opacity?: number;
59
+ /**
60
+ * 已解析的 label 列表
61
+ * @description IR 层 `Node.label` 标准化:position 默认 'above'、distance 默认 DEFAULT_LABEL_DISTANCE、font 从 Node 继承
62
+ */
63
+ labels?: Array<NodeLabelLayout>;
64
+ };
65
+ /** 节点附属标签 layout(layoutNode 已合并默认值与样式继承) */
66
+ export type NodeLabelLayout = {
67
+ text: string;
68
+ /** 8 方向枚举或数字角度 */
69
+ position: AtDirection | number;
70
+ /** 已应用默认值 */
71
+ distance: number;
72
+ textColor?: string;
73
+ opacity?: number;
74
+ fontSize: number;
75
+ fontFamily?: string;
76
+ fontWeight?: string | number;
77
+ fontStyle?: 'normal' | 'italic' | 'oblique';
65
78
  };
66
79
  /**
67
- * 取节点 shape 在 toward 方向上的"附着点"——path 端点贴边用。
68
- * 按 shape 多态:rect / circle / ellipse / diamond 各自的 boundaryPoint。
69
- * margin > 0 时形状先外扩,让 path 在 border 外停 margin 个 user units。
80
+ * 取节点 shape 在 toward 方向的附着点(path 端点贴边用)
81
+ * @description 按 shape 多态调用各自 boundaryPoint;margin > 0 时形状先外扩,让 path border 外停 margin
70
82
  */
71
83
  export declare const boundaryPointOf: (layout: NodeLayout, toward: Position) => Position;
72
84
  /**
73
- * 取节点 shape 的命名 anchor(center / north / east / north-east 等 9 个)。
74
- * **不应用 margin**——TikZ 语义中 explicit anchor 取的是视觉边界点,不涉及 outer sep
75
- * 用于 `'A.north'` 这种语法落点。
85
+ * 取节点 shape 命名 anchor(center / north / east / north-east 等 9 个)
86
+ * @description 不应用 margin——TikZ 语义中 explicit anchor 取视觉边界点不涉及 outer sep;用于 `'A.north'` 落点
76
87
  */
77
88
  export declare const anchorOf: (layout: NodeLayout, name: RectAnchor) => Position;
78
89
  /**
79
- * 取节点 shape 在指定角度方向上的边界点。角度约定与 PolarPosition 一致(度数):
80
- * = +x(east),90° = +y(screen 下方)。
81
- * **不应用 margin**——同 anchorOf。用于 `'A.30'` 这种语法落点。
90
+ * 取节点 shape 在指定角度方向的边界点
91
+ * @description 角度约定与 PolarPosition 一致(度数:0°=+x90°=+y screen 下方);不应用 margin(同 anchorOf);用于 `'A.30'` 落点
82
92
  */
83
93
  export declare const angleBoundaryOf: (layout: NodeLayout, angleDeg: number) => Position;
84
94
  /**
85
- * IR Node 解析为内部 NodeLayout
86
- * - 算出文本度量与 padding 推导出"内框"半轴 (innerHalfW/H)
87
- * - 按 shape 决定外接边界尺寸(circle 取半对角线、ellipse 各 ×√2、diamond 各 ×2)
88
- * - 解析 position(笛卡尔或极坐标)为几何中心
89
- * - IR 的 rotate(度数)转弧度存进 Rect.rotate
90
- * - 透传 margin / 样式属性
95
+ * IR Node 内部 NodeLayout
96
+ * @description 文本度量 + padding 推内框半轴;按 shape 算外接边界(circle 取半对角线、ellipse ×√2、diamond ×2);解析 position 为几何中心;rotate 度数转弧度
91
97
  */
92
- export declare const layoutNode: (node: IRNode, measureText: TextMeasurer, nodeIndex: Map<string, NodeLayout>) => NodeLayout;
98
+ export declare const layoutNode: (node: IRNode, measureText: TextMeasurer, nodeIndex: Map<string, NodeLayout>, nodeDistance?: number) => NodeLayout;
93
99
  /**
94
- * NodeLayout 翻译为 Scene primitives
95
- * - shape 主体:按 shape 分发(rect / ellipse / path)
96
- * - text(如有内容):始终走 TextPrim
97
- * - 若有旋转:外面套一层 GroupPrim 用 SVG `rotate(deg cx cy)` 实现
98
- * (PathPrim 的 diamond 顶点已自带旋转坐标,但 text 需要 group 旋转,
99
- * 所以仍统一用 group 包裹)
100
+ * NodeLayout Scene primitives
101
+ * @description shape 主体按 shape 分发(rect/ellipse/path);text 始终走 TextPrim;有旋转时外层 GroupPrim 用 `rotate(deg cx cy)` 统一包裹(text 必须靠 group 旋转)
100
102
  */
101
103
  export declare const emitNodePrimitives: (layout: NodeLayout, round: (n: number) => number) => Array<ScenePrimitive>;
102
104
  //# sourceMappingURL=node.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/compile/node.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EAAc,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AA8BnD,MAAM,MAAM,UAAU,GAAG;IACvB,2CAA2C;IAC3C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,8CAA8C;IAC9C,KAAK,EAAE,SAAS,CAAC;IACjB;;;;;;;;OAQG;IACH,IAAI,EAAE,IAAI,CAAC;IACX,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACxB,yDAAyD;IACzD,SAAS,EAAE,MAAM,CAAC;IAClB,4CAA4C;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,4DAA4D;IAC5D,KAAK,EAAE,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;IAClC,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,sDAAsD;IACtD,SAAS,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC5C,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qCAAqC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAsCF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ,UAAU,EAAE,QAAQ,QAAQ,KAAG,QAYtE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,QAAQ,GAAI,QAAQ,UAAU,EAAE,MAAM,UAAU,KAAG,QAW/D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ,UAAU,EAAE,UAAU,MAAM,KAAG,QActE,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,UAAU,GACrB,MAAM,MAAM,EACZ,aAAa,YAAY,EACzB,WAAW,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,KACjC,UAgJF,CAAC;AAsEF;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,UAAU,EAClB,OAAO,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,KAC3B,KAAK,CAAC,cAAc,CAoDtB,CAAC"}
1
+ {"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/compile/node.ts"],"names":[],"mappings":"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"}
@@ -8,20 +8,22 @@ var DEFAULT_FONT_SIZE = 14;
8
8
  var DEFAULT_PADDING = 8;
9
9
  var DEFAULT_LINE_HEIGHT_FACTOR = 1.2;
10
10
  var DEG_TO_RAD = Math.PI / 180;
11
+ /** Node label 与 node 边界默认距离(TikZ 默认 0pt 视觉太贴) */
12
+ var DEFAULT_LABEL_DISTANCE = 4;
11
13
  var SQRT2 = Math.SQRT2;
12
- /** dashed 预设:SVG stroke-dasharray "4 2"——4 px 实线 + 2 px 间隙循环 */
14
+ /** dashed 预设:4 px 实线 + 2 px 间隙循环 */
13
15
  var DASHED_PATTERN = "4 2";
14
- /** dotted 预设:SVG stroke-dasharray "1 2"——1 px 圆点 + 2 px 间隙 */
16
+ /** dotted 预设:1 px 圆点 + 2 px 间隙 */
15
17
  var DOTTED_PATTERN = "1 2";
16
- /** 解析 dashed / dotted / dashArray 优先级:dashArray > dashed > dotted */
18
+ /** dashed / dotted / dashArray 优先级:dashArray > dashed > dotted */
17
19
  var resolveDashArray = (dashArray, dashed, dotted) => {
18
20
  if (dashArray !== void 0) return dashArray;
19
21
  if (dashed) return DASHED_PATTERN;
20
22
  if (dotted) return DOTTED_PATTERN;
21
23
  };
22
- /** IR `align` ('left' | 'center' | 'right') → SVG textAnchor ('start' | 'middle' | 'end') */
24
+ /** IR align → SVG textAnchor */
23
25
  var alignToTextAnchor = (a) => a === "left" ? "start" : a === "right" ? "end" : "middle";
24
- /** layout 构造的 Rect(带 margin 扩张) */
26
+ /** layout 构造 Rect(带 margin 扩张) */
25
27
  var rectOf = (layout, marginAdd) => ({
26
28
  x: layout.rect.x,
27
29
  y: layout.rect.y,
@@ -29,14 +31,14 @@ var rectOf = (layout, marginAdd) => ({
29
31
  height: layout.rect.height + 2 * marginAdd,
30
32
  rotate: layout.rect.rotate
31
33
  });
32
- /** layout 构造的 Circle(圆心 + 半径,半径=外接框边长/2 + margin) */
34
+ /** layout 构造 Circle(radius=外接框边长/2 + margin) */
33
35
  var circleOf = (layout, marginAdd) => ({
34
36
  x: layout.rect.x,
35
37
  y: layout.rect.y,
36
38
  radius: layout.rect.width / 2 + marginAdd,
37
39
  rotate: layout.rect.rotate
38
40
  });
39
- /** layout 构造的 Ellipse(rx/ry 各加 margin) */
41
+ /** layout 构造 Ellipse(rx/ry 各加 margin) */
40
42
  var ellipseOf = (layout, marginAdd) => ({
41
43
  x: layout.rect.x,
42
44
  y: layout.rect.y,
@@ -44,7 +46,7 @@ var ellipseOf = (layout, marginAdd) => ({
44
46
  ry: layout.rect.height / 2 + marginAdd,
45
47
  rotate: layout.rect.rotate
46
48
  });
47
- /** layout 构造的 Diamond(halfA/halfB 各加 margin) */
49
+ /** layout 构造 Diamond(halfA/halfB 各加 margin) */
48
50
  var diamondOf = (layout, marginAdd) => ({
49
51
  x: layout.rect.x,
50
52
  y: layout.rect.y,
@@ -53,9 +55,8 @@ var diamondOf = (layout, marginAdd) => ({
53
55
  rotate: layout.rect.rotate
54
56
  });
55
57
  /**
56
- * 取节点 shape 在 toward 方向上的"附着点"——path 端点贴边用。
57
- * 按 shape 多态:rect / circle / ellipse / diamond 各自的 boundaryPoint。
58
- * margin > 0 时形状先外扩,让 path 在 border 外停 margin 个 user units。
58
+ * 取节点 shape 在 toward 方向的附着点(path 端点贴边用)
59
+ * @description 按 shape 多态调用各自 boundaryPoint;margin > 0 时形状先外扩,让 path border 外停 margin
59
60
  */
60
61
  var boundaryPointOf = (layout, toward) => {
61
62
  const m = layout.margin;
@@ -67,9 +68,8 @@ var boundaryPointOf = (layout, toward) => {
67
68
  }
68
69
  };
69
70
  /**
70
- * 取节点 shape 的命名 anchor(center / north / east / north-east 等 9 个)。
71
- * **不应用 margin**——TikZ 语义中 explicit anchor 取的是视觉边界点,不涉及 outer sep
72
- * 用于 `'A.north'` 这种语法落点。
71
+ * 取节点 shape 命名 anchor(center / north / east / north-east 等 9 个)
72
+ * @description 不应用 margin——TikZ 语义中 explicit anchor 取视觉边界点不涉及 outer sep;用于 `'A.north'` 落点
73
73
  */
74
74
  var anchorOf = (layout, name) => {
75
75
  switch (layout.shape) {
@@ -79,10 +79,58 @@ var anchorOf = (layout, name) => {
79
79
  case "diamond": return diamond.anchor(diamondOf(layout, 0), name);
80
80
  }
81
81
  };
82
+ /** 8 方向 label position → (anchorName, 单位向量);above 视觉上方即 y 减小 */
83
+ var LABEL_DIRECTION_MAP = {
84
+ above: {
85
+ anchor: "north",
86
+ vec: [0, -1]
87
+ },
88
+ below: {
89
+ anchor: "south",
90
+ vec: [0, 1]
91
+ },
92
+ left: {
93
+ anchor: "west",
94
+ vec: [-1, 0]
95
+ },
96
+ right: {
97
+ anchor: "east",
98
+ vec: [1, 0]
99
+ },
100
+ "above-left": {
101
+ anchor: "north-west",
102
+ vec: [-Math.SQRT1_2, -Math.SQRT1_2]
103
+ },
104
+ "above-right": {
105
+ anchor: "north-east",
106
+ vec: [Math.SQRT1_2, -Math.SQRT1_2]
107
+ },
108
+ "below-left": {
109
+ anchor: "south-west",
110
+ vec: [-Math.SQRT1_2, Math.SQRT1_2]
111
+ },
112
+ "below-right": {
113
+ anchor: "south-east",
114
+ vec: [Math.SQRT1_2, Math.SQRT1_2]
115
+ }
116
+ };
117
+ /**
118
+ * 算 label 中心点
119
+ * @description 8 方向:节点对应 anchor 出发按单位向量 × distance 外推;数字角度:先取 angleBoundary 边界点再沿 (cos,sin) × distance 外推
120
+ */
121
+ var labelCenter = (layout, label) => {
122
+ if (typeof label.position === "number") {
123
+ const rad = label.position * Math.PI / 180;
124
+ const [bx, by] = angleBoundaryOf(layout, label.position);
125
+ return [bx + Math.cos(rad) * label.distance, by + Math.sin(rad) * label.distance];
126
+ }
127
+ const { anchor, vec } = LABEL_DIRECTION_MAP[label.position];
128
+ const [bx, by] = anchorOf(layout, anchor);
129
+ return [bx + vec[0] * label.distance, by + vec[1] * label.distance];
130
+ };
82
131
  /**
83
- * 取节点 shape 在指定角度方向上的边界点。角度约定与 PolarPosition 一致(度数):
84
- * = +x(east),90° = +y(screen 下方)。
85
- * **不应用 margin**——同 anchorOf。用于 `'A.30'` 这种语法落点。
132
+ * 取节点 shape 在指定角度方向的边界点
133
+ * @description 角度约定与 PolarPosition 一致(度数:0°=+x90°=+y screen 下方);不应用 margin(同 anchorOf);用于 `'A.30'` 落点
86
134
  */
87
135
  var angleBoundaryOf = (layout, angleDeg) => {
88
136
  const rad = angleDeg * Math.PI / 180;
@@ -95,14 +143,10 @@ var angleBoundaryOf = (layout, angleDeg) => {
95
143
  }
96
144
  };
97
145
  /**
98
- * IR Node 解析为内部 NodeLayout
99
- * - 算出文本度量与 padding 推导出"内框"半轴 (innerHalfW/H)
100
- * - 按 shape 决定外接边界尺寸(circle 取半对角线、ellipse 各 ×√2、diamond 各 ×2)
101
- * - 解析 position(笛卡尔或极坐标)为几何中心
102
- * - IR 的 rotate(度数)转弧度存进 Rect.rotate
103
- * - 透传 margin / 样式属性
146
+ * IR Node 内部 NodeLayout
147
+ * @description 文本度量 + padding 推内框半轴;按 shape 算外接边界(circle 取半对角线、ellipse ×√2、diamond ×2);解析 position 为几何中心;rotate 度数转弧度
104
148
  */
105
- var layoutNode = (node, measureText, nodeIndex) => {
149
+ var layoutNode = (node, measureText, nodeIndex, nodeDistance) => {
106
150
  const sx = node.xScale ?? node.scale ?? 1;
107
151
  const sy = node.yScale ?? node.scale ?? 1;
108
152
  const fontScale = Math.min(sx, sy);
@@ -173,8 +217,22 @@ var layoutNode = (node, measureText, nodeIndex) => {
173
217
  break;
174
218
  }
175
219
  const rotateDeg = node.rotate ?? 0;
176
- const center = resolvePosition(node.position, nodeIndex);
177
- if (!center) throw new Error(`Cannot resolve position for node ${node.id ?? "(unnamed)"}; polar.origin may reference an undefined node`);
220
+ const center = resolvePosition(node.position, nodeIndex, nodeDistance);
221
+ if (!center) throw new Error(`Cannot resolve position for node ${node.id ?? "(unnamed)"}; polar.origin or at.of may reference an undefined node`);
222
+ const labels = (node.label === void 0 ? void 0 : Array.isArray(node.label) ? node.label : [node.label])?.map((lab) => {
223
+ const labFont = lab.font;
224
+ return {
225
+ text: lab.text,
226
+ position: lab.position ?? "above",
227
+ distance: lab.distance ?? DEFAULT_LABEL_DISTANCE,
228
+ textColor: lab.textColor ?? node.textColor,
229
+ opacity: lab.opacity,
230
+ fontSize: (labFont?.size ?? baseFontSize) * fontScale,
231
+ fontFamily: labFont?.family ?? fontFamily,
232
+ fontWeight: labFont?.weight ?? fontWeight,
233
+ fontStyle: labFont?.style ?? fontStyle
234
+ };
235
+ });
178
236
  return {
179
237
  id: node.id,
180
238
  shape,
@@ -204,10 +262,11 @@ var layoutNode = (node, measureText, nodeIndex) => {
204
262
  strokeDasharray: resolveDashArray(node.dashArray, node.dashed, node.dotted),
205
263
  roundedCorners: node.roundedCorners,
206
264
  textColor: node.textColor,
207
- opacity: node.opacity
265
+ opacity: node.opacity,
266
+ labels
208
267
  };
209
268
  };
210
- /** rectangle shape RectPrim */
269
+ /** rectangle RectPrim */
211
270
  var emitRectShape = (layout, round) => {
212
271
  const halfW = layout.rect.width / 2;
213
272
  const halfH = layout.rect.height / 2;
@@ -227,7 +286,7 @@ var emitRectShape = (layout, round) => {
227
286
  opacity: layout.opacity
228
287
  };
229
288
  };
230
- /** circle / ellipse shape EllipsePrim(圆形 rx=ry) */
289
+ /** circle/ellipse EllipsePrim(圆形 rx=ry) */
231
290
  var emitEllipseShape = (layout, round) => ({
232
291
  type: "ellipse",
233
292
  cx: round(layout.rect.x),
@@ -242,7 +301,7 @@ var emitEllipseShape = (layout, round) => ({
242
301
  strokeDasharray: layout.strokeDasharray,
243
302
  opacity: layout.opacity
244
303
  });
245
- /** diamond shape PathPrim(4 顶点 + Z 闭合) */
304
+ /** diamond PathPrim(4 顶点 + close 闭合) */
246
305
  var emitDiamondShape = (layout, round) => {
247
306
  const diam = diamondOf(layout, 0);
248
307
  const e = diamond.anchor(diam, "east");
@@ -251,7 +310,25 @@ var emitDiamondShape = (layout, round) => {
251
310
  const s = diamond.anchor(diam, "south");
252
311
  return {
253
312
  type: "path",
254
- d: `M ${round(e[0])} ${round(e[1])} L ${round(n[0])} ${round(n[1])} L ${round(w[0])} ${round(w[1])} L ${round(s[0])} ${round(s[1])} Z`,
313
+ commands: [
314
+ {
315
+ kind: "move",
316
+ to: [round(e[0]), round(e[1])]
317
+ },
318
+ {
319
+ kind: "line",
320
+ to: [round(n[0]), round(n[1])]
321
+ },
322
+ {
323
+ kind: "line",
324
+ to: [round(w[0]), round(w[1])]
325
+ },
326
+ {
327
+ kind: "line",
328
+ to: [round(s[0]), round(s[1])]
329
+ },
330
+ { kind: "close" }
331
+ ],
255
332
  fill: layout.fill ?? "transparent",
256
333
  fillOpacity: layout.fillOpacity,
257
334
  stroke: layout.stroke ?? "currentColor",
@@ -262,12 +339,8 @@ var emitDiamondShape = (layout, round) => {
262
339
  };
263
340
  };
264
341
  /**
265
- * NodeLayout 翻译为 Scene primitives
266
- * - shape 主体:按 shape 分发(rect / ellipse / path)
267
- * - text(如有内容):始终走 TextPrim
268
- * - 若有旋转:外面套一层 GroupPrim 用 SVG `rotate(deg cx cy)` 实现
269
- * (PathPrim 的 diamond 顶点已自带旋转坐标,但 text 需要 group 旋转,
270
- * 所以仍统一用 group 包裹)
342
+ * NodeLayout Scene primitives
343
+ * @description shape 主体按 shape 分发(rect/ellipse/path);text 始终走 TextPrim;有旋转时外层 GroupPrim 用 `rotate(deg cx cy)` 统一包裹(text 必须靠 group 旋转)
271
344
  */
272
345
  var emitNodePrimitives = (layout, round) => {
273
346
  let shapePrim;
@@ -305,14 +378,39 @@ var emitNodePrimitives = (layout, round) => {
305
378
  measuredHeight: round(layout.textHeight)
306
379
  });
307
380
  }
381
+ if (layout.labels) for (const lab of layout.labels) {
382
+ const [lx, ly] = labelCenter(layout, lab);
383
+ inner.push({
384
+ type: "text",
385
+ x: round(lx),
386
+ y: round(ly),
387
+ lines: [{ text: lab.text }],
388
+ fontSize: lab.fontSize,
389
+ fontFamily: lab.fontFamily,
390
+ fontWeight: lab.fontWeight,
391
+ fontStyle: lab.fontStyle,
392
+ align: "middle",
393
+ baseline: "middle",
394
+ lineHeight: round(lab.fontSize * DEFAULT_LINE_HEIGHT_FACTOR),
395
+ fill: lab.textColor ?? "currentColor",
396
+ opacity: lab.opacity ?? layout.opacity,
397
+ measuredWidth: 0,
398
+ measuredHeight: round(lab.fontSize)
399
+ });
400
+ }
308
401
  if (layout.rotateDeg === 0) return inner;
309
402
  return [{
310
403
  type: "group",
311
- transform: `rotate(${round(layout.rotateDeg)} ${round(layout.rect.x)} ${round(layout.rect.y)})`,
404
+ transforms: [{
405
+ kind: "rotate",
406
+ degrees: round(layout.rotateDeg),
407
+ cx: round(layout.rect.x),
408
+ cy: round(layout.rect.y)
409
+ }],
312
410
  children: inner
313
411
  }];
314
412
  };
315
- /** 返回 layout 的"未旋转"副本——用于先把 diamond 顶点按未旋转算,再由外层 group 统一旋转 */
413
+ /** layout 的"未旋转"副本,让 diamond 顶点先按未旋转算,外层 group 统一旋转 */
316
414
  var unrotated = (layout) => ({
317
415
  ...layout,
318
416
  rect: {
@@ -1,5 +1,5 @@
1
1
  import { RectAnchor } from '../geometry/rect';
2
- /** 解析后的节点 ref 三态 */
2
+ /** 节点 ref 解析后三态 */
3
3
  export type ParsedNodeRef = {
4
4
  kind: 'node';
5
5
  id: string;
@@ -13,13 +13,8 @@ export type ParsedNodeRef = {
13
13
  angle: number;
14
14
  };
15
15
  /**
16
- * 解析节点 ref 字符串。
17
- *
18
- * - 不带 `.`:node(auto-clip)
19
- * - 带 `.` 后纯数字:angle(toward 方向上的边界点,与 PolarPosition 同角度约定)
20
- * - 带 `.` 后字母 / 连字符:anchor(命中 ANCHOR_NAMES 才合法,否则抛错)
21
- *
22
- * 抛错路径:未知 anchor 名(避免静默吞掉拼写错误)。
16
+ * 解析节点 ref 字符串
17
+ * @description 不带 `.`→node(auto-clip);带 `.` 后纯数字→angle;带 `.` 后字母/连字符→anchor(不命中 ANCHOR_NAMES 抛错避免静默吞拼写错误)
23
18
  */
24
19
  export declare const parseNodeRef: (s: string) => ParsedNodeRef;
25
20
  //# sourceMappingURL=parseTarget.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"parseTarget.d.ts","sourceRoot":"","sources":["../../../src/compile/parseTarget.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQjE,oBAAoB;AACpB,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC5B;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,GAClD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,GAAI,GAAG,MAAM,KAAG,aAcxC,CAAC"}
1
+ {"version":3,"file":"parseTarget.d.ts","sourceRoot":"","sources":["../../../src/compile/parseTarget.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQjE,mBAAmB;AACnB,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC5B;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,GAClD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,GAAG,MAAM,KAAG,aAcxC,CAAC"}
@@ -1,28 +1,16 @@
1
1
  import { RECT_ANCHORS } from "../geometry/rect.js";
2
2
  //#region src/compile/parseTarget.ts
3
3
  /**
4
- * 节点 ref 字符串扩展语法(ADR-0004):
5
- *
6
- * `'A'` → 节点 A,由 path 自动 boundary clip(auto 模式)
7
- * `'A.<name>'` → 节点 A 的命名 anchor(center/north/south/east/west/north-east/...)
8
- * `'A.<deg>'` → 节点 A 在 degree 角度方向上的边界点(同 PolarPosition 角度约定)
9
- *
10
- * id 约束:`[A-Za-z_][\w-]*`——禁数字开头、禁含 `.`(与 anchor 分隔符冲突);
11
- * anchor 名只接受 alpha.1 首批 9 个 RECT_ANCHORS(其余如 'text' / 'base' / 'mid'
12
- * 留 alpha.2 + 字体改造时再支持);角度纯数字(含可选 `.`/`-`)。
4
+ * 节点 ref 字符串扩展语法
5
+ * @description `'A'`→节点(auto boundary clip);`'A.<name>'`→命名 anchor(center/north/.../north-east);`'A.<deg>'`→角度方向边界点(同 PolarPosition 约定)。id 约束 `[A-Za-z_][\w-]*` 禁数字开头与 `.`;角度纯数字含可选 `.`/`-`
13
6
  */
14
- /** alpha.1 支持的 anchor 名集合(RECT_ANCHORS 的 9 个值) */
7
+ /** RECT_ANCHORS 的 9 anchor 名 */
15
8
  var ANCHOR_NAMES = new Set(Object.values(RECT_ANCHORS));
16
- /** 纯数字(可选小数 / 负号),用于识别 `A.30` / `A.-45` / `A.180.5` */
9
+ /** 纯数字识别 `A.30` / `A.-45` / `A.180.5` */
17
10
  var ANGLE_RE = /^-?\d+(\.\d+)?$/;
18
11
  /**
19
- * 解析节点 ref 字符串。
20
- *
21
- * - 不带 `.`:node(auto-clip)
22
- * - 带 `.` 后纯数字:angle(toward 方向上的边界点,与 PolarPosition 同角度约定)
23
- * - 带 `.` 后字母 / 连字符:anchor(命中 ANCHOR_NAMES 才合法,否则抛错)
24
- *
25
- * 抛错路径:未知 anchor 名(避免静默吞掉拼写错误)。
12
+ * 解析节点 ref 字符串
13
+ * @description 不带 `.`→node(auto-clip);带 `.` 后纯数字→angle;带 `.` 后字母/连字符→anchor(不命中 ANCHOR_NAMES 抛错避免静默吞拼写错误)
26
14
  */
27
15
  var parseNodeRef = (s) => {
28
16
  const dot = s.indexOf(".");
@@ -37,7 +25,7 @@ var parseNodeRef = (s) => {
37
25
  id,
38
26
  angle: Number(tail)
39
27
  };
40
- if (!ANCHOR_NAMES.has(tail)) throw new Error(`parseNodeRef: unknown anchor '${tail}' in '${s}' (alpha.1 supports: ${[...ANCHOR_NAMES].join(", ")})`);
28
+ if (!ANCHOR_NAMES.has(tail)) throw new Error(`parseNodeRef: unknown anchor '${tail}' in '${s}' (supports: ${[...ANCHOR_NAMES].join(", ")})`);
41
29
  return {
42
30
  kind: "anchor",
43
31
  id,