@cardenelabs/dragon 0.45.0 → 0.45.3

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 +71 -30
  2. package/dist/cli.cjs.map +1 -1
  3. package/dist/cli.js +71 -30
  4. package/dist/cli.js.map +1 -1
  5. package/dist/export.cjs +71 -30
  6. package/dist/export.cjs.map +1 -1
  7. package/dist/export.js +71 -30
  8. package/dist/export.js.map +1 -1
  9. package/dist/index.cjs +71 -30
  10. package/dist/index.cjs.map +1 -1
  11. package/dist/index.js +71 -30
  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 +232 -220
  25. package/dist/light/index.cjs.map +1 -1
  26. package/dist/light/index.js +32 -20
  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 +39 -17
  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/cli.cjs CHANGED
@@ -518,7 +518,7 @@ var LOOK = {
518
518
  /**
519
519
  * `trail` は状態遷移図の帯の最後の、通った状態の点 (#3171)。`r` は点の半径、`step` は点の中心どうしの間、`now` は変わった値の欄の名前の横の点の半径と、名前からの離れ
520
520
  */
521
- 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 } },
521
+ 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 } },
522
522
  /** `time` から始まる値は時間軸の図 (#3165) の、目盛りの印の枠、拡大の枠、時刻の線、範囲の括弧と囲み、節目へ下ろす点線、節目の丸、針、物差しの線の印 */
