@motionscript/math 0.1.0-alpha.5 → 0.1.0-alpha.7

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 (233) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/README.md +39 -33
  3. package/dist/annotate/angle-mark.d.ts +77 -27
  4. package/dist/annotate/angle-mark.d.ts.map +1 -1
  5. package/dist/annotate/angle-mark.js +80 -115
  6. package/dist/annotate/angle-mark.js.map +1 -1
  7. package/dist/annotate/curly-brace.d.ts +94 -25
  8. package/dist/annotate/curly-brace.d.ts.map +1 -1
  9. package/dist/annotate/curly-brace.js +85 -100
  10. package/dist/annotate/curly-brace.js.map +1 -1
  11. package/dist/annotate/emphasis-mark.d.ts +69 -9
  12. package/dist/annotate/emphasis-mark.d.ts.map +1 -1
  13. package/dist/annotate/emphasis-mark.js +33 -34
  14. package/dist/annotate/emphasis-mark.js.map +1 -1
  15. package/dist/browser/chunks/chunk-ABYBW64J.js +2 -0
  16. package/dist/browser/chunks/chunk-ABYBW64J.js.map +7 -0
  17. package/dist/browser/chunks/chunk-K77KLQX4.js +2 -0
  18. package/dist/browser/chunks/chunk-K77KLQX4.js.map +7 -0
  19. package/dist/browser/index.js +1 -1
  20. package/dist/browser/index.js.map +3 -3
  21. package/dist/browser/kit.js +1 -1
  22. package/dist/browser/manifest.json +1 -1
  23. package/dist/browser/tex.js +1 -1
  24. package/dist/browser/tex.js.map +2 -2
  25. package/dist/engine.d.ts +26 -19
  26. package/dist/engine.d.ts.map +1 -1
  27. package/dist/engine.js +17 -14
  28. package/dist/engine.js.map +1 -1
  29. package/dist/kit/component.d.ts +51 -0
  30. package/dist/kit/component.d.ts.map +1 -0
  31. package/dist/kit/component.js +30 -0
  32. package/dist/kit/component.js.map +1 -0
  33. package/dist/kit/curve.d.ts +22 -11
  34. package/dist/kit/curve.d.ts.map +1 -1
  35. package/dist/kit/curve.js +25 -18
  36. package/dist/kit/curve.js.map +1 -1
  37. package/dist/kit/field-mark.d.ts +56 -35
  38. package/dist/kit/field-mark.d.ts.map +1 -1
  39. package/dist/kit/field-mark.js +100 -120
  40. package/dist/kit/field-mark.js.map +1 -1
  41. package/dist/kit/follow.d.ts +67 -29
  42. package/dist/kit/follow.d.ts.map +1 -1
  43. package/dist/kit/follow.js +114 -110
  44. package/dist/kit/follow.js.map +1 -1
  45. package/dist/kit/furniture.d.ts +3 -1
  46. package/dist/kit/furniture.d.ts.map +1 -1
  47. package/dist/kit/furniture.js +5 -0
  48. package/dist/kit/furniture.js.map +1 -1
  49. package/dist/kit/graph.d.ts +46 -0
  50. package/dist/kit/graph.d.ts.map +1 -0
  51. package/dist/kit/graph.js +90 -0
  52. package/dist/kit/graph.js.map +1 -0
  53. package/dist/kit/mark.d.ts +64 -39
  54. package/dist/kit/mark.d.ts.map +1 -1
  55. package/dist/kit/mark.js +80 -96
  56. package/dist/kit/mark.js.map +1 -1
  57. package/dist/kit/place.d.ts +10 -8
  58. package/dist/kit/place.d.ts.map +1 -1
  59. package/dist/kit/place.js +28 -30
  60. package/dist/kit/place.js.map +1 -1
  61. package/dist/kit/system.d.ts +27 -29
  62. package/dist/kit/system.d.ts.map +1 -1
  63. package/dist/kit/system.js +62 -58
  64. package/dist/kit/system.js.map +1 -1
  65. package/dist/kit/withdrawn.d.ts +3 -3
  66. package/dist/kit/withdrawn.js +3 -3
  67. package/dist/kit/withdrawn.js.map +1 -1
  68. package/dist/marks/curve-area.d.ts +37 -18
  69. package/dist/marks/curve-area.d.ts.map +1 -1
  70. package/dist/marks/curve-area.js +50 -73
  71. package/dist/marks/curve-area.js.map +1 -1
  72. package/dist/marks/drop-lines.d.ts +45 -10
  73. package/dist/marks/drop-lines.d.ts.map +1 -1
  74. package/dist/marks/drop-lines.js +37 -52
  75. package/dist/marks/drop-lines.js.map +1 -1
  76. package/dist/marks/plot-point.d.ts +56 -20
  77. package/dist/marks/plot-point.d.ts.map +1 -1
  78. package/dist/marks/plot-point.js +65 -91
  79. package/dist/marks/plot-point.js.map +1 -1
  80. package/dist/marks/riemann-sum.d.ts +47 -26
  81. package/dist/marks/riemann-sum.d.ts.map +1 -1
  82. package/dist/marks/riemann-sum.js +57 -85
  83. package/dist/marks/riemann-sum.js.map +1 -1
  84. package/dist/marks/tangent-line.d.ts +58 -14
  85. package/dist/marks/tangent-line.d.ts.map +1 -1
  86. package/dist/marks/tangent-line.js +73 -87
  87. package/dist/marks/tangent-line.js.map +1 -1
  88. package/dist/marks/vector-arrow.d.ts +48 -20
  89. package/dist/marks/vector-arrow.d.ts.map +1 -1
  90. package/dist/marks/vector-arrow.js +58 -78
  91. package/dist/marks/vector-arrow.js.map +1 -1
  92. package/dist/nodes.d.ts +13 -5
  93. package/dist/nodes.d.ts.map +1 -1
  94. package/dist/nodes.js +0 -6
  95. package/dist/nodes.js.map +1 -1
  96. package/dist/plots/function-plot.d.ts +135 -43
  97. package/dist/plots/function-plot.d.ts.map +1 -1
  98. package/dist/plots/function-plot.js +146 -177
  99. package/dist/plots/function-plot.js.map +1 -1
  100. package/dist/plots/points-plot.d.ts +55 -19
  101. package/dist/plots/points-plot.d.ts.map +1 -1
  102. package/dist/plots/points-plot.js +31 -58
  103. package/dist/plots/points-plot.js.map +1 -1
  104. package/dist/plots/stream-lines.d.ts +60 -19
  105. package/dist/plots/stream-lines.d.ts.map +1 -1
  106. package/dist/plots/stream-lines.js +60 -79
  107. package/dist/plots/stream-lines.js.map +1 -1
  108. package/dist/plots/traced-path.d.ts +54 -15
  109. package/dist/plots/traced-path.d.ts.map +1 -1
  110. package/dist/plots/traced-path.js +33 -48
  111. package/dist/plots/traced-path.js.map +1 -1
  112. package/dist/plots/vector-field.d.ts +48 -11
  113. package/dist/plots/vector-field.d.ts.map +1 -1
  114. package/dist/plots/vector-field.js +50 -64
  115. package/dist/plots/vector-field.js.map +1 -1
  116. package/dist/structures/network-graph.d.ts +140 -49
  117. package/dist/structures/network-graph.d.ts.map +1 -1
  118. package/dist/structures/network-graph.js +168 -217
  119. package/dist/structures/network-graph.js.map +1 -1
  120. package/dist/structures/sample-space.d.ts +90 -38
  121. package/dist/structures/sample-space.d.ts.map +1 -1
  122. package/dist/structures/sample-space.js +132 -170
  123. package/dist/structures/sample-space.js.map +1 -1
  124. package/dist/systems/axes2d.d.ts +159 -37
  125. package/dist/systems/axes2d.d.ts.map +1 -1
  126. package/dist/systems/axes2d.js +147 -183
  127. package/dist/systems/axes2d.js.map +1 -1
  128. package/dist/systems/number-line.d.ts +80 -28
  129. package/dist/systems/number-line.d.ts.map +1 -1
  130. package/dist/systems/number-line.js +82 -118
  131. package/dist/systems/number-line.js.map +1 -1
  132. package/dist/systems/number-plane.d.ts +140 -31
  133. package/dist/systems/number-plane.d.ts.map +1 -1
  134. package/dist/systems/number-plane.js +142 -149
  135. package/dist/systems/number-plane.js.map +1 -1
  136. package/dist/systems/polar-plane.d.ts +76 -26
  137. package/dist/systems/polar-plane.d.ts.map +1 -1
  138. package/dist/systems/polar-plane.js +107 -133
  139. package/dist/systems/polar-plane.js.map +1 -1
  140. package/dist/tex/index.d.ts.map +1 -1
  141. package/dist/tex/index.js +1 -0
  142. package/dist/tex/index.js.map +1 -1
  143. package/dist/tex/matrix.d.ts +88 -18
  144. package/dist/tex/matrix.d.ts.map +1 -1
  145. package/dist/tex/matrix.js +33 -50
  146. package/dist/tex/matrix.js.map +1 -1
  147. package/dist/tex/node.d.ts +84 -201
  148. package/dist/tex/node.d.ts.map +1 -1
  149. package/dist/tex/node.js +23 -593
  150. package/dist/tex/node.js.map +1 -1
  151. package/dist/tex/typeset.d.ts +133 -0
  152. package/dist/tex/typeset.d.ts.map +1 -0
  153. package/dist/tex/typeset.js +403 -0
  154. package/dist/tex/typeset.js.map +1 -0
  155. package/dist/three/axes3d.d.ts +214 -54
  156. package/dist/three/axes3d.d.ts.map +1 -1
  157. package/dist/three/axes3d.js +163 -204
  158. package/dist/three/axes3d.js.map +1 -1
  159. package/dist/three/curve-plot3d.d.ts +108 -42
  160. package/dist/three/curve-plot3d.d.ts.map +1 -1
  161. package/dist/three/curve-plot3d.js +97 -132
  162. package/dist/three/curve-plot3d.js.map +1 -1
  163. package/dist/three/entries.d.ts +17 -0
  164. package/dist/three/entries.d.ts.map +1 -0
  165. package/dist/three/entries.js +15 -0
  166. package/dist/three/entries.js.map +1 -0
  167. package/dist/three/plot-point3d.d.ts +85 -12
  168. package/dist/three/plot-point3d.d.ts.map +1 -1
  169. package/dist/three/plot-point3d.js +27 -53
  170. package/dist/three/plot-point3d.js.map +1 -1
  171. package/dist/three/space.d.ts +17 -2
  172. package/dist/three/space.d.ts.map +1 -1
  173. package/dist/three/space.js +19 -8
  174. package/dist/three/space.js.map +1 -1
  175. package/dist/three/surface-plot3d.d.ts +176 -49
  176. package/dist/three/surface-plot3d.d.ts.map +1 -1
  177. package/dist/three/surface-plot3d.js +227 -261
  178. package/dist/three/surface-plot3d.js.map +1 -1
  179. package/dist/three/vector-arrow3d.d.ts +87 -16
  180. package/dist/three/vector-arrow3d.d.ts.map +1 -1
  181. package/dist/three/vector-arrow3d.js +48 -67
  182. package/dist/three/vector-arrow3d.js.map +1 -1
  183. package/package.json +4 -4
  184. package/src/annotate/angle-mark.ts +95 -105
  185. package/src/annotate/curly-brace.ts +107 -85
  186. package/src/annotate/emphasis-mark.ts +55 -26
  187. package/src/engine.ts +35 -21
  188. package/src/kit/component.ts +57 -0
  189. package/src/kit/curve.ts +38 -20
  190. package/src/kit/field-mark.ts +124 -108
  191. package/src/kit/follow.ts +146 -120
  192. package/src/kit/furniture.ts +6 -1
  193. package/src/kit/graph.ts +116 -0
  194. package/src/kit/mark.ts +135 -114
  195. package/src/kit/place.ts +32 -56
  196. package/src/kit/system.ts +77 -71
  197. package/src/kit/withdrawn.ts +3 -3
  198. package/src/marks/curve-area.ts +65 -65
  199. package/src/marks/drop-lines.ts +50 -42
  200. package/src/marks/plot-point.ts +77 -82
  201. package/src/marks/riemann-sum.ts +73 -72
  202. package/src/marks/tangent-line.ts +87 -71
  203. package/src/marks/vector-arrow.ts +73 -73
  204. package/src/nodes.ts +41 -5
  205. package/src/plots/function-plot.ts +155 -171
  206. package/src/plots/points-plot.ts +46 -50
  207. package/src/plots/stream-lines.ts +75 -66
  208. package/src/plots/traced-path.ts +51 -33
  209. package/src/plots/vector-field.ts +68 -49
  210. package/src/structures/network-graph.ts +168 -185
  211. package/src/structures/sample-space.ts +149 -148
  212. package/src/systems/axes2d.ts +165 -156
  213. package/src/systems/number-line.ts +91 -92
  214. package/src/systems/number-plane.ts +149 -120
  215. package/src/systems/polar-plane.ts +117 -116
  216. package/src/tex/index.ts +2 -1
  217. package/src/tex/matrix.ts +62 -40
  218. package/src/tex/node.ts +54 -621
  219. package/src/tex/typeset.ts +461 -0
  220. package/src/three/axes3d.ts +187 -160
  221. package/src/three/curve-plot3d.ts +107 -110
  222. package/src/three/entries.ts +42 -0
  223. package/src/three/plot-point3d.ts +42 -45
  224. package/src/three/space.ts +34 -9
  225. package/src/three/surface-plot3d.ts +312 -323
  226. package/src/three/vector-arrow3d.ts +65 -54
  227. package/dist/browser/chunks/chunk-3GJB6AVO.js +0 -2
  228. package/dist/browser/chunks/chunk-3GJB6AVO.js.map +0 -7
  229. package/dist/browser/chunks/chunk-D5WHCVBC.js +0 -2
  230. package/dist/browser/chunks/chunk-D5WHCVBC.js.map +0 -7
  231. package/dist/browser/chunks/chunk-WL4KEX7Y.js +0 -2
  232. package/dist/browser/chunks/chunk-WL4KEX7Y.js.map +0 -7
  233. package/src/kit/placement.ts +0 -8
