@cardenelabs/dragon 0.45.0 → 0.45.2

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 (52) hide show
  1. package/dist/cli.cjs +70 -29
  2. package/dist/cli.cjs.map +1 -1
  3. package/dist/cli.js +70 -29
  4. package/dist/cli.js.map +1 -1
  5. package/dist/export.cjs +70 -29
  6. package/dist/export.cjs.map +1 -1
  7. package/dist/export.js +70 -29
  8. package/dist/export.js.map +1 -1
  9. package/dist/index.cjs +70 -29
  10. package/dist/index.cjs.map +1 -1
  11. package/dist/index.js +70 -29
  12. package/dist/index.js.map +1 -1
  13. package/dist/light/{chunk-VRAW7VAQ.cjs → chunk-5OQV42W3.cjs} +50 -19
  14. package/dist/light/chunk-5OQV42W3.cjs.map +1 -0
  15. package/dist/light/chunk-CLS6JVKK.cjs.map +1 -1
  16. package/dist/light/{chunk-JNSHZTPF.js → chunk-EHTQUCW4.js} +49 -18
  17. package/dist/light/chunk-EHTQUCW4.js.map +1 -0
  18. package/dist/light/{chunk-OUQ44P45.cjs → chunk-JCEKXALJ.cjs} +81 -81
  19. package/dist/light/{chunk-OUQ44P45.cjs.map → chunk-JCEKXALJ.cjs.map} +1 -1
  20. package/dist/light/{chunk-6ZUKJ3VO.js → chunk-YEQSLVIN.js} +2 -2
  21. package/dist/light/{git-C4RVNFT6.js → git-GESUYKGR.js} +3 -3
  22. package/dist/light/{git-I7D7RIW2.cjs → git-K3KAAAWW.cjs} +59 -59
  23. package/dist/light/{git-I7D7RIW2.cjs.map → git-K3KAAAWW.cjs.map} +1 -1
  24. package/dist/light/index.cjs +231 -219
  25. package/dist/light/index.cjs.map +1 -1
  26. package/dist/light/index.js +31 -19
  27. package/dist/light/index.js.map +1 -1
  28. package/dist/light/{lineup-YEG4HHEI.js → lineup-2V2U7HZH.js} +3 -3
  29. package/dist/light/{lineup-FAIKTH3Y.cjs → lineup-623J25LU.cjs} +40 -40
  30. package/dist/light/{lineup-FAIKTH3Y.cjs.map → lineup-623J25LU.cjs.map} +1 -1
  31. package/dist/light/{state-ZZUK6AQT.cjs → state-OZVCHX7H.cjs} +41 -41
  32. package/dist/light/{state-ZZUK6AQT.cjs.map → state-OZVCHX7H.cjs.map} +1 -1
  33. package/dist/light/{state-P3LIVI3K.js → state-T4OTVING.js} +2 -2
  34. package/dist/light/{time-B5WUQOFP.js → time-6WEMD4FQ.js} +3 -3
  35. package/dist/light/{time-64DJKYAL.cjs → time-PQCPVQOE.cjs} +84 -84
  36. package/dist/light/{time-64DJKYAL.cjs.map → time-PQCPVQOE.cjs.map} +1 -1
  37. package/dist/light/{tree-66EH4QVI.cjs → tree-6D7KI57H.cjs} +62 -62
  38. package/dist/light/{tree-66EH4QVI.cjs.map → tree-6D7KI57H.cjs.map} +1 -1
  39. package/dist/light/{tree-5HPREYW2.js → tree-ZJZQI5QT.js} +3 -3
  40. package/dist/player.global.js +3 -3
  41. package/package.json +1 -1
  42. package/src/layout/scene.ts +58 -16
  43. package/src/look/values.ts +1 -1
  44. package/src/render/draw.ts +34 -14
  45. package/dist/light/chunk-JNSHZTPF.js.map +0 -1
  46. package/dist/light/chunk-VRAW7VAQ.cjs.map +0 -1
  47. /package/dist/light/{chunk-6ZUKJ3VO.js.map → chunk-YEQSLVIN.js.map} +0 -0
  48. /package/dist/light/{git-C4RVNFT6.js.map → git-GESUYKGR.js.map} +0 -0
  49. /package/dist/light/{lineup-YEG4HHEI.js.map → lineup-2V2U7HZH.js.map} +0 -0
  50. /package/dist/light/{state-P3LIVI3K.js.map → state-T4OTVING.js.map} +0 -0
  51. /package/dist/light/{time-B5WUQOFP.js.map → time-6WEMD4FQ.js.map} +0 -0
  52. /package/dist/light/{tree-5HPREYW2.js.map → tree-ZJZQI5QT.js.map} +0 -0