523
523
  stroke: {
524
524
  git: 2.25,
@@ -999,26 +999,40 @@ function fieldWidth(diagram, name) {
999
999
  var trailWidth = (trail) => Math.max(textWidth(trail.title, TYPE.fieldName), trail.states.length * LOOK.strip.trail.step);
1000
1000
  function stripNeed(diagram, trail) {
1001
1001
  if (!diagram.strip) return 0;
1002
- const { titleX, fieldGap, pad: pad2 } = LOOK.strip;
1003
- const start = titleX + textWidth(diagram.strip.title, TYPE.stripTitle) + fieldGap;
1004
- const widths = [...diagram.strip.fields.map((name) => fieldWidth(diagram, name)), ...trail ? [trailWidth(trail)] : []];
1005
- return start + widths.reduce((sum, w) => sum + w + fieldGap, 0) - fieldGap + pad2;
1002
+ return rowNeed(diagram.strip.title, [...diagram.strip.fields.map((name) => fieldWidth(diagram, name)), ...trail ? [trailWidth(trail)] : []]);
1003
+ }
1004
+ function rowNeed(title, widths) {
1005
+ const { fieldGap, pad: pad2 } = LOOK.strip;
1006
+ return stripStart(title) + widths.reduce((sum, w) => sum + w + fieldGap, 0) - fieldGap + pad2;
1007
+ }
1008
+ function stripStart(title) {
1009
+ return LOOK.strip.titleX + textWidth(title, TYPE.stripTitle) + LOOK.strip.fieldGap;
1010
+ }
1011
+ function fieldPlacer(start, width) {
1012
+ const { fieldGap, pad: pad2 } = LOOK.strip;
1013
+ let cx = start;
1014
+ let row = 0;
1015
+ return {
1016
+ place(w) {
1017
+ if (cx > start && cx + w > width - pad2) {
1018
+ cx = start;
1019
+ row++;
1020
+ }
1021
+ const at2 = { x: cx, row };
1022
+ cx += w + fieldGap;
1023
+ return at2;
1024
+ },
1025
+ rows: () => row
1026
+ };
1006
1027
  }
1007
1028
  function layoutStrip(diagram, x, y, width, trail) {
1008
1029
  if (!diagram.strip) return void 0;
1009
- const { titleX, fieldGap, pad: pad2, line, h } = LOOK.strip;
1010
- const start = titleX + textWidth(diagram.strip.title, TYPE.stripTitle) + fieldGap;
1030
+ const { line, h } = LOOK.strip;
1011
1031
  const fields = [];
1012
- let cx = start;
1013
- let row = 0;
1032
+ const placer = fieldPlacer(stripStart(diagram.strip.title), width);
1014
1033
  const place2 = (w) => {
1015
- if (cx > start && cx + w > width - pad2) {
1016
- cx = start;
1017
- row++;
1018
- }
1019
- const at2 = { x: x + cx, y: y + row * line };
1020
- cx += w + fieldGap;
1021
- return at2;
1034
+ const at2 = placer.place(w);
1035
+ return { x: x + at2.x, y: y + at2.row * line };
1022
1036
  };
1023
1037
  for (const name of diagram.strip.fields) {
1024
1038
  const w = fieldWidth(diagram, name);
@@ -1028,7 +1042,23 @@ function layoutStrip(diagram, x, y, width, trail) {
1028
1042
  fields.push({ name, ...at2, w, ...meter && line2 !== void 0 ? { meter: { line: line2, text: meter.line, x: at2.x, w: LOOK.time.meter.w } } : {} });
1029
1043
  }
1030
1044
  const laidTrail = trail ? { ...trail, ...place2(trailWidth(trail)), w: trailWidth(trail) } : void 0;
1031
- return { x, y, w: width, h: h + row * line, title: diagram.strip.title, fields, ...laidTrail ? { trail: laidTrail } : {} };
1045
+ return { x, y, w: width, h: h + placer.rows() * line, title: diagram.strip.title, fields, ...laidTrail ? { trail: laidTrail } : {} };
1046
+ }
1047
+ function rewrapStrip(s, x, y, width) {
1048
+ const { line, h, pad: pad2, titleRow } = LOOK.strip;
1049
+ const stacked = rowNeed(s.title, [...s.fields.map((f) => f.w), ...s.trail ? [s.trail.w] : []]) > width;
1050
+ const top = stacked ? titleRow : 0;
1051
+ const placer = fieldPlacer(stacked ? pad2 : stripStart(s.title), width);
1052
+ const place2 = (w) => {
1053
+ const at2 = placer.place(w);
1054
+ return { x: x + at2.x, y: y + top + at2.row * line };
1055
+ };
1056
+ const fields = s.fields.map((field) => {
1057
+ const at2 = place2(field.w);
1058
+ return { ...field, ...at2, ...field.meter ? { meter: { ...field.meter, x: at2.x } } : {} };
1059
+ });
1060
+ const trail = s.trail ? { ...s.trail, ...place2(s.trail.w) } : void 0;
1061
+ return { ...s, x, y, w: width, h: h + placer.rows() * line + top, fields, ...trail ? { trail } : {} };
1032
1062
  }
1033
1063
  function shiftContent(layout, dx, dy) {
1034
1064
  const move = (rect) => {
@@ -9247,7 +9277,8 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
9247
9277
  const arrivals = new Map((timeline.states ?? []).flatMap((s) => s.lit[0] ? [[s.box, s.lit[0].start]] : []));
9248
9278
  const meters = new Map((timeline.meters ?? []).map((meter) => [meter.field, meter.keys]));
9249
9279
  const gauge = (field) => field.meter ? kindParts("time").meterField({ ...field, meter: field.meter }, meters.get(field.name) ?? [[0, 0]], ctx) : void 0;
9250
- if (layout.strip) L.band.push(strip(layout.strip, fieldChanges(diagram, timeline, layout), ctx, isState, arrivals, gauge));
9280
+ const drawStrip = (s) => strip(s, fieldChanges(diagram, timeline, layout), ctx, isState, arrivals, gauge);
9281
+ if (layout.strip && !follow) L.band.push(drawStrip(layout.strip));
9251
9282
  for (const line of layout.lifelines) L.base.push(lifeline(line.x, line.y1, line.y2));
9252
9283
  if (isGitLayout(layout)) {
9253
9284
  const git = kindParts("git").drawGit(layout, diagram, timeline, ctx);
@@ -9299,7 +9330,7 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
9299
9330
  L.node.push(linked(box.id, card(box, ctx, on.get(box.id) ?? [], subs.get(box.id) ?? [], isState ? state?.lit ?? [] : void 0)));
9300
9331
  if (state?.done !== void 0) L.node.push(doneMark(box, state.done, ctx));
9301
9332
  }
9302
- for (const b of layout.badges) L.badge.push(badge(b, ctx, isState));
9333
+ for (const b of layout.badges) if (!(follow && onStrip(layout, b))) L.badge.push(badge(b, ctx, isState));
9303
9334
  for (const l of layout.labels) {
9304
9335
  const time = timeline.labels.find((t) => t.step === l.step && t.event === l.event);
9305
9336
  if (time) L.top.push(label(l, fadeBefore(l, time, timeline.steps), ctx));
@@ -9319,7 +9350,8 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
9319
9350
  const { near, far, nearY, farY } = LOOK.shadow;
9320
9351
  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>`;
9321
9352
  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("") : "";
9322
- 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 };
9353
+ 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("");
9354
+ 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 };
9323
9355
  const css = `.dg-${id}{${FONT_VARS};--T:${timeline.total}s;${vars}}${PART_CSS}${m.frames.join("")}`;
9324
9356
  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>`;
9325
9357
  }
@@ -9328,6 +9360,9 @@ function union(rects) {
9328
9360
  const y = Math.min(...rects.map((r) => r.y));
9329
9361
  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 };
9330
9362
  }
9363
+ function onStrip(layout, badge2) {
9364
+ return layout.strip !== void 0 && badge2.y >= layout.strip.y;
9365
+ }
9331
9366
  function focusOf(layout, diagram, step) {
9332
9367
  const rects = focusParts(layout, diagram, step);
9333
9368
  return rects.length === 0 ? void 0 : union(rects);
@@ -9373,31 +9408,33 @@ function focusParts(layout, diagram, step) {
9373
9408
  }
9374
9409
  return rects;
9375
9410
  }
9376
- function followView(layout, timeline, diagram, m, id, content, follow, heads) {
9411
+ function followView(layout, timeline, diagram, m, id, content, follow, heads, drawTable) {
9377
9412
  const F = LOOK.follow;
9378
9413
  const M = LOOK.mini;
9379
9414
  const frameWidth = Math.max(1, follow.width);
9380
9415
  const full = Math.min(layout.width, frameWidth);
9416
+ const worldH = layout.strip ? layout.strip.y : layout.height;
9381
9417
  const title = FIGURE_TEXT[follow.lang].overview;
9382
9418
  const sized = (vh2) => {
9383
9419
  const mw2 = Math.min(M.w, full * 0.4, vh2 * 0.4 / layout.height * layout.width);
9384
9420
  const k2 = mw2 / layout.width;
9385
- const mh2 = layout.height * k2;
9421
+ const mh2 = worldH * k2;
9386
9422
  const bw2 = Math.max(mw2, Math.ceil(textWidth(title, TYPE.miniTitle)));
9387
9423
  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 };
9388
9424
  };
9389
- const natural = sized(Math.min(layout.height, Math.max(F.minH, full * F.aspect)));
9390
- const bare = natural.beside && frameWidth < F.narrow;
9391
- const room = follow.height === void 0 ? Number.POSITIVE_INFINITY : natural.beside ? follow.height : follow.height - natural.bgH - M.inset;
9392
- 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 };
9425
+ const natural = sized(Math.min(worldH, Math.max(F.minH, full * F.aspect)));
9426
+ const bare = frameWidth < F.narrow && (natural.beside || layout.strip !== void 0);
9427
+ const tableH = layout.strip ? rewrapStrip(layout.strip, 0, 0, full).h + M.inset : 0;
9428
+ const room = follow.height === void 0 ? Number.POSITIVE_INFINITY : (natural.beside || bare ? follow.height : follow.height - natural.bgH - M.inset) - tableH;
9429
+ 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 };
9393
9430
  const vw = beside && !bare ? Math.min(layout.width, frameWidth - bgW - M.inset) : full;
9394
9431
  const clampX = (x) => Math.min(layout.width - vw / 2, Math.max(vw / 2, x));
9395
9432
  const top = heads === "" ? 0 : Math.max(...layout.boxes.map((b) => b.y + b.h)) + F.headRoom;
9396
9433
  const strip2 = heads === "" ? 0 : F.head.pad * 2 + F.head.h;
9397
9434
  const below = vh - strip2;
9398
- const clampY = (y) => Math.min(layout.height - below / 2, Math.max(top + below / 2, y));
9435
+ const clampY = (y) => Math.min(worldH - below / 2, Math.max(top + below / 2, y));
9399
9436
  const r = LOOK.badge.r;
9400
- let prev = [layout.width / 2, layout.height / 2];
9437
+ let prev = [layout.width / 2, worldH / 2];
9401
9438
  const middles = timeline.steps.map((_, s) => {
9402
9439
  if (isTimeLayout(layout)) {
9403
9440
  const f2 = kindParts("time").timeFocus(layout, timeline, s, focusParts(layout, diagram, s), vw, below);
@@ -9408,7 +9445,7 @@ function followView(layout, timeline, diagram, m, id, content, follow, heads) {
9408
9445
  prev = f ? [f.x + f.w / 2, f.y + f.h / 2] : prev;
9409
9446
  const at2 = [clampX(prev[0]), clampY(prev[1])];
9410
9447
  const b = layout.badges.find((x) => x.step === s);
9411
- if (!b || Math.abs(b.x - at2[0]) <= vw / 2 - r && Math.abs(b.y - at2[1]) <= below / 2 - r) return at2;
9448
+ if (!b || onStrip(layout, b) || Math.abs(b.x - at2[0]) <= vw / 2 - r && Math.abs(b.y - at2[1]) <= below / 2 - r) return at2;
9412
9449
  const near = badgeFocus(b, focusParts(layout, diagram, s), vw, below);
9413
9450
  prev = [near.x + near.w / 2, near.y + near.h / 2];
9414
9451
  return [clampX(prev[0]), clampY(prev[1])];
@@ -9448,7 +9485,11 @@ function followView(layout, timeline, diagram, m, id, content, follow, heads) {
9448
9485
  const mini = bare ? { clip: "", body: "" } : overview();
9449
9486
  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>`;
9450
9487
  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}`;
9451
- return { body, w: beside && !bare ? vw + M.inset + bgW : full, h: beside ? vh : bgY + bgH };
9488
+ const w = beside && !bare ? vw + M.inset + bgW : full;
9489
+ const bottom = beside || bare ? vh : bgY + bgH;
9490
+ if (!layout.strip) return { body, w, h: bottom };
9491
+ const table = rewrapStrip(layout.strip, 0, bottom + M.inset, full);
9492
+ return { body: body + drawTable(table, layout.strip), w, h: table.y + table.h };
9452
9493
  }
9453
9494
  function paletteOf(options, theme) {
9454
9495
  const palette = resolvePalette(options.palette);