@fengwk/kchart 0.1.0 → 0.2.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.
- package/CHANGELOG.md +43 -0
- package/README.md +31 -2
- package/README.zh-CN.md +31 -2
- package/dist/esm/_virtual/_kchart-families.js +2 -1
- package/dist/esm/assets/themes/cloudmusic.js +1 -1
- package/dist/esm/chart/composition.js +7 -5
- package/dist/esm/chart/maps.js +9 -7
- package/dist/esm/chart/mindmap.js +19 -5
- package/dist/esm/chart/multivariate.js +99 -49
- package/dist/esm/chart/relations.js +15 -7
- package/dist/esm/chart/spec.js +11 -4
- package/dist/esm/core/context.js +29 -10
- package/dist/esm/core/scene.js +238 -21
- package/dist/esm/core/text.js +1 -1
- package/dist/esm/diagram/block.js +287 -295
- package/dist/esm/diagram/blocks.js +541 -605
- package/dist/esm/diagram/board-paint.js +594 -0
- package/dist/esm/diagram/board-route.js +60 -0
- package/dist/esm/diagram/c4.js +75 -35
- package/dist/esm/diagram/class.js +3 -2
- package/dist/esm/diagram/cynefin.js +55 -9
- package/dist/esm/diagram/eventmodeling.js +21 -10
- package/dist/esm/diagram/gantt.js +37 -15
- package/dist/esm/diagram/gitgraph.js +26 -5
- package/dist/esm/diagram/graph-layout.js +39 -2
- package/dist/esm/diagram/graph-route.js +296 -38
- package/dist/esm/diagram/info.js +32 -0
- package/dist/esm/diagram/journey.js +5 -5
- package/dist/esm/diagram/kanban.js +3 -3
- package/dist/esm/diagram/layers.js +9 -7
- package/dist/esm/diagram/mindmap.js +5 -1
- package/dist/esm/diagram/numeric-composition.js +24 -4
- package/dist/esm/diagram/numeric-model.js +1 -1
- package/dist/esm/diagram/numeric-radar.js +25 -7
- package/dist/esm/diagram/numeric-sankey.js +4 -3
- package/dist/esm/diagram/numeric-xy.js +14 -4
- package/dist/esm/diagram/packet.js +4 -4
- package/dist/esm/diagram/quadrant.js +12 -5
- package/dist/esm/diagram/railroad-parse.js +20 -10
- package/dist/esm/diagram/railroad.js +1 -1
- package/dist/esm/diagram/registry.js +46 -8
- package/dist/esm/diagram/sequence.js +43 -6
- package/dist/esm/diagram/swimlane.js +2 -2
- package/dist/esm/diagram/time.js +3 -3
- package/dist/esm/diagram/timeline.js +5 -5
- package/dist/esm/diagram/treeview.js +5 -3
- package/dist/esm/diagram/venn.js +117 -149
- package/dist/esm/diagram/wardley.js +61 -26
- package/dist/esm/diagram/zenuml.js +338 -0
- package/dist/esm/index.d.ts +3 -1
- package/dist/esm/mermaid.d.ts +1 -1
- package/dist/esm/mermaid.js +2 -1
- package/dist/esm/node.js +8 -2
- package/dist/esm/src/families.js +6 -1
- package/dist/units/chart/composition.js +1 -1
- package/dist/units/chart/maps.js +1 -1
- package/dist/units/chart/mindmap.js +1 -1
- package/dist/units/chart/multivariate.js +1 -1
- package/dist/units/chart/relations.js +1 -1
- package/dist/units/chart/spec.js +1 -1
- package/dist/units/core/context.js +1 -1
- package/dist/units/core/scene.js +1 -1
- package/dist/units/core/text.js +1 -1
- package/dist/units/core/theme.js +1 -1
- package/dist/units/diagram/block.js +2 -2
- package/dist/units/diagram/blocks.js +2 -2
- package/dist/units/diagram/board-paint.js +1 -0
- package/dist/units/diagram/board-route.js +1 -0
- package/dist/units/diagram/c4.js +1 -1
- package/dist/units/diagram/class.js +2 -2
- package/dist/units/diagram/cynefin.js +2 -2
- package/dist/units/diagram/eventmodeling.js +4 -4
- package/dist/units/diagram/gantt.js +3 -3
- package/dist/units/diagram/gitgraph.js +2 -1
- package/dist/units/diagram/graph-layout.js +1 -1
- package/dist/units/diagram/graph-route.js +1 -1
- package/dist/units/diagram/info.js +2 -0
- package/dist/units/diagram/journey.js +3 -3
- package/dist/units/diagram/kanban.js +1 -1
- package/dist/units/diagram/layers.js +1 -1
- package/dist/units/diagram/mindmap.js +1 -1
- package/dist/units/diagram/numeric-composition.js +1 -1
- package/dist/units/diagram/numeric-model.js +1 -1
- package/dist/units/diagram/numeric-radar.js +2 -2
- package/dist/units/diagram/numeric-sankey.js +1 -1
- package/dist/units/diagram/numeric-xy.js +1 -1
- package/dist/units/diagram/packet.js +1 -1
- package/dist/units/diagram/quadrant.js +1 -1
- package/dist/units/diagram/railroad-parse.js +2 -2
- package/dist/units/diagram/railroad.js +1 -1
- package/dist/units/diagram/registry.js +2 -2
- package/dist/units/diagram/sequence.js +1 -1
- package/dist/units/diagram/swimlane.js +2 -2
- package/dist/units/diagram/time.js +1 -1
- package/dist/units/diagram/timeline.js +1 -1
- package/dist/units/diagram/treeview.js +1 -1
- package/dist/units/diagram/venn.js +2 -2
- package/dist/units/diagram/wardley.js +4 -4
- package/dist/units/diagram/zenuml.js +2 -0
- package/dist/units.json +82 -52
- package/package.json +1 -1
- package/dist/esm/diagram/relations.js +0 -966
- package/dist/units/diagram/relations.js +0 -3
package/dist/esm/chart/spec.js
CHANGED
|
@@ -163,7 +163,11 @@ function validate(spec) {
|
|
|
163
163
|
data: null
|
|
164
164
|
};
|
|
165
165
|
}
|
|
166
|
-
|
|
166
|
+
for (const field of Object.keys(spec)) {
|
|
167
|
+
if (TOP.has(field)) continue;
|
|
168
|
+
if (field === "id") err(errors, "/id", "图表声明不接受根级 id", "移除根级 id;要标识数据行时,若图型支持,使用 encode.id 映射到行字段。");
|
|
169
|
+
else err(errors, ptr([field]), "未知字段");
|
|
170
|
+
}
|
|
167
171
|
const c = typeof spec.chart === "string" ? catalog[spec.chart] : void 0;
|
|
168
172
|
if (!c) err(errors, "/chart", "未知图型", "chart 必须是注册图型名。");
|
|
169
173
|
for (const k of [
|
|
@@ -221,7 +225,7 @@ function validate(spec) {
|
|
|
221
225
|
"interaction",
|
|
222
226
|
"encode"
|
|
223
227
|
]);
|
|
224
|
-
for (const field of Object.keys(spec)) if (!commonFields.has(field) && c.special[field] === void 0 && !(field === "unitMark" && [
|
|
228
|
+
for (const field of Object.keys(spec)) if (TOP.has(field) && !commonFields.has(field) && c.special[field] === void 0 && !(field === "unitMark" && [
|
|
225
229
|
"bar",
|
|
226
230
|
"column",
|
|
227
231
|
"dumbbell",
|
|
@@ -272,7 +276,7 @@ function validate(spec) {
|
|
|
272
276
|
const m = spec.data.map;
|
|
273
277
|
const builtin = obj(m) && Object.keys(m).length === 1 && ["world", "us-states"].includes(m.asset);
|
|
274
278
|
const external = obj(m) && obj(m.geojson) && m.geojson.type === "FeatureCollection" && Array.isArray(m.geojson.features) && typeof m.idProperty === "string" && Object.keys(m).every((k) => ["geojson", "idProperty"].includes(k));
|
|
275
|
-
if (!builtin && !external) err(errors, "/data/map", "map
|
|
279
|
+
if (!builtin && !external) err(errors, "/data/map", "map须是对象:{asset:'world'}、{asset:'us-states'}或{geojson:FeatureCollection,idProperty:'地区键字段'}", "内置地图写成 \"map\": {\"asset\": \"world\"},不要只写地图名。");
|
|
276
280
|
if (external) {
|
|
277
281
|
const ids = /* @__PURE__ */ new Set();
|
|
278
282
|
for (const [i, f] of m.geojson.features.entries()) {
|
|
@@ -548,7 +552,10 @@ function checkTable(s, c, e) {
|
|
|
548
552
|
if (c.encodeForms.length && !c.encodeForms.some((form) => form.length === Object.keys(enc).filter((k) => k === "value" || k === "panel").length && form.every((k) => Object.hasOwn(enc, k)))) err(e, "/encode", "small-multiples须使用value[]宽表或value+panel长表");
|
|
549
553
|
if (s.chart === "small-multiples" && (enc.panel ? Array.isArray(enc.value) : !Array.isArray(enc.value))) err(e, "/encode", "宽表value须为字段数组;长表value须为单个字段并配panel");
|
|
550
554
|
if (Array.isArray(enc.value) && enc.value.length > 6) err(e, "/encode/value", "最多支持6个度量系列");
|
|
551
|
-
if (["radar", "parallel"].includes(s.chart)
|
|
555
|
+
if (["radar", "parallel"].includes(s.chart)) {
|
|
556
|
+
const { minDimensions = 3, maxDimensions = 6 } = s.chart === "radar" ? s[sizeBudget] ?? {} : {};
|
|
557
|
+
if (enc.dimensions?.length < minDimensions || enc.dimensions?.length > maxDimensions) err(e, "/encode/dimensions", `${s.chart}需要${minDimensions}至${maxDimensions}维`);
|
|
558
|
+
}
|
|
552
559
|
if (s.chart === "radar") {
|
|
553
560
|
for (const name of enc.dimensions || []) if (!fields[name]?.domain) err(e, `/fields/${name}/domain`, `${s.chart}的每个维度都必须显式声明domain`);
|
|
554
561
|
}
|
package/dist/esm/core/context.js
CHANGED
|
@@ -34,7 +34,24 @@ function createContext(options = {}) {
|
|
|
34
34
|
const palette = paletteOf(resolved);
|
|
35
35
|
const fontFamily = resolved.fontFamily || "system-ui, -apple-system, BlinkMacSystemFont, \"Segoe UI\", \"Noto Sans SC\", \"Microsoft YaHei\", sans-serif";
|
|
36
36
|
if (typeof fontFamily !== "string" || !fontFamily.trim()) throw new TypeError("Invalid theme font family");
|
|
37
|
-
const
|
|
37
|
+
const compact = options.compact === true;
|
|
38
|
+
const font = (size, weight) => !compact ? {
|
|
39
|
+
size,
|
|
40
|
+
weight
|
|
41
|
+
} : size === 16 && weight === 650 ? {
|
|
42
|
+
size: 14,
|
|
43
|
+
weight: 600
|
|
44
|
+
} : {
|
|
45
|
+
size: size === 14 ? 13 : Math.max(12, Math.min(14, size ?? 12)),
|
|
46
|
+
weight
|
|
47
|
+
};
|
|
48
|
+
const measureText = options.measure || fallbackMeasure;
|
|
49
|
+
const measureRendered = (value, size, weight) => measureText(value, size, weight, fontFamily);
|
|
50
|
+
const measureInk = options.measure ? measureRendered : (value, size, weight) => measureRendered(value, size, weight) + (String(value).match(/[mMwW@]/g)?.length || 0) * size * .38;
|
|
51
|
+
const measure = (value, size, weight) => {
|
|
52
|
+
const mapped = font(size, weight);
|
|
53
|
+
return measureRendered(value, mapped.size, mapped.weight);
|
|
54
|
+
};
|
|
38
55
|
const color = (role) => {
|
|
39
56
|
if (!roles.includes(role)) throw new TypeError(`Unknown color role: ${role}`);
|
|
40
57
|
const value = palette[role];
|
|
@@ -42,10 +59,7 @@ function createContext(options = {}) {
|
|
|
42
59
|
return value;
|
|
43
60
|
};
|
|
44
61
|
const frameTone = (value, prominent = false) => resolved.frameInk ? prominent ? resolved.fg1 : resolved.frameInk : value;
|
|
45
|
-
const wrap = (value, maxWidth, size = 12, weight = 400, options) => wrapText(String(value ?? ""), maxWidth,
|
|
46
|
-
size,
|
|
47
|
-
weight
|
|
48
|
-
}, (text, font) => measure(text, font.size, font.weight, fontFamily), options);
|
|
62
|
+
const wrap = (value, maxWidth, size = 12, weight = 400, options) => wrapText(String(value ?? ""), maxWidth, font(size, weight), (text, spec) => measureRendered(text, spec.size, spec.weight), options);
|
|
49
63
|
const text = (x, y, value, opts = {}) => {
|
|
50
64
|
const { anchor = "start", size = 12, weight = 400, fill = color("muted"), meta, ...attrs } = opts;
|
|
51
65
|
if (![
|
|
@@ -53,14 +67,15 @@ function createContext(options = {}) {
|
|
|
53
67
|
"middle",
|
|
54
68
|
"end"
|
|
55
69
|
].includes(anchor)) throw new TypeError("Invalid text anchor");
|
|
70
|
+
const mapped = font(size, weight);
|
|
56
71
|
return {
|
|
57
72
|
...primitive("text", {
|
|
58
73
|
x,
|
|
59
74
|
y,
|
|
60
75
|
...attrs,
|
|
61
76
|
"text-anchor": anchor,
|
|
62
|
-
"font-size": size,
|
|
63
|
-
"font-weight": weight,
|
|
77
|
+
"font-size": mapped.size,
|
|
78
|
+
"font-weight": mapped.weight,
|
|
64
79
|
fill
|
|
65
80
|
}, meta),
|
|
66
81
|
text: String(value ?? "")
|
|
@@ -73,9 +88,9 @@ function createContext(options = {}) {
|
|
|
73
88
|
const flow = (items, maxWidth, size = 12, weight = 400) => {
|
|
74
89
|
const rows = [];
|
|
75
90
|
let row = [], rowWidth = 0;
|
|
76
|
-
const gap = measure(" · ", size, weight
|
|
91
|
+
const gap = measure(" · ", size, weight);
|
|
77
92
|
for (const item of items || []) {
|
|
78
|
-
const value = String(item), itemWidth = measure(value, size, weight
|
|
93
|
+
const value = String(item), itemWidth = measure(value, size, weight);
|
|
79
94
|
if (itemWidth > maxWidth) {
|
|
80
95
|
if (row.length) rows.push(row);
|
|
81
96
|
row = [];
|
|
@@ -153,7 +168,11 @@ function createContext(options = {}) {
|
|
|
153
168
|
scheme: resolved.scheme,
|
|
154
169
|
design: resolved,
|
|
155
170
|
assets: options.assets || null,
|
|
156
|
-
|
|
171
|
+
compact,
|
|
172
|
+
font,
|
|
173
|
+
measure,
|
|
174
|
+
measureRendered,
|
|
175
|
+
measureInk,
|
|
157
176
|
el,
|
|
158
177
|
shape: primitive,
|
|
159
178
|
text,
|
package/dist/esm/core/scene.js
CHANGED
|
@@ -3,6 +3,7 @@ import { __exportAll } from "../_virtual/_rolldown/runtime.js";
|
|
|
3
3
|
var scene_exports = /* @__PURE__ */ __exportAll({
|
|
4
4
|
allowedTags: () => allowedTags,
|
|
5
5
|
containText: () => containText,
|
|
6
|
+
cropInk: () => cropInk,
|
|
6
7
|
el: () => el,
|
|
7
8
|
escapeXml: () => escapeXml,
|
|
8
9
|
hash: () => hash,
|
|
@@ -136,10 +137,13 @@ var multiply = (m, n) => [
|
|
|
136
137
|
m[0] * n[4] + m[2] * n[5] + m[4],
|
|
137
138
|
m[1] * n[4] + m[3] * n[5] + m[5]
|
|
138
139
|
];
|
|
139
|
-
|
|
140
|
+
var NUMBER = /[-+]?(?:\d*\.\d+|\d+\.?\d*)(?:e[-+]?\d+)?/gi;
|
|
141
|
+
var radians = (degrees) => degrees * Math.PI / 180;
|
|
142
|
+
function parseTransform(value, ink = false) {
|
|
140
143
|
let matrix = IDENTITY;
|
|
141
|
-
|
|
142
|
-
|
|
144
|
+
const commands = ink ? /(translate|scale|matrix|rotate|skewX|skewY)\s*\(([^)]*)\)/g : /(translate|scale|matrix)\(([^)]*)\)/g;
|
|
145
|
+
for (const [, name, body] of String(value || "").matchAll(commands)) {
|
|
146
|
+
const n = ink ? (body.match(NUMBER) || []).map(Number) : body.split(/[\s,]+/).filter(Boolean).map(Number);
|
|
143
147
|
if (name === "translate") matrix = multiply(matrix, [
|
|
144
148
|
1,
|
|
145
149
|
0,
|
|
@@ -156,6 +160,33 @@ function parseTransform(value) {
|
|
|
156
160
|
0,
|
|
157
161
|
0
|
|
158
162
|
]);
|
|
163
|
+
else if (name === "rotate") {
|
|
164
|
+
const [angle, x = 0, y = 0] = n;
|
|
165
|
+
const c = Math.cos(radians(angle)), s = Math.sin(radians(angle));
|
|
166
|
+
matrix = multiply(matrix, [
|
|
167
|
+
c,
|
|
168
|
+
s,
|
|
169
|
+
-s,
|
|
170
|
+
c,
|
|
171
|
+
x - c * x + s * y,
|
|
172
|
+
y - s * x - c * y
|
|
173
|
+
]);
|
|
174
|
+
} else if (name === "skewX") matrix = multiply(matrix, [
|
|
175
|
+
1,
|
|
176
|
+
0,
|
|
177
|
+
Math.tan(radians(n[0])),
|
|
178
|
+
1,
|
|
179
|
+
0,
|
|
180
|
+
0
|
|
181
|
+
]);
|
|
182
|
+
else if (name === "skewY") matrix = multiply(matrix, [
|
|
183
|
+
1,
|
|
184
|
+
Math.tan(radians(n[0])),
|
|
185
|
+
0,
|
|
186
|
+
1,
|
|
187
|
+
0,
|
|
188
|
+
0
|
|
189
|
+
]);
|
|
159
190
|
else if (n.length === 6) matrix = multiply(matrix, n);
|
|
160
191
|
}
|
|
161
192
|
return matrix;
|
|
@@ -166,9 +197,108 @@ var NON_RENDERED = /* @__PURE__ */ new Set([
|
|
|
166
197
|
"clipPath",
|
|
167
198
|
"title",
|
|
168
199
|
"desc",
|
|
169
|
-
"linearGradient"
|
|
200
|
+
"linearGradient",
|
|
201
|
+
"stop"
|
|
170
202
|
]);
|
|
171
|
-
|
|
203
|
+
var textContent = (node) => `${node.text ?? ""}${(node.children || []).filter((child) => child.tag === "tspan" && Number(child.attrs?.opacity) !== 0).map(textContent).join("")}`;
|
|
204
|
+
var paintKeys = [
|
|
205
|
+
"fill",
|
|
206
|
+
"fill-opacity",
|
|
207
|
+
"stroke",
|
|
208
|
+
"stroke-width",
|
|
209
|
+
"stroke-opacity",
|
|
210
|
+
"font-size",
|
|
211
|
+
"font-weight",
|
|
212
|
+
"text-anchor",
|
|
213
|
+
"dominant-baseline",
|
|
214
|
+
"letter-spacing"
|
|
215
|
+
];
|
|
216
|
+
function arcExtent(x, y, endX, endY, [rx, ry, angle, large, sweep], point, [a, b, c, d]) {
|
|
217
|
+
rx = Math.abs(rx);
|
|
218
|
+
ry = Math.abs(ry);
|
|
219
|
+
if (!rx || !ry || x === endX && y === endY) return;
|
|
220
|
+
const cos = Math.cos(radians(angle)), sin = Math.sin(radians(angle));
|
|
221
|
+
const dx = (x - endX) / 2, dy = (y - endY) / 2;
|
|
222
|
+
const u = cos * dx + sin * dy, v = -sin * dx + cos * dy;
|
|
223
|
+
const radiusScale = Math.max(1, Math.hypot(u / rx, v / ry));
|
|
224
|
+
rx *= radiusScale;
|
|
225
|
+
ry *= radiusScale;
|
|
226
|
+
const len = (u / rx) ** 2 + (v / ry) ** 2;
|
|
227
|
+
const factor = (large === sweep ? -1 : 1) * Math.sqrt(Math.max(0, 1 / len - 1));
|
|
228
|
+
const cu = factor * rx * (v / ry), cv = -factor * ry * (u / rx);
|
|
229
|
+
const cx = cos * cu - sin * cv + (x + endX) / 2, cy = sin * cu + cos * cv + (y + endY) / 2;
|
|
230
|
+
const start = Math.atan2((v - cv) / ry, (u - cu) / rx);
|
|
231
|
+
const end = Math.atan2((-v - cv) / ry, (-u - cu) / rx);
|
|
232
|
+
const turn = 2 * Math.PI, mod = (value) => (value % turn + turn) % turn;
|
|
233
|
+
const sign = sweep ? 1 : -1, span = mod(sign * (end - start));
|
|
234
|
+
const ux = rx * cos, uy = rx * sin, vx = -ry * sin, vy = ry * cos;
|
|
235
|
+
for (const theta of [Math.atan2(a * vx + c * vy, a * ux + c * uy), Math.atan2(b * vx + d * vy, b * ux + d * uy)]) for (const t of [theta, theta + Math.PI]) if (mod(sign * (t - start)) <= span) point(cx + ux * Math.cos(t) + vx * Math.sin(t), cy + uy * Math.cos(t) + vy * Math.sin(t));
|
|
236
|
+
}
|
|
237
|
+
var pathArity = {
|
|
238
|
+
M: 2,
|
|
239
|
+
L: 2,
|
|
240
|
+
H: 1,
|
|
241
|
+
V: 1,
|
|
242
|
+
C: 6,
|
|
243
|
+
S: 4,
|
|
244
|
+
Q: 4,
|
|
245
|
+
T: 2,
|
|
246
|
+
A: 7,
|
|
247
|
+
Z: 0
|
|
248
|
+
};
|
|
249
|
+
function pathExtent(value, point, matrix) {
|
|
250
|
+
const source = String(value || "");
|
|
251
|
+
const number = new RegExp(NUMBER.source, "iy"), flag = /[01]/y, sep = /[\s,]*/y;
|
|
252
|
+
let i = 0, command, previous, control, x = 0, y = 0, startX = 0, startY = 0;
|
|
253
|
+
const skip = () => {
|
|
254
|
+
sep.lastIndex = i;
|
|
255
|
+
sep.exec(source);
|
|
256
|
+
i = sep.lastIndex;
|
|
257
|
+
};
|
|
258
|
+
while (i < source.length) {
|
|
259
|
+
skip();
|
|
260
|
+
if (/[MLHVCSQTAZ]/i.test(source[i] || "")) command = source[i++];
|
|
261
|
+
if (!command || i === source.length && command.toUpperCase() !== "Z") break;
|
|
262
|
+
const kind = command.toUpperCase(), relative = command !== kind;
|
|
263
|
+
const args = [];
|
|
264
|
+
for (let j = 0; j < pathArity[kind]; j++) {
|
|
265
|
+
skip();
|
|
266
|
+
const token = kind === "A" && (j === 3 || j === 4) ? flag : number;
|
|
267
|
+
token.lastIndex = i;
|
|
268
|
+
const match = token.exec(source);
|
|
269
|
+
if (!match) return;
|
|
270
|
+
args.push(Number(match[0]));
|
|
271
|
+
i = token.lastIndex;
|
|
272
|
+
}
|
|
273
|
+
const px = (n) => args[n] + (relative ? x : 0), py = (n) => args[n] + (relative ? y : 0);
|
|
274
|
+
const end = args.length - 2;
|
|
275
|
+
const nx = kind === "Z" ? startX : kind === "V" ? x : px(kind === "H" ? 0 : end);
|
|
276
|
+
const ny = kind === "Z" ? startY : kind === "H" ? y : py(kind === "V" ? 0 : end + 1);
|
|
277
|
+
if (kind === "M") {
|
|
278
|
+
startX = nx;
|
|
279
|
+
startY = ny;
|
|
280
|
+
command = relative ? "l" : "L";
|
|
281
|
+
} else {
|
|
282
|
+
point(x, y);
|
|
283
|
+
point(nx, ny);
|
|
284
|
+
if (kind === "S" || kind === "T") {
|
|
285
|
+
control = (kind === "S" ? ["C", "S"] : ["Q", "T"]).includes(previous) ? [2 * x - control[0], 2 * y - control[1]] : [x, y];
|
|
286
|
+
point(...control);
|
|
287
|
+
}
|
|
288
|
+
if (kind === "C") point(px(0), py(1));
|
|
289
|
+
if (kind === "C" || kind === "S" || kind === "Q") {
|
|
290
|
+
control = [px(end - 2), py(end - 1)];
|
|
291
|
+
point(...control);
|
|
292
|
+
}
|
|
293
|
+
if (kind === "A") arcExtent(x, y, nx, ny, args, point, matrix);
|
|
294
|
+
if (kind === "Z") command = null;
|
|
295
|
+
}
|
|
296
|
+
previous = kind;
|
|
297
|
+
x = nx;
|
|
298
|
+
y = ny;
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
function sceneExtent(scene, measure, blockPadding, ink = false, fullText = false) {
|
|
172
302
|
let box = null;
|
|
173
303
|
const grow = (x, y) => {
|
|
174
304
|
box = box ? {
|
|
@@ -183,31 +313,88 @@ function textExtent(scene, measure, blockPadding) {
|
|
|
183
313
|
y1: y
|
|
184
314
|
};
|
|
185
315
|
};
|
|
186
|
-
|
|
316
|
+
let stroke = 0;
|
|
317
|
+
const visit = (node, parent, inherited = {}) => {
|
|
187
318
|
if (!node || NON_RENDERED.has(node.tag) || Number(node.attrs?.opacity) === 0) return;
|
|
188
|
-
const matrix = multiply(parent, parseTransform(node.attrs?.transform));
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
319
|
+
const matrix = multiply(parent, parseTransform(node.attrs?.transform, ink));
|
|
320
|
+
const attrs = ink ? {
|
|
321
|
+
...inherited,
|
|
322
|
+
...node.attrs
|
|
323
|
+
} : node.attrs || {};
|
|
324
|
+
const [a, b, c, d, e, f] = matrix;
|
|
325
|
+
const point = (x, y) => grow(a * x + c * y + e, b * x + d * y + f);
|
|
326
|
+
const rect = (x0, y0, x1, y1) => {
|
|
327
|
+
point(x0, y0);
|
|
328
|
+
point(x1, y0);
|
|
329
|
+
point(x0, y1);
|
|
330
|
+
point(x1, y1);
|
|
331
|
+
};
|
|
332
|
+
const text = node.tag === "text" ? ink ? textContent(node) : String(node.text ?? "") : "";
|
|
333
|
+
const hasStroke = ink && attrs.stroke != null && !["none", "transparent"].includes(attrs.stroke) && Number(attrs["stroke-opacity"]) !== 0;
|
|
334
|
+
const hasFill = !ink || !["none", "transparent"].includes(attrs.fill) && Number(attrs["fill-opacity"]) !== 0;
|
|
335
|
+
let drawn = false;
|
|
336
|
+
if (text.trim() && (hasFill || hasStroke)) {
|
|
337
|
+
const size = Number(attrs["font-size"]) || 12;
|
|
338
|
+
const width = ink && attrs.textLength != null ? Number(attrs.textLength) : measure(text, size, Number(attrs["font-weight"]) || 400) + (ink ? (Number(attrs["letter-spacing"]) || 0) * [...text].length : 0);
|
|
192
339
|
const x = (Number(attrs.x) || 0) + (Number(attrs.dx) || 0), y = (Number(attrs.y) || 0) + (Number(attrs.dy) || 0);
|
|
193
340
|
const left = attrs["text-anchor"] === "middle" ? x - width / 2 : attrs["text-anchor"] === "end" ? x - width : x;
|
|
194
341
|
const baseline = attrs["dominant-baseline"];
|
|
195
342
|
const [top, bottom] = ["middle", "central"].includes(baseline) ? [y - size / 2, y + size / 2] : ["hanging", "text-before-edge"].includes(baseline) ? [y, y + size] : [y - size * .8, y + size * .2];
|
|
196
|
-
const
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
343
|
+
const extraY = fullText ? size * .22 : 0, extraX = fullText ? 1 : 0;
|
|
344
|
+
rect(left - extraX, top - blockPadding - extraY, left + width + extraX, bottom + blockPadding + extraY);
|
|
345
|
+
drawn = true;
|
|
346
|
+
} else if (ink && (hasFill || hasStroke || attrs["marker-start"] || attrs["marker-end"] || attrs["marker-mid"])) {
|
|
347
|
+
const n = (key) => Number(attrs[key]) || 0;
|
|
348
|
+
drawn = true;
|
|
349
|
+
switch (node.tag) {
|
|
350
|
+
case "rect":
|
|
351
|
+
rect(n("x"), n("y"), n("x") + n("width"), n("y") + n("height"));
|
|
352
|
+
break;
|
|
353
|
+
case "line":
|
|
354
|
+
drawn = hasStroke || !!(attrs["marker-start"] || attrs["marker-end"]);
|
|
355
|
+
if (drawn) {
|
|
356
|
+
point(n("x1"), n("y1"));
|
|
357
|
+
point(n("x2"), n("y2"));
|
|
358
|
+
}
|
|
359
|
+
break;
|
|
360
|
+
case "circle":
|
|
361
|
+
case "ellipse": {
|
|
362
|
+
const x = n("cx"), y = n("cy"), rx = n(node.tag === "circle" ? "r" : "rx"), ry = n(node.tag === "circle" ? "r" : "ry");
|
|
363
|
+
const cx = a * x + c * y + e, cy = b * x + d * y + f;
|
|
364
|
+
const w = Math.hypot(a * rx, c * ry), h = Math.hypot(b * rx, d * ry);
|
|
365
|
+
grow(cx - w, cy - h);
|
|
366
|
+
grow(cx + w, cy + h);
|
|
367
|
+
break;
|
|
368
|
+
}
|
|
369
|
+
case "polygon":
|
|
370
|
+
case "polyline": {
|
|
371
|
+
const points = (String(attrs.points || "").match(NUMBER) || []).map(Number);
|
|
372
|
+
for (let i = 1; i < points.length; i += 2) point(points[i - 1], points[i]);
|
|
373
|
+
break;
|
|
374
|
+
}
|
|
375
|
+
case "path":
|
|
376
|
+
pathExtent(attrs.d, point, matrix);
|
|
377
|
+
break;
|
|
378
|
+
default: drawn = false;
|
|
379
|
+
}
|
|
380
|
+
}
|
|
381
|
+
if (drawn && hasStroke) {
|
|
382
|
+
const scale = attrs["vector-effect"] === "non-scaling-stroke" ? 1 : (Math.hypot(a + d, b - c) + Math.hypot(a - d, b + c)) / 2;
|
|
383
|
+
stroke = Math.max(stroke, (Number(attrs["stroke-width"] ?? 1) || 0) * scale);
|
|
384
|
+
}
|
|
385
|
+
if (!ink || node.tag !== "text") {
|
|
386
|
+
const paint = ink ? Object.fromEntries(paintKeys.filter((key) => key in attrs).map((key) => [key, attrs[key]])) : inherited;
|
|
387
|
+
for (const child of node.children || []) visit(child, matrix, paint);
|
|
203
388
|
}
|
|
204
|
-
for (const child of node.children || []) visit(child, matrix);
|
|
205
389
|
};
|
|
206
390
|
for (const child of scene.children) visit(child, IDENTITY);
|
|
207
|
-
return box
|
|
391
|
+
return ink && box ? {
|
|
392
|
+
...box,
|
|
393
|
+
stroke
|
|
394
|
+
} : box;
|
|
208
395
|
}
|
|
209
396
|
function containText(scene, measure, { blockPadding = 0 } = {}) {
|
|
210
|
-
const box =
|
|
397
|
+
const box = sceneExtent(scene, measure, blockPadding);
|
|
211
398
|
if (!box) return scene;
|
|
212
399
|
const beyond = (value) => value > .5 ? Math.ceil(value) : 0;
|
|
213
400
|
const left = beyond(-box.x0), top = beyond(-box.y0), right = beyond(box.x1 - scene.width), bottom = beyond(box.y1 - scene.height);
|
|
@@ -231,4 +418,34 @@ function containText(scene, measure, { blockPadding = 0 } = {}) {
|
|
|
231
418
|
}
|
|
232
419
|
};
|
|
233
420
|
}
|
|
234
|
-
|
|
421
|
+
function cropInk(scene, measure, { fullText = false, heading } = {}) {
|
|
422
|
+
const body = sceneExtent(scene, measure, 0, true, fullText);
|
|
423
|
+
const header = heading && sceneExtent({ children: [heading] }, measure, 0, true, fullText);
|
|
424
|
+
if (!body && !header) return scene;
|
|
425
|
+
const box = body || header;
|
|
426
|
+
let children = scene.children;
|
|
427
|
+
if (header) {
|
|
428
|
+
const gap = 8;
|
|
429
|
+
const dx = box.x0 - header.x0, dy = body ? body.y0 - header.y1 - gap : 0;
|
|
430
|
+
children = [el("g", { transform: `translate(${dx} ${dy})` }, [heading]), ...children];
|
|
431
|
+
if (body) {
|
|
432
|
+
box.x1 = Math.max(box.x1, header.x1 + dx);
|
|
433
|
+
box.y0 = header.y0 + dy;
|
|
434
|
+
}
|
|
435
|
+
}
|
|
436
|
+
const pad = 1 + box.stroke / 2;
|
|
437
|
+
const x = pad - box.x0, y = pad - box.y0;
|
|
438
|
+
const anchor = scene.anchor;
|
|
439
|
+
return {
|
|
440
|
+
...scene,
|
|
441
|
+
width: box.x1 - box.x0 + 2 * pad,
|
|
442
|
+
height: box.y1 - box.y0 + 2 * pad,
|
|
443
|
+
children: [el("g", { transform: `translate(${x} ${y})` }, children)],
|
|
444
|
+
...anchor ? { anchor: {
|
|
445
|
+
...anchor,
|
|
446
|
+
x: anchor.x + x,
|
|
447
|
+
y: anchor.y + y
|
|
448
|
+
} } : {}
|
|
449
|
+
};
|
|
450
|
+
}
|
|
451
|
+
export { allowedTags, containText, cropInk, el, escapeXml, hash, link, linkTargets, primitive, safeAttrs, safeHref, scene_exports, validateAttribute, validateLink, validateTag };
|
package/dist/esm/core/text.js
CHANGED
|
@@ -7,7 +7,7 @@ var text_exports = /* @__PURE__ */ __exportAll({
|
|
|
7
7
|
var isCJK = (ch) => /[\u2E80-\u9FFF\uF900-\uFAFF]/.test(ch);
|
|
8
8
|
var isCJKPunct = (ch) => /[\u3000-\u303F\uFF00-\uFFEF]/.test(ch);
|
|
9
9
|
function fallbackMeasure(text, size = 12, weight = 400) {
|
|
10
|
-
return [...String(text ?? "")].reduce((sum, ch) => sum + (/^[\u2e80-\u9fff\uf900-\ufaff\u3000-\u30ff\uac00-\ud7af]$/u.test(ch) ? 1 : .56) * size * (weight >= 600 ? 1.04 : 1), 0);
|
|
10
|
+
return [...String(text ?? "")].reduce((sum, ch) => sum + (/^[\u2e80-\u9fff\uf900-\ufaff\u3000-\u30ff\uac00-\ud7af\uff01-\uff60\uffe0-\uffe6]$/u.test(ch) ? 1 : .56) * size * (weight >= 600 ? 1.04 : 1), 0);
|
|
11
11
|
}
|
|
12
12
|
var NO_LINE_START = /* @__PURE__ */ new Set([..."))]]】」』〉》,,。、;;::!!??…%%"]);
|
|
13
13
|
var NO_LINE_END = /* @__PURE__ */ new Set([..."(([[【「『〈《"]);
|