@@ -1,32 +1,31 @@
1
1
  import {
2
- colorProperty,
3
- command,
2
+ component2d,
4
3
  fillOps,
5
4
  Graphics2D,
6
- node,
7
- PaintNode,
8
- property,
9
- strokeProperty,
10
- withdraw,
11
- type AssetScope,
5
+ Types,
12
6
  type Color,
13
- type Command,
14
- type CommandArgs,
15
7
  type Fill,
16
8
  type FillResolved,
17
- type NodeConfig,
9
+ type NodeOf,
18
10
  type NormalizedColor,
19
11
  type PaintProps,
20
- type RenderContext2D,
21
- type Stroke,
12
+ type RenderContext,
13
+ type ShadowResolved,
14
+ type Size2D,
22
15
  type StrokeResolved,
16
+ type Values,
23
17
  type Vector2,
18
+ // Named so the emitted declaration reaches these through the sdk, not core.
19
+ type Node2D as _Node2D,
20
+ type Node2DProps as _Node2DProps,
21
+ type Shadow as _Shadow,
22
+ type Stroke as _Stroke,
24
23
  } from "@motionscript/sdk";
25
24
  import { braceOutline } from "../kit/brace";
26
- import { declareFormulas, drawLabels, type Label } from "../kit/furniture";
25
+ import { omit, PAINT, PAINT_COMMANDS, painted } from "../kit/component";
26
+ import { drawLabels, loadFormulas, type Label } from "../kit/furniture";
27
27
  import { lerpFillScale, readFillScale } from "../kit/scale";