package/dist/index.cjs CHANGED
@@ -516,7 +516,7 @@ var LOOK = {
516
516
  /**
517
517
  * `trail` は状態遷移図の帯の最後の、通った状態の点 (#3171)。`r` は点の半径、`step` は点の中心どうしの間、`now` は変わった値の欄の名前の横の点の半径と、名前からの離れ
518
518
  */
519
- strip: { h: 72, line: 44, pad: 12, icon: 24, titleX: 44, fieldGap: 22, sepInset: 14, tagGap: 6, tagH: 15, tagPadX: 7, nameY: 22, valueY: 43, trail: { r: 5.4, step: 16 }, now: { r: 3, gap: 7 } },
519
+ strip: { h: 72, line: 44, titleRow: 40, pad: 12, icon: 24, titleX: 44, fieldGap: 22, sepInset: 14, tagGap: 6, tagH: 15, tagPadX: 7, nameY: 22, valueY: 43, trail: { r: 5.4, step: 16 }, now: { r: 3, gap: 7 } },
520
520
  /** `time` から始まる値は時間軸の図 (#3165) の、目盛りの印の枠、拡大の枠、時刻の線、範囲の括弧と囲み、節目へ下ろす点線、節目の丸、針、物差しの線の印 */
521
521
  stroke: {
522
522
  git: 2.25,
@@ -994,26 +994,40 @@ function fieldWidth(diagram, name2) {
994
994
  var trailWidth = (trail) => Math.max(textWidth(trail.title, TYPE.fieldName), trail.states.length * LOOK.strip.trail.step);
995
995
  function stripNeed(diagram, trail) {
996
996
  if (!diagram.strip) return 0;
997
- const { titleX, fieldGap, pad: pad2 } = LOOK.strip;
998
- const start = titleX + textWidth(diagram.strip.title, TYPE.stripTitle) + fieldGap;
999
- const widths = [...diagram.strip.fields.map((name2) => fieldWidth(diagram, name2)), ...trail ? [trailWidth(trail)] : []];
1000
- return start + widths.reduce((sum, w) => sum + w + fieldGap, 0) - fieldGap + pad2;
997
+ return rowNeed(diagram.strip.title, [...diagram.strip.fields.map((name2) => fieldWidth(diagram, name2)), ...trail ? [trailWidth(trail)] : []]);
998
+ }
999
+ function rowNeed(title, widths) {
1000
+ const { fieldGap, pad: pad2 } = LOOK.strip;
1001
+ return stripStart(title) + widths.reduce((sum, w) => sum + w + fieldGap, 0) - fieldGap + pad2;
1002
+ }
1003
+ function stripStart(title) {
1004
+ return LOOK.strip.titleX + textWidth(title, TYPE.stripTitle) + LOOK.strip.fieldGap;
1005
+ }
1006
+ function fieldPlacer(start, width) {
1007
+ const { fieldGap, pad: pad2 } = LOOK.strip;
1008
+ let cx = start;
1009
+ let row = 0;
1010
+ return {
1011
+ place(w) {
1012
+ if (cx > start && cx + w > width - pad2) {
1013
+ cx = start;
1014
+ row++;
1015
+ }
1016
+ const at = { x: cx, row };
1017
+ cx += w + fieldGap;
1018
+ return at;
1019
+ },
1020
+ rows: () => row
1021
+ };
1001
1022
  }
1002
1023
  function layoutStrip(diagram, x, y, width, trail) {
1003
1024
  if (!diagram.strip) return void 0;
1004
- const { titleX, fieldGap, pad: pad2, line: line2, h } = LOOK.strip;
1005
- const start = titleX + textWidth(diagram.strip.title, TYPE.stripTitle) + fieldGap;
1025
+ const { line: line2, h } = LOOK.strip;
1006
1026
  const fields = [];
1007
- let cx = start;
1008
- let row = 0;
1027
+ const placer = fieldPlacer(stripStart(diagram.strip.title), width);
1009
1028
  const place2 = (w) => {
1010
- if (cx > start && cx + w > width - pad2) {
1011
- cx = start;
1012
- row++;
1013
- }
1014
- const at = { x: x + cx, y: y + row * line2 };
1015
- cx += w + fieldGap;
1016
- return at;
1029
+ const at = placer.place(w);
1030
+ return { x: x + at.x, y: y + at.row * line2 };
1017
1031
  };
1018
1032
  for (const name2 of diagram.strip.fields) {
1019
1033
  const w = fieldWidth(diagram, name2);
@@ -1023,7 +1037,23 @@ function layoutStrip(diagram, x, y, width, trail) {
1023
1037
  fields.push({ name: name2, ...at, w, ...meter && line3 !== void 0 ? { meter: { line: line3, text: meter.line, x: at.x, w: LOOK.time.meter.w } } : {} });
1024
1038
  }
1025
1039
  const laidTrail = trail ? { ...trail, ...place2(trailWidth(trail)), w: trailWidth(trail) } : void 0;
1026
- return { x, y, w: width, h: h + row * line2, title: diagram.strip.title, fields, ...laidTrail ? { trail: laidTrail } : {} };
1040
+ return { x, y, w: width, h: h + placer.rows() * line2, title: diagram.strip.title, fields, ...laidTrail ? { trail: laidTrail } : {} };
1041
+ }
1042
+ function rewrapStrip(s, x, y, width) {
1043
+ const { line: line2, h, pad: pad2, titleRow } = LOOK.strip;
1044
+ const stacked = rowNeed(s.title, [...s.fields.map((f) => f.w), ...s.trail ? [s.trail.w] : []]) > width;
1045
+ const top = stacked ? titleRow : 0;
1046
+ const placer = fieldPlacer(stacked ? pad2 : stripStart(s.title), width);
1047
+ const place2 = (w) => {
1048
+ const at = placer.place(w);
1049
+ return { x: x + at.x, y: y + top + at.row * line2 };
1050
+ };
1051
+ const fields = s.fields.map((field2) => {
1052
+ const at = place2(field2.w);
1053
+ return { ...field2, ...at, ...field2.meter ? { meter: { ...field2.meter, x: at.x } } : {} };
1054
+ });
1055
+ const trail = s.trail ? { ...s.trail, ...place2(s.trail.w) } : void 0;
1056
+ return { ...s, x, y, w: width, h: h + placer.rows() * line2 + top, fields, ...trail ? { trail } : {} };
1027
1057
  }
1028
1058
  function shiftContent(layout, dx, dy) {
1029
1059
  const move = (rect) => {
@@ -13061,7 +13091,8 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
13061
13091
  const arrivals = new Map((timeline.states ?? []).flatMap((s) => s.lit[0] ? [[s.box, s.lit[0].start]] : []));
13062
13092
  const meters = new Map((timeline.meters ?? []).map((meter) => [meter.field, meter.keys]));
13063
13093
  const gauge = (field2) => field2.meter ? kindParts("time").meterField({ ...field2, meter: field2.meter }, meters.get(field2.name) ?? [[0, 0]], ctx) : void 0;
13064
- if (layout.strip) L.band.push(strip(layout.strip, fieldChanges(diagram, timeline, layout), ctx, isState, arrivals, gauge));
13094
+ const drawStrip = (s) => strip(s, fieldChanges(diagram, timeline, layout), ctx, isState, arrivals, gauge);
13095
+ if (layout.strip && !follow) L.band.push(drawStrip(layout.strip));
13065
13096
  for (const line2 of layout.lifelines) L.base.push(lifeline(line2.x, line2.y1, line2.y2));
13066
13097
  if (isGitLayout(layout)) {
13067
13098
  const git = kindParts("git").drawGit(layout, diagram, timeline, ctx);
@@ -13113,7 +13144,7 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
13113
13144
  L.node.push(linked(box.id, card(box, ctx, on.get(box.id) ?? [], subs.get(box.id) ?? [], isState ? state?.lit ?? [] : void 0)));
13114
13145
  if (state?.done !== void 0) L.node.push(doneMark(box, state.done, ctx));
13115
13146
  }
13116
- for (const b of layout.badges) L.badge.push(badge(b, ctx, isState));
13147
+ for (const b of layout.badges) if (!(follow && onStrip(layout, b))) L.badge.push(badge(b, ctx, isState));
13117
13148
  for (const l of layout.labels) {
13118
13149
  const time = timeline.labels.find((t) => t.step === l.step && t.event === l.event);
13119
13150
  if (time) L.top.push(label(l, fadeBefore(l, time, timeline.steps), ctx));
@@ -13133,7 +13164,8 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
13133
13164
  const { near, far, nearY, farY } = LOOK.shadow;
13134
13165
  const shadow = `<filter id="dg-sh-${id}" x="-20%" y="-30%" width="140%" height="180%"><feDropShadow dx="0" dy="${nearY}" stdDeviation="${near}" style="flood-color:var(--sh);flood-opacity:var(--shA)"/><feDropShadow dx="0" dy="${farY}" stdDeviation="${far}" style="flood-color:var(--sh);flood-opacity:var(--shB)"/></filter>`;
13135
13166
  const heads = follow && layout.kind === "sequence" ? layout.boxes.map((box) => linked(box.id, headCard(box, ctx, on.get(box.id) ?? [], subs.get(box.id) ?? []))).join("") : "";
13136
- const view = follow ? followView(layout, timeline, diagram, m, id, content, follow, heads) : { body: `<rect class="dg-bg" width="${layout.width}" height="${layout.height}" rx="${LOOK.region.radius}"/>${content}`, w: layout.width, h: layout.height };
13167
+ const drawTable = (s, from) => drawStrip(s) + layout.badges.filter((b) => onStrip(layout, b)).map((b) => badge({ ...b, x: b.x - from.x + s.x + LOOK.badge.r, y: b.y - from.y + s.y }, ctx, isState)).join("");
13168
+ const view = follow ? followView(layout, timeline, diagram, m, id, content, follow, heads, drawTable) : { body: `<rect class="dg-bg" width="${layout.width}" height="${layout.height}" rx="${LOOK.region.radius}"/>${content}`, w: layout.width, h: layout.height };
13137
13169
  const css = `.dg-${id}{${FONT_VARS};--T:${timeline.total}s;${vars}}${PART_CSS}${m.frames.join("")}`;
13138
13170
  return `<svg xmlns="http://www.w3.org/2000/svg" class="dg dg-${id}" viewBox="0 0 ${Math.ceil(view.w)} ${Math.ceil(view.h)}" width="${Math.ceil(view.w)}" height="${Math.ceil(view.h)}" role="img" aria-label="${esc(diagram.title)}" data-dragon="figure" data-view="${follow ? "follow" : "fixed"}"><style>${css}</style><defs>${shadow}</defs>${view.body}</svg>`;
13139
13171
  }
@@ -13142,6 +13174,9 @@ function union2(rects) {
13142
13174
  const y = Math.min(...rects.map((r) => r.y));
13143
13175
  return { x, y, w: Math.max(...rects.map((r) => r.x + r.w)) - x, h: Math.max(...rects.map((r) => r.y + r.h)) - y };
13144
13176
  }
13177
+ function onStrip(layout, badge2) {
13178
+ return layout.strip !== void 0 && badge2.y >= layout.strip.y;
13179
+ }
13145
13180
  function focusOf(layout, diagram, step) {
13146
13181
  const rects = focusParts(layout, diagram, step);
13147
13182
  return rects.length === 0 ? void 0 : union2(rects);
@@ -13187,31 +13222,33 @@ function focusParts(layout, diagram, step) {
13187
13222
  }
13188
13223
  return rects;
13189
13224
  }
13190
- function followView(layout, timeline, diagram, m, id, content, follow, heads) {
13225
+ function followView(layout, timeline, diagram, m, id, content, follow, heads, drawTable) {
13191
13226
  const F = LOOK.follow;
13192
13227
  const M = LOOK.mini;
13193
13228
  const frameWidth = Math.max(1, follow.width);
13194
13229
  const full = Math.min(layout.width, frameWidth);
13230
+ const worldH = layout.strip ? layout.strip.y : layout.height;
13195
13231
  const title = FIGURE_TEXT[follow.lang].overview;
13196
13232
  const sized = (vh2) => {
13197
13233
  const mw2 = Math.min(M.w, full * 0.4, vh2 * 0.4 / layout.height * layout.width);
13198
13234
  const k2 = mw2 / layout.width;
13199
- const mh2 = layout.height * k2;
13235
+ const mh2 = worldH * k2;
13200
13236
  const bw2 = Math.max(mw2, Math.ceil(textWidth(title, TYPE.miniTitle)));
13201
13237
  return { vh: vh2, mw: mw2, k: k2, mh: mh2, bw: bw2, bgW: bw2 + M.pad * 2, bgH: mh2 + M.pad * 2 + M.title, beside: mh2 > mw2 };
13202
13238
  };
13203
- const natural = sized(Math.min(layout.height, Math.max(F.minH, full * F.aspect)));
13239
+ const natural = sized(Math.min(worldH, Math.max(F.minH, full * F.aspect)));
13204
13240
  const bare = natural.beside && frameWidth < F.narrow;
13205
- const room = follow.height === void 0 ? Number.POSITIVE_INFINITY : natural.beside ? follow.height : follow.height - natural.bgH - M.inset;
13206
- const { vh, mw, k, mh, bw, bgW, bgH, beside } = room < natural.vh ? sized(Math.max(F.fitMinH, room)) : { ...natural, vh: Number.isFinite(room) ? Math.min(layout.height, room) : natural.vh };
13241
+ const tableH = layout.strip ? rewrapStrip(layout.strip, 0, 0, full).h + M.inset : 0;
13242
+ const room = follow.height === void 0 ? Number.POSITIVE_INFINITY : (natural.beside ? follow.height : follow.height - natural.bgH - M.inset) - tableH;
13243
+ const { vh, mw, k, mh, bw, bgW, bgH, beside } = room < natural.vh ? sized(Math.max(F.fitMinH, room)) : { ...natural, vh: Number.isFinite(room) ? Math.min(worldH, room) : natural.vh };
13207
13244
  const vw = beside && !bare ? Math.min(layout.width, frameWidth - bgW - M.inset) : full;
13208
13245
  const clampX = (x) => Math.min(layout.width - vw / 2, Math.max(vw / 2, x));
13209
13246
  const top = heads === "" ? 0 : Math.max(...layout.boxes.map((b) => b.y + b.h)) + F.headRoom;
13210
13247
  const strip2 = heads === "" ? 0 : F.head.pad * 2 + F.head.h;
13211
13248
  const below = vh - strip2;
13212
- const clampY = (y) => Math.min(layout.height - below / 2, Math.max(top + below / 2, y));
13249
+ const clampY = (y) => Math.min(worldH - below / 2, Math.max(top + below / 2, y));
13213
13250
  const r = LOOK.badge.r;
13214
- let prev = [layout.width / 2, layout.height / 2];
13251
+ let prev = [layout.width / 2, worldH / 2];
13215
13252
  const middles = timeline.steps.map((_, s) => {
13216
13253
  if (isTimeLayout(layout)) {
13217
13254
  const f2 = kindParts("time").timeFocus(layout, timeline, s, focusParts(layout, diagram, s), vw, below);
@@ -13222,7 +13259,7 @@ function followView(layout, timeline, diagram, m, id, content, follow, heads) {
13222
13259
  prev = f ? [f.x + f.w / 2, f.y + f.h / 2] : prev;
13223
13260
  const at = [clampX(prev[0]), clampY(prev[1])];
13224
13261
  const b = layout.badges.find((x) => x.step === s);
13225
- if (!b || Math.abs(b.x - at[0]) <= vw / 2 - r && Math.abs(b.y - at[1]) <= below / 2 - r) return at;
13262
+ if (!b || onStrip(layout, b) || Math.abs(b.x - at[0]) <= vw / 2 - r && Math.abs(b.y - at[1]) <= below / 2 - r) return at;
13226
13263
  const near = badgeFocus(b, focusParts(layout, diagram, s), vw, below);
13227
13264
  prev = [near.x + near.w / 2, near.y + near.h / 2];
13228
13265
  return [clampX(prev[0]), clampY(prev[1])];
@@ -13262,7 +13299,11 @@ function followView(layout, timeline, diagram, m, id, content, follow, heads) {
13262
13299
  const mini = bare ? { clip: "", body: "" } : overview();
13263
13300
  const head = strip2 === 0 ? "" : `<g class="dg-hd"><rect class="dg-hd-bg" width="${vw}" height="${strip2}"/><line class="dg-sep" x1="0" y1="${strip2}" x2="${vw}" y2="${strip2}"/><g class="dg-a" style="${m.move(cam.map(([t, cx, , s, e]) => [t, vw / 2 - cx, 0, s, e]))}">${heads}</g></g>`;
13264
13301
  const body = `<defs><clipPath id="dg-vp-${id}"><rect width="${vw}" height="${vh}" rx="${LOOK.region.radius}"/></clipPath>${mini.clip}</defs><g clip-path="url(#dg-vp-${id})"><rect class="dg-vp-bg" width="${vw}" height="${vh}"/><g class="dg-a" style="${camKf}">${content}</g>${head}</g><rect class="dg-vp-frame" x="0.5" y="0.5" width="${vw - 1}" height="${vh - 1}" rx="${LOOK.region.radius}"/>${mini.body}`;
13265
- return { body, w: beside && !bare ? vw + M.inset + bgW : full, h: beside ? vh : bgY + bgH };
13302
+ const w = beside && !bare ? vw + M.inset + bgW : full;
13303
+ const bottom = beside ? vh : bgY + bgH;
13304
+ if (!layout.strip) return { body, w, h: bottom };
13305
+ const table = rewrapStrip(layout.strip, 0, bottom + M.inset, full);
13306
+ return { body: body + drawTable(table, layout.strip), w, h: table.y + table.h };
13266
13307
  }
13267
13308
  function paletteOf(options, theme) {
13268
13309
  const palette = resolvePalette(options.palette);