@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.js CHANGED
@@ -514,7 +514,7 @@ var LOOK = {
514
514
  /**
515
515
  * `trail` は状態遷移図の帯の最後の、通った状態の点 (#3171)。`r` は点の半径、`step` は点の中心どうしの間、`now` は変わった値の欄の名前の横の点の半径と、名前からの離れ
516
516
  */
517
- 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 } },
517
+ 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 } },
518
518
  /** `time` から始まる値は時間軸の図 (#3165) の、目盛りの印の枠、拡大の枠、時刻の線、範囲の括弧と囲み、節目へ下ろす点線、節目の丸、針、物差しの線の印 */
519
519
  stroke: {
520
520
  git: 2.25,
@@ -992,26 +992,40 @@ function fieldWidth(diagram, name2) {
992
992
  var trailWidth = (trail) => Math.max(textWidth(trail.title, TYPE.fieldName), trail.states.length * LOOK.strip.trail.step);
993
993
  function stripNeed(diagram, trail) {
994
994
  if (!diagram.strip) return 0;
995
- const { titleX, fieldGap, pad: pad2 } = LOOK.strip;
996
- const start = titleX + textWidth(diagram.strip.title, TYPE.stripTitle) + fieldGap;
997
- const widths = [...diagram.strip.fields.map((name2) => fieldWidth(diagram, name2)), ...trail ? [trailWidth(trail)] : []];
998
- return start + widths.reduce((sum, w) => sum + w + fieldGap, 0) - fieldGap + pad2;
995
+ return rowNeed(diagram.strip.title, [...diagram.strip.fields.map((name2) => fieldWidth(diagram, name2)), ...trail ? [trailWidth(trail)] : []]);
996
+ }
997
+ function rowNeed(title, widths) {
998
+ const { fieldGap, pad: pad2 } = LOOK.strip;
999
+ return stripStart(title) + widths.reduce((sum, w) => sum + w + fieldGap, 0) - fieldGap + pad2;
1000
+ }
1001
+ function stripStart(title) {
1002
+ return LOOK.strip.titleX + textWidth(title, TYPE.stripTitle) + LOOK.strip.fieldGap;
1003
+ }
1004
+ function fieldPlacer(start, width) {
1005
+ const { fieldGap, pad: pad2 } = LOOK.strip;
1006
+ let cx = start;
1007
+ let row = 0;
1008
+ return {
1009
+ place(w) {
1010
+ if (cx > start && cx + w > width - pad2) {
1011
+ cx = start;
1012
+ row++;
1013
+ }
1014
+ const at = { x: cx, row };
1015
+ cx += w + fieldGap;
1016
+ return at;
1017
+ },
1018
+ rows: () => row
1019
+ };
999
1020
  }
1000
1021
  function layoutStrip(diagram, x, y, width, trail) {
1001
1022
  if (!diagram.strip) return void 0;
1002
- const { titleX, fieldGap, pad: pad2, line: line2, h } = LOOK.strip;
1003
- const start = titleX + textWidth(diagram.strip.title, TYPE.stripTitle) + fieldGap;
1023
+ const { line: line2, h } = LOOK.strip;
1004
1024
  const fields = [];
1005
- let cx = start;
1006
- let row = 0;
1025
+ const placer = fieldPlacer(stripStart(diagram.strip.title), width);
1007
1026
  const place2 = (w) => {
1008
- if (cx > start && cx + w > width - pad2) {
1009
- cx = start;
1010
- row++;
1011
- }
1012
- const at = { x: x + cx, y: y + row * line2 };
1013
- cx += w + fieldGap;
1014
- return at;
1027
+ const at = placer.place(w);
1028
+ return { x: x + at.x, y: y + at.row * line2 };
1015
1029
  };
1016
1030
  for (const name2 of diagram.strip.fields) {
1017
1031
  const w = fieldWidth(diagram, name2);
@@ -1021,7 +1035,23 @@ function layoutStrip(diagram, x, y, width, trail) {
1021
1035
  fields.push({ name: name2, ...at, w, ...meter && line3 !== void 0 ? { meter: { line: line3, text: meter.line, x: at.x, w: LOOK.time.meter.w } } : {} });
1022
1036
  }
1023
1037
  const laidTrail = trail ? { ...trail, ...place2(trailWidth(trail)), w: trailWidth(trail) } : void 0;
1024
- return { x, y, w: width, h: h + row * line2, title: diagram.strip.title, fields, ...laidTrail ? { trail: laidTrail } : {} };
1038
+ return { x, y, w: width, h: h + placer.rows() * line2, title: diagram.strip.title, fields, ...laidTrail ? { trail: laidTrail } : {} };
1039
+ }
1040
+ function rewrapStrip(s, x, y, width) {
1041
+ const { line: line2, h, pad: pad2, titleRow } = LOOK.strip;
1042
+ const stacked = rowNeed(s.title, [...s.fields.map((f) => f.w), ...s.trail ? [s.trail.w] : []]) > width;
1043
+ const top = stacked ? titleRow : 0;
1044
+ const placer = fieldPlacer(stacked ? pad2 : stripStart(s.title), width);
1045
+ const place2 = (w) => {
1046
+ const at = placer.place(w);
1047
+ return { x: x + at.x, y: y + top + at.row * line2 };
1048
+ };
1049
+ const fields = s.fields.map((field2) => {
1050
+ const at = place2(field2.w);
1051
+ return { ...field2, ...at, ...field2.meter ? { meter: { ...field2.meter, x: at.x } } : {} };
1052
+ });
1053
+ const trail = s.trail ? { ...s.trail, ...place2(s.trail.w) } : void 0;
1054
+ return { ...s, x, y, w: width, h: h + placer.rows() * line2 + top, fields, ...trail ? { trail } : {} };
1025
1055
  }
1026
1056
  function shiftContent(layout, dx, dy) {
1027
1057
  const move = (rect) => {
@@ -13059,7 +13089,8 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
13059
13089
  const arrivals = new Map((timeline.states ?? []).flatMap((s) => s.lit[0] ? [[s.box, s.lit[0].start]] : []));
13060
13090
  const meters = new Map((timeline.meters ?? []).map((meter) => [meter.field, meter.keys]));
13061
13091
  const gauge = (field2) => field2.meter ? kindParts("time").meterField({ ...field2, meter: field2.meter }, meters.get(field2.name) ?? [[0, 0]], ctx) : void 0;
13062
- if (layout.strip) L.band.push(strip(layout.strip, fieldChanges(diagram, timeline, layout), ctx, isState, arrivals, gauge));
13092
+ const drawStrip = (s) => strip(s, fieldChanges(diagram, timeline, layout), ctx, isState, arrivals, gauge);
13093
+ if (layout.strip && !follow) L.band.push(drawStrip(layout.strip));
13063
13094
  for (const line2 of layout.lifelines) L.base.push(lifeline(line2.x, line2.y1, line2.y2));
13064
13095
  if (isGitLayout(layout)) {
13065
13096
  const git = kindParts("git").drawGit(layout, diagram, timeline, ctx);
@@ -13111,7 +13142,7 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
13111
13142
  L.node.push(linked(box.id, card(box, ctx, on.get(box.id) ?? [], subs.get(box.id) ?? [], isState ? state?.lit ?? [] : void 0)));
13112
13143
  if (state?.done !== void 0) L.node.push(doneMark(box, state.done, ctx));
13113
13144
  }
13114
- for (const b of layout.badges) L.badge.push(badge(b, ctx, isState));
13145
+ for (const b of layout.badges) if (!(follow && onStrip(layout, b))) L.badge.push(badge(b, ctx, isState));
13115
13146
  for (const l of layout.labels) {
13116
13147
  const time = timeline.labels.find((t) => t.step === l.step && t.event === l.event);
13117
13148
  if (time) L.top.push(label(l, fadeBefore(l, time, timeline.steps), ctx));
@@ -13131,7 +13162,8 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
13131
13162
  const { near, far, nearY, farY } = LOOK.shadow;
13132
13163
  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>`;
13133
13164
  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("") : "";
13134
- 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 };
13165
+ 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("");
13166
+ 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 };
13135
13167
  const css = `.dg-${id}{${FONT_VARS};--T:${timeline.total}s;${vars}}${PART_CSS}${m.frames.join("")}`;
13136
13168
  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>`;
13137
13169
  }
@@ -13140,6 +13172,9 @@ function union2(rects) {
13140
13172
  const y = Math.min(...rects.map((r) => r.y));
13141
13173
  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 };
13142
13174
  }
13175
+ function onStrip(layout, badge2) {
13176
+ return layout.strip !== void 0 && badge2.y >= layout.strip.y;
13177
+ }
13143
13178
  function focusOf(layout, diagram, step) {
13144
13179
  const rects = focusParts(layout, diagram, step);
13145
13180
  return rects.length === 0 ? void 0 : union2(rects);
@@ -13185,31 +13220,33 @@ function focusParts(layout, diagram, step) {
13185
13220
  }
13186
13221
  return rects;
13187
13222
  }
13188
- function followView(layout, timeline, diagram, m, id, content, follow, heads) {
13223
+ function followView(layout, timeline, diagram, m, id, content, follow, heads, drawTable) {
13189
13224
  const F = LOOK.follow;
13190
13225
  const M = LOOK.mini;
13191
13226
  const frameWidth = Math.max(1, follow.width);
13192
13227
  const full = Math.min(layout.width, frameWidth);
13228
+ const worldH = layout.strip ? layout.strip.y : layout.height;
13193
13229
  const title = FIGURE_TEXT[follow.lang].overview;
13194
13230
  const sized = (vh2) => {
13195
13231
  const mw2 = Math.min(M.w, full * 0.4, vh2 * 0.4 / layout.height * layout.width);
13196
13232
  const k2 = mw2 / layout.width;
13197
- const mh2 = layout.height * k2;
13233
+ const mh2 = worldH * k2;
13198
13234
  const bw2 = Math.max(mw2, Math.ceil(textWidth(title, TYPE.miniTitle)));
13199
13235
  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 };
13200
13236
  };
13201
- const natural = sized(Math.min(layout.height, Math.max(F.minH, full * F.aspect)));
13237
+ const natural = sized(Math.min(worldH, Math.max(F.minH, full * F.aspect)));
13202
13238
  const bare = natural.beside && frameWidth < F.narrow;
13203
- const room = follow.height === void 0 ? Number.POSITIVE_INFINITY : natural.beside ? follow.height : follow.height - natural.bgH - M.inset;
13204
- 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 };
13239
+ const tableH = layout.strip ? rewrapStrip(layout.strip, 0, 0, full).h + M.inset : 0;
13240
+ const room = follow.height === void 0 ? Number.POSITIVE_INFINITY : (natural.beside ? follow.height : follow.height - natural.bgH - M.inset) - tableH;
13241
+ 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 };
13205
13242
  const vw = beside && !bare ? Math.min(layout.width, frameWidth - bgW - M.inset) : full;
13206
13243
  const clampX = (x) => Math.min(layout.width - vw / 2, Math.max(vw / 2, x));
13207
13244
  const top = heads === "" ? 0 : Math.max(...layout.boxes.map((b) => b.y + b.h)) + F.headRoom;
13208
13245
  const strip2 = heads === "" ? 0 : F.head.pad * 2 + F.head.h;
13209
13246
  const below = vh - strip2;
13210
- const clampY = (y) => Math.min(layout.height - below / 2, Math.max(top + below / 2, y));
13247
+ const clampY = (y) => Math.min(worldH - below / 2, Math.max(top + below / 2, y));
13211
13248
  const r = LOOK.badge.r;
13212
- let prev = [layout.width / 2, layout.height / 2];
13249
+ let prev = [layout.width / 2, worldH / 2];
13213
13250
  const middles = timeline.steps.map((_, s) => {
13214
13251
  if (isTimeLayout(layout)) {
13215
13252
  const f2 = kindParts("time").timeFocus(layout, timeline, s, focusParts(layout, diagram, s), vw, below);
@@ -13220,7 +13257,7 @@ function followView(layout, timeline, diagram, m, id, content, follow, heads) {
13220
13257
  prev = f ? [f.x + f.w / 2, f.y + f.h / 2] : prev;
13221
13258
  const at = [clampX(prev[0]), clampY(prev[1])];
13222
13259
  const b = layout.badges.find((x) => x.step === s);
13223
- if (!b || Math.abs(b.x - at[0]) <= vw / 2 - r && Math.abs(b.y - at[1]) <= below / 2 - r) return at;
13260
+ 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;
13224
13261
  const near = badgeFocus(b, focusParts(layout, diagram, s), vw, below);
13225
13262
  prev = [near.x + near.w / 2, near.y + near.h / 2];
13226
13263
  return [clampX(prev[0]), clampY(prev[1])];
@@ -13260,7 +13297,11 @@ function followView(layout, timeline, diagram, m, id, content, follow, heads) {
13260
13297
  const mini = bare ? { clip: "", body: "" } : overview();
13261
13298
  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>`;
13262
13299
  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}`;
13263
- return { body, w: beside && !bare ? vw + M.inset + bgW : full, h: beside ? vh : bgY + bgH };
13300
+ const w = beside && !bare ? vw + M.inset + bgW : full;
13301
+ const bottom = beside ? vh : bgY + bgH;
13302
+ if (!layout.strip) return { body, w, h: bottom };
13303
+ const table = rewrapStrip(layout.strip, 0, bottom + M.inset, full);
13304
+ return { body: body + drawTable(table, layout.strip), w, h: table.y + table.h };
13264
13305
  }
13265
13306
  function paletteOf(options, theme) {
13266
13307
  const palette = resolvePalette(options.palette);