28
28
  import { formatTick } from "../kit/ticks";
29
- import { FILL_PAINT, OUTLINE_TRIM } from "../kit/withdrawn";
30
29
 
31
30
  export interface SampleSpaceProps extends PaintProps {
32
31
  columnShares?: number[];
@@ -56,154 +55,156 @@ function lerpShares(from: number[], to: number[], t: number): number[] {
56
55
  return to.map((share, i) => from[i] + (share - from[i]) * t);
57
56
  }
58
57
 
59
- /**
60
- * A probability's whole, as a box cut into columns by `columnShares` (shares of
61
- * the whole, P(A) and P(not A)) and each column cut again by its `rowShares` entry
62
- * (P(B | A) above, the rest below): each part's area is its probability.
63
- * Braces name the columns below and the rows on the left; `divideTo` moves the
64
- * cuts.
65
- */
66
- @node({
67
- key: "sampleSpace",
68
- parentKey: "shape",
69
- forkable: true,
70
- layout: { children: "freeform", defaultWidthMode: "fixed", defaultHeightMode: "fixed", acceptsChildren: false },
71
- seed: { width: 520, height: 420, columnShares: [0.4, 0.6], rowShares: [0.7, 0.25], columnLabels: ["A", "not A"], rowLabels: ["B", "not B"] },
72
- })
73
- @withdraw(...FILL_PAINT, ...OUTLINE_TRIM)
74
- export class SampleSpace extends PaintNode<SampleSpaceProps> {
58
+ const state = {
59
+ // Its parts are painted from `columnFills`, and it trims no outline of its own.
60
+ ...omit(PAINT, "fill", "start", "end"),
75
61
  /** How the whole is shared across, left to right; any numbers, read as shares of their sum. */
76
- @property({ default: [1], mapper: readShares, tween: lerpShares, kind: "vector" }) declare columnShares: number[];
62
+ columnShares: Types.custom<number[]>([1], { resolve: readShares, lerp: lerpShares, kind: "vector" }),
77
63
  /** Each column's upper share, 0 to 1; a column without one is not cut across. */
78
- @property({ default: [], mapper: readShares, tween: lerpShares, kind: "vector" }) declare rowShares: number[];
64
+ rowShares: Types.custom<number[]>([], { resolve: readShares, lerp: lerpShares, kind: "vector" }),
79
65
  /** Each column's paint, left to right, round again past the last; its lower part shows it fainter. */
80
- @property({ default: [], mapper: readFillScale, tween: lerpFillScale, kind: "vector" }) declare columnFills: Fill[];
81
- @property({ default: [], animatable: false, kind: "vector" }) declare columnLabels: string[];
66
+ columnFills: Types.custom<Fill[], FillResolved[][]>([], { resolve: readFillScale, lerp: lerpFillScale, kind: "vector" }),
67
+ columnLabels: Types.custom<string[]>([], { animatable: false, kind: "vector" }),
82
68
  /** The upper part's name and the lower's, written on the left. */
83
- @property({ default: [], animatable: false, kind: "vector" }) declare rowLabels: string[];
69
+ rowLabels: Types.custom<string[]>([], { animatable: false, kind: "vector" }),
84
70
  /** Write each part's probability in it. */
85
- @property({ default: false, animatable: false }) declare values: boolean;
86
- @property({ default: 20, min: 1, unit: "px" }) declare labelSize: number;
87
- @colorProperty({ default: "#e5e7eb" }) declare labelColor: Color;
88
- @property({ default: "", animatable: false }) declare fontFamily: string;
71
+ values: Types.boolean(false, { animatable: false }),
72
+ labelSize: Types.number(20, { min: 1, unit: "px" }),
73
+ labelColor: Types.color("#e5e7eb"),
74
+ fontFamily: Types.text("", { animatable: false }),
75
+ };
89
76
 
90
- @strokeProperty({ default: { weight: 2, fill: "#0b0d12", align: "center" } }) declare stroke: Stroke;
77
+ /** What a sample space is drawn from: its own entries, as its fields and its node both read them. */
78
+ export type SampleSpaceValues = Values<typeof state>;
91
79
 
92
- constructor(props?: NodeConfig<SampleSpace, SampleSpaceProps>) {
93
- super(props ?? {});
94
- }
80
+ /** One part of a sample space: its box in pixels from the node's centre, y up, and its probability. */
81
+ export interface SamplePart {
82
+ x: number;
83
+ y: number;
84
+ width: number;
85
+ height: number;
86
+ probability: number;
87
+ column: number;
88
+ upper: boolean;
89
+ }
95
90
 
96
- /** Move the cuts: the columns' shares, each column's upper share, or both. */
97
- @command({ args: ["columnShares", "rowShares"] })
98
- divideTo(args: CommandArgs<{ columnShares?: number[]; rowShares?: number[] }> & { duration: number }): Command<SampleSpaceProps> {
99
- const data: Partial<SampleSpaceProps> = {};
100
- if (args.data?.columnShares !== undefined) data.columnShares = args.data.columnShares;
101
- if (args.data?.rowShares !== undefined) data.rowShares = args.data.rowShares;
102
- return this.to({ data, duration: args.duration, easing: args.easing });
103
- }
91
+ /**
92
+ * A probability's whole, as a box cut into columns by `columnShares` (shares of
93
+ * the whole, P(A) and P(not A)) and each column cut again by its `rowShares` entry
94
+ * (P(B | A) above, the rest below): each part's area is its probability.
95
+ * Braces name the columns below and the rows on the left; `divideTo` moves the
96
+ * cuts.
97
+ */
98
+ export const SampleSpace = component2d({
99
+ key: "sampleSpace",
100
+ state,
101
+ defaults: { stroke: { weight: 2, fill: "#0b0d12", align: "center" } },
102
+ load: (loader, s) => {
103
+ if (s.fontFamily !== "") loader.font(s.fontFamily);
104
+ loadFormulas(loader, [...s.columnLabels, ...s.rowLabels]);
105
+ },
106
+ commands: {
107
+ ...omit(PAINT_COMMANDS, "fillTo", "progressTo", "flash"),
108
+ /** Move the cuts: the columns' shares, each column's upper share, or both. */
109
+ divideTo: { args: ["columnShares", "rowShares"] },
110
+ },
111
+ render: (ctx, s) => painted(ctx, () => drawSpace(ctx, s)),
112
+ });
104
113
 
105
- override declareAssets(assets: AssetScope): void {
106
- super.declareAssets(assets);
107
- if (this.fontFamily !== "") assets.font(this.fontFamily);
108
- declareFormulas(assets, [...this.columnLabels, ...this.rowLabels]);
109
- }
114
+ export type SampleSpace = NodeOf<typeof SampleSpace>;
110
115
 
111
- /** Each part's box in pixels from the node's centre, y up, and its probability: columns left to right, upper part first. */
112
- parts(): { x: number; y: number; width: number; height: number; probability: number; column: number; upper: boolean }[] {
113
- const box = this._box();
114
- const shares = this.columnShares;
115
- const total = shares.reduce((sum, share) => sum + share, 0);
116
- if (!(total > 0) || box.width <= 0 || box.height <= 0) return [];
117
- const out: ReturnType<SampleSpace["parts"]> = [];
118
- let left = box.x - box.width / 2;
119
- shares.forEach((share, column) => {
120
- const width = (box.width * share) / total;
121
- const p = share / total;
122
- const cut = this.rowShares[column];
123
- const top = box.y + box.height / 2;
124
- if (cut === undefined) {
125
- out.push({ x: left + width / 2, y: box.y, width, height: box.height, probability: p, column, upper: true });
126
- } else {
127
- const upper = Math.min(1, Math.max(0, cut));
128
- const h = box.height * upper;
129
- out.push({ x: left + width / 2, y: top - h / 2, width, height: h, probability: p * upper, column, upper: true });
130
- out.push({ x: left + width / 2, y: top - h - (box.height - h) / 2, width, height: box.height - h, probability: p * (1 - upper), column, upper: false });
131
- }
132
- left += width;
133
- });
134
- return out;
135
- }
116
+ /** Each part of a sample space of `size`: columns left to right, upper part first. */
117
+ export function sampleParts(space: SampleSpaceValues, size: Size2D): SamplePart[] {
118
+ const box = boxOf(space, size);
119
+ const shares = space.columnShares;
120
+ const total = shares.reduce((sum, share) => sum + share, 0);
121
+ if (!(total > 0) || box.width <= 0 || box.height <= 0) return [];
122
+ const out: SamplePart[] = [];
123
+ let left = box.x - box.width / 2;
124
+ shares.forEach((share, column) => {
125
+ const width = (box.width * share) / total;
126
+ const p = share / total;
127
+ const cut = space.rowShares[column];
128
+ const top = box.y + box.height / 2;
129
+ if (cut === undefined) {
130
+ out.push({ x: left + width / 2, y: box.y, width, height: box.height, probability: p, column, upper: true });
131
+ } else {
132
+ const upper = Math.min(1, Math.max(0, cut));
133
+ const h = box.height * upper;
134
+ out.push({ x: left + width / 2, y: top - h / 2, width, height: h, probability: p * upper, column, upper: true });
135
+ out.push({ x: left + width / 2, y: top - h - (box.height - h) / 2, width, height: box.height - h, probability: p * (1 - upper), column, upper: false });
136
+ }
137
+ left += width;
138
+ });
139
+ return out;
140
+ }
136
141
 
137
- protected override renderSelf(ctx: RenderContext2D): void {
138
- const parts = this.parts();
139
- if (parts.length === 0) return;
140
- const fills = this.columnFills as unknown as FillResolved[][];
141
- const stroke = this.stroke as StrokeResolved[];
142
- const labels: Label[] = [];
143
- for (const part of parts) {
144
- if (!(part.width > 0) || !(part.height > 0)) continue;
145
- const base = fills.length > 0 ? fills[part.column % fills.length] : fillOps.resolve(PALETTE[part.column % PALETTE.length]);
146
- const paint = part.upper ? base : base.map((layer) => ({ ...layer, opacity: (layer.opacity ?? 1) * LOWER }));
147
- const g = new Graphics2D().rect({ x: part.x, y: part.y, width: part.width, height: part.height });
148
- ctx.draw(g.shadow(this.shadow).fill(paint));
149
- if (stroke.length > 0) ctx.draw(new Graphics2D().rect({ x: part.x, y: part.y, width: part.width, height: part.height }).stroke(stroke));
150
- if (this.values && part.height > this.labelSize && part.width > this.labelSize) {
151
- labels.push({ text: formatTick(Math.round(part.probability * 1000) / 1000, 0.001), at: { x: part.x, y: part.y }, align: "center" });
152
- }
142
+ function drawSpace(ctx: RenderContext, space: SampleSpaceValues): void {
143
+ const parts = sampleParts(space, ctx.size);
144
+ if (parts.length === 0) return;
145
+ const fills = space.columnFills;
146
+ const stroke = space.stroke as StrokeResolved[];
147
+ const labels: Label[] = [];
148
+ for (const part of parts) {
149
+ if (!(part.width > 0) || !(part.height > 0)) continue;
150
+ const base = fills.length > 0 ? fills[part.column % fills.length] : fillOps.resolve(PALETTE[part.column % PALETTE.length]);
151
+ const paint = part.upper ? base : base.map((layer) => ({ ...layer, opacity: (layer.opacity ?? 1) * LOWER }));
152
+ const g = new Graphics2D().rect({ x: part.x, y: part.y, width: part.width, height: part.height });
153
+ ctx.draw(g.shadow(space.shadow as ShadowResolved[]).fill(paint));
154
+ if (stroke.length > 0) ctx.draw(new Graphics2D().rect({ x: part.x, y: part.y, width: part.width, height: part.height }).stroke(stroke));
155
+ if (space.values && part.height > space.labelSize && part.width > space.labelSize) {
156
+ labels.push({ text: formatTick(Math.round(part.probability * 1000) / 1000, 0.001), at: { x: part.x, y: part.y }, align: "center" });
153
157
  }
154
- labels.push(...this._braces(ctx, parts));
155
- const style = { fontSize: this.labelSize, fontFamily: this.fontFamily, color: this.labelColor as NormalizedColor };
156
- for (const part of drawLabels(labels, style)) ctx.draw(part);
157
158
  }
159
+ labels.push(...braces(ctx, space, parts));
160
+ const style = { fontSize: space.labelSize, fontFamily: space.fontFamily, color: space.labelColor as NormalizedColor };
161
+ for (const part of drawLabels(labels, style)) ctx.draw(part);
162
+ }
158
163
 
159
- // The outlines are drawn with the parts, and there is no outline of the node's own.
160
- protected override renderStroke(): void {}
164
+ /** Room for the braces and their names, below and on the left, taken from the box. */
165
+ function boxOf(space: SampleSpaceValues, size: Size2D): { x: number; y: number; width: number; height: number } {
166
+ const { width, height } = size;
167
+ const room = space.labelSize * 2.6;
168
+ const below = space.columnLabels.some((label) => label !== "") ? room : 0;
169
+ const left = space.rowLabels.some((label) => label !== "") ? room * 1.6 : 0;
170
+ return { x: left / 2, y: below / 2, width: Math.max(0, width - left), height: Math.max(0, height - below) };
171
+ }
161
172
 
162
- /** Room for the braces and their names, below and on the left, taken from the box. */
163
- private _box(): { x: number; y: number; width: number; height: number } {
164
- const { width, height } = this.layoutBounds;
165
- const room = this.labelSize * 2.6;
166
- const below = this.columnLabels.some((label) => label !== "") ? room : 0;
167
- const left = this.rowLabels.some((label) => label !== "") ? room * 1.6 : 0;
168
- return { x: left / 2, y: below / 2, width: Math.max(0, width - left), height: Math.max(0, height - below) };
173
+ /** Braces under each column and beside the first column's parts, and the labels that name them. */
174
+ function braces(ctx: RenderContext, space: SampleSpaceValues, parts: readonly SamplePart[]): Label[] {
175
+ const box = boxOf(space, ctx.size);
176
+ const reach = space.labelSize * 0.8;
177
+ const gap = 6;
178
+ const runs = new Graphics2D();
179
+ const labels: Label[] = [];
180
+ let drawn = false;
181
+ const brace = (from: Vector2, to: Vector2, out: Vector2, text: string, align: Label["align"]) => {
182
+ if (text === "") return;
183
+ // A frame centred on the node's own centre, so the path is drawn where it is and not moved onto it.
184
+ runs.path({ data: braceOutline(from, to, out, reach), centerBounds: [-1, -1, 1, 1] });
185
+ drawn = true;
186
+ const mid = { x: (from.x + to.x) / 2, y: (from.y + to.y) / 2 };
187
+ const far = reach + space.labelSize * 0.75;
188
+ labels.push({ text, at: { x: mid.x + out.x * far, y: mid.y + out.y * far }, align });
189
+ };
190
+ const bottom = box.y - box.height / 2 - gap;
191
+ for (const part of parts) {
192
+ if (!part.upper && space.rowShares[part.column] !== undefined) continue;
193
+ const text = space.columnLabels[part.column] ?? "";
194
+ // Left to right along the bottom, so the bulge, to the edge's right, points down.
195
+ brace({ x: part.x + part.width / 2, y: bottom }, { x: part.x - part.width / 2, y: bottom }, { x: 0, y: -1 }, text, "center");
169
196
  }
170
-
171
- /** Braces under each column and beside the first column's parts, and the labels that name them. */
172
- private _braces(ctx: RenderContext2D, parts: ReturnType<SampleSpace["parts"]>): Label[] {
173
- const box = this._box();
174
- const reach = this.labelSize * 0.8;
175
- const gap = 6;
176
- const runs = new Graphics2D();
177
- const labels: Label[] = [];
178
- let drawn = false;
179
- const brace = (from: Vector2, to: Vector2, out: Vector2, text: string, align: Label["align"]) => {
180
- if (text === "") return;
181
- // A frame centred on the node's own centre, so the path is drawn where it is and not moved onto it.
182
- runs.path({ data: braceOutline(from, to, out, reach), centerBounds: [-1, -1, 1, 1] });
183
- drawn = true;
184
- const mid = { x: (from.x + to.x) / 2, y: (from.y + to.y) / 2 };
185
- const far = reach + this.labelSize * 0.75;
186
- labels.push({ text, at: { x: mid.x + out.x * far, y: mid.y + out.y * far }, align });
187
- };
188
- const bottom = box.y - box.height / 2 - gap;
189
- for (const part of parts) {
190
- if (!part.upper && this.rowShares[part.column] !== undefined) continue;
191
- const text = this.columnLabels[part.column] ?? "";
192
- // Left to right along the bottom, so the bulge, to the edge's right, points down.
193
- brace({ x: part.x + part.width / 2, y: bottom }, { x: part.x - part.width / 2, y: bottom }, { x: 0, y: -1 }, text, "center");
194
- }
195
- const first = parts.filter((part) => part.column === 0);
196
- const left = box.x - box.width / 2 - gap;
197
- if (this.rowShares[0] !== undefined) {
198
- first.forEach((part) => {
199
- const text = this.rowLabels[part.upper ? 0 : 1] ?? "";
200
- brace({ x: left, y: part.y - part.height / 2 }, { x: left, y: part.y + part.height / 2 }, { x: -1, y: 0 }, text, "right");
201
- });
202
- }
203
- if (drawn) {
204
- const fill = fillOps.resolve({ type: "solid", color: this.labelColor as NormalizedColor });
205
- ctx.draw(runs.stroke({ weight: 2, fill, align: "center", cap: "round", join: "round" }));
206
- }
207
- return labels;
197
+ const first = parts.filter((part) => part.column === 0);
198
+ const left = box.x - box.width / 2 - gap;
199
+ if (space.rowShares[0] !== undefined) {
200
+ first.forEach((part) => {
201
+ const text = space.rowLabels[part.upper ? 0 : 1] ?? "";
202
+ brace({ x: left, y: part.y - part.height / 2 }, { x: left, y: part.y + part.height / 2 }, { x: -1, y: 0 }, text, "right");
203
+ });
204
+ }
205
+ if (drawn) {
206
+ const fill = fillOps.resolve({ type: "solid", color: space.labelColor as NormalizedColor });
207
+ ctx.draw(runs.stroke({ weight: 2, fill, align: "center", cap: "round", join: "round" }));
208
208
  }
209
+ return labels;
209
210
  }