@knowvah/dot-engine 1.6.0 → 1.7.0

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 (45) hide show
  1. package/dist/api/geometry.d.ts +5 -2
  2. package/dist/api/geometry.d.ts.map +1 -1
  3. package/dist/api.js +2 -4
  4. package/dist/api.js.map +2 -2
  5. package/dist/cdt/splay.d.ts.map +1 -1
  6. package/dist/common/htmltable-emit-rules.d.ts.map +1 -1
  7. package/dist/common/shape-clip.d.ts +17 -0
  8. package/dist/common/shape-clip.d.ts.map +1 -0
  9. package/dist/index.js +599 -578
  10. package/dist/index.js.map +4 -4
  11. package/dist/layout/dot/edge-route.d.ts.map +1 -1
  12. package/dist/layout/dot/pack-components.d.ts.map +1 -1
  13. package/dist/layout/dot/sameport.d.ts +1 -13
  14. package/dist/layout/dot/sameport.d.ts.map +1 -1
  15. package/dist/layout/dot/self-loop.d.ts.map +1 -1
  16. package/dist/layout/dot/splines-groups.d.ts.map +1 -1
  17. package/dist/layout/neato/index.d.ts.map +1 -1
  18. package/dist/layout/neato/init.d.ts.map +1 -1
  19. package/dist/ortho/ortho-route.d.ts.map +1 -1
  20. package/dist/render/dot.d.ts.map +1 -1
  21. package/dist/render.js +1209 -1186
  22. package/dist/render.js.map +4 -4
  23. package/package.json +14 -5
  24. package/src/api/geometry.ts +8 -7
  25. package/src/cdt/splay.ts +0 -2
  26. package/src/common/arm-pow.ts +3 -3
  27. package/src/common/htmltable-emit-rules.ts +0 -10
  28. package/src/common/random.ts +2 -2
  29. package/src/common/shape-clip.ts +48 -0
  30. package/src/common/spline-midpoint.ts +1 -1
  31. package/src/layout/circo/circular.ts +1 -1
  32. package/src/layout/dot/edge-route.ts +18 -6
  33. package/src/layout/dot/ns.ts +1 -1
  34. package/src/layout/dot/pack-components.ts +0 -1
  35. package/src/layout/dot/sameport.ts +1 -25
  36. package/src/layout/dot/self-loop.ts +4 -2
  37. package/src/layout/dot/splines-flat-labeled.ts +1 -1
  38. package/src/layout/dot/splines-groups.ts +8 -1
  39. package/src/layout/neato/cdt-surface.ts +1 -1
  40. package/src/layout/neato/index.ts +0 -3
  41. package/src/layout/neato/init.ts +0 -1
  42. package/src/ortho/ortho-route.ts +1 -3
  43. package/src/ortho/trap-query.ts +1 -1
  44. package/src/render/dot.ts +3 -10
  45. package/src/vpsc/Solver.ts +1 -1
@@ -83,7 +83,10 @@ export interface NodeGeometry {
83
83
  *
84
84
  * `points` concatenates all bezier control points from the edge spline,
85
85
  * in order. An edge with no routed spline produces an empty `points` array.
86
- * `label` is present only when the edge carries a centre label.
86
+ * `label` is present only when the edge carries a centre label that layout
87
+ * placed. It carries the same `lp->set` gate as the labels below: dot's
88
+ * label search can leave a centre label unplaced (sentinel pos), and
89
+ * `render()` then declines to draw it.
87
90
  *
88
91
  * `tailLabel`/`headLabel` are the `taillabel`/`headlabel` port labels. They
89
92
  * are present only once the layout has actually *placed* them (C `lp->set`),
@@ -139,7 +142,7 @@ export interface EdgeGeometry {
139
142
  x: number;
140
143
  y: number;
141
144
  };
142
- /** Centre edge label position, if present. @see lib/common/types.h:ED_label */
145
+ /** Centre edge label position, if placed. @see lib/common/types.h:ED_label */
143
146
  label?: {
144
147
  x: number;
145
148
  y: number;
@@ -1 +1 @@
1
- {"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/api/geometry.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAU/C,+CAA+C;AAC/C,MAAM,MAAM,KAAK,GAAG,IAAI,GAAG,MAAM,CAAC;AAElC;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,4DAA4D;IAC5D,MAAM,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACnC;;;OAGG;IACH,EAAE,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B;;;OAGG;IACH,EAAE,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,+EAA+E;IAC/E,KAAK,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjC;;;OAGG;IACH,SAAS,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC;;;OAGG;IACH,SAAS,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC;;;OAGG;IACH,MAAM,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,WAAW,eAAe;IAC9B,gEAAgE;IAChE,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,KAAK,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CACjE;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAsLD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,eAAe,GAAG,cAAc,CAuB1E"}
1
+ {"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/api/geometry.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAU/C,+CAA+C;AAC/C,MAAM,MAAM,KAAK,GAAG,IAAI,GAAG,MAAM,CAAC;AAElC;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,4DAA4D;IAC5D,MAAM,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACnC;;;OAGG;IACH,EAAE,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B;;;OAGG;IACH,EAAE,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,8EAA8E;IAC9E,KAAK,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjC;;;OAGG;IACH,SAAS,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC;;;OAGG;IACH,SAAS,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC;;;OAGG;IACH,MAAM,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,WAAW,eAAe;IAC9B,gEAAgE;IAChE,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,KAAK,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CACjE;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAoLD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,eAAe,GAAG,cAAc,CAuB1E"}
package/dist/api.js CHANGED
@@ -706,10 +706,8 @@ function snapshotEdge(edge, flipY) {
706
706
  head: edge.head.name,
707
707
  points: collectEdgePoints(edge, flipY)
708
708
  };
709
- const lbl = edge.info.label;
710
- if (lbl !== void 0) {
711
- geom.label = { x: lbl.pos.x, y: flipY(lbl.pos.y) };
712
- }
709
+ const label = placedLabelPos(edge.info.label, flipY);
710
+ if (label !== void 0) geom.label = label;
713
711
  const tailLabel = placedLabelPos(edge.info.tail_label, flipY);
714
712
  if (tailLabel !== void 0) geom.tailLabel = tailLabel;
715
713
  const headLabel = placedLabelPos(edge.info.head_label, flipY);