@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/export.js CHANGED
@@ -510,7 +510,7 @@ var LOOK = {
510
510
  /**
511
511
  * `trail` は状態遷移図の帯の最後の、通った状態の点 (#3171)。`r` は点の半径、`step` は点の中心どうしの間、`now` は変わった値の欄の名前の横の点の半径と、名前からの離れ
512
512
  */
513
- 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 } },
513
+ 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 } },
514
514
  /** `time` から始まる値は時間軸の図 (#3165) の、目盛りの印の枠、拡大の枠、時刻の線、範囲の括弧と囲み、節目へ下ろす点線、節目の丸、針、物差しの線の印 */
515
515
  stroke: {
516
516
  git: 2.25,
@@ -991,26 +991,40 @@ function fieldWidth(diagram, name) {
991
991
  var trailWidth = (trail) => Math.max(textWidth(trail.title, TYPE.fieldName), trail.states.length * LOOK.strip.trail.step);
992
992
  function stripNeed(diagram, trail) {
993
993
  if (!diagram.strip) return 0;
994
- const { titleX, fieldGap, pad: pad2 } = LOOK.strip;
995
- const start = titleX + textWidth(diagram.strip.title, TYPE.stripTitle) + fieldGap;
996
- const widths = [...diagram.strip.fields.map((name) => fieldWidth(diagram, name)), ...trail ? [trailWidth(trail)] : []];
997
- return start + widths.reduce((sum, w) => sum + w + fieldGap, 0) - fieldGap + pad2;
994
+ return rowNeed(diagram.strip.title, [...diagram.strip.fields.map((name) => fieldWidth(diagram, name)), ...trail ? [trailWidth(trail)] : []]);
995
+ }
996
+ function rowNeed(title, widths) {
997
+ const { fieldGap, pad: pad2 } = LOOK.strip;
998
+ return stripStart(title) + widths.reduce((sum, w) => sum + w + fieldGap, 0) - fieldGap + pad2;
999
+ }
1000
+ function stripStart(title) {
1001
+ return LOOK.strip.titleX + textWidth(title, TYPE.stripTitle) + LOOK.strip.fieldGap;
1002
+ }
1003
+ function fieldPlacer(start, width) {
1004
+ const { fieldGap, pad: pad2 } = LOOK.strip;
1005
+ let cx = start;
1006
+ let row = 0;
1007
+ return {
1008
+ place(w) {
1009
+ if (cx > start && cx + w > width - pad2) {
1010
+ cx = start;
1011
+ row++;
1012
+ }
1013
+ const at2 = { x: cx, row };
1014
+ cx += w + fieldGap;
1015
+ return at2;
1016
+ },
1017
+ rows: () => row
1018
+ };
998
1019
  }
999
1020
  function layoutStrip(diagram, x, y, width, trail) {
1000
1021
  if (!diagram.strip) return void 0;
1001
- const { titleX, fieldGap, pad: pad2, line, h } = LOOK.strip;
1002
- const start = titleX + textWidth(diagram.strip.title, TYPE.stripTitle) + fieldGap;
1022
+ const { line, h } = LOOK.strip;
1003
1023
  const fields = [];
1004
- let cx = start;
1005
- let row = 0;
1024
+ const placer = fieldPlacer(stripStart(diagram.strip.title), width);
1006
1025
  const place2 = (w) => {
1007
- if (cx > start && cx + w > width - pad2) {
1008
- cx = start;
1009
- row++;
1010
- }
1011
- const at2 = { x: x + cx, y: y + row * line };
1012
- cx += w + fieldGap;
1013
- return at2;
1026
+ const at2 = placer.place(w);
1027
+ return { x: x + at2.x, y: y + at2.row * line };
1014
1028
  };
1015
1029
  for (const name of diagram.strip.fields) {
1016
1030
  const w = fieldWidth(diagram, name);
@@ -1020,7 +1034,23 @@ function layoutStrip(diagram, x, y, width, trail) {
1020
1034
  fields.push({ name, ...at2, w, ...meter && line2 !== void 0 ? { meter: { line: line2, text: meter.line, x: at2.x, w: LOOK.time.meter.w } } : {} });
1021
1035
  }
1022
1036
  const laidTrail = trail ? { ...trail, ...place2(trailWidth(trail)), w: trailWidth(trail) } : void 0;
1023
- return { x, y, w: width, h: h + row * line, title: diagram.strip.title, fields, ...laidTrail ? { trail: laidTrail } : {} };
1037
+ return { x, y, w: width, h: h + placer.rows() * line, title: diagram.strip.title, fields, ...laidTrail ? { trail: laidTrail } : {} };
1038
+ }
1039
+ function rewrapStrip(s, x, y, width) {
1040
+ const { line, h, pad: pad2, titleRow } = LOOK.strip;
1041
+ const stacked = rowNeed(s.title, [...s.fields.map((f) => f.w), ...s.trail ? [s.trail.w] : []]) > width;
1042
+ const top = stacked ? titleRow : 0;
1043
+ const placer = fieldPlacer(stacked ? pad2 : stripStart(s.title), width);
1044
+ const place2 = (w) => {
1045
+ const at2 = placer.place(w);
1046
+ return { x: x + at2.x, y: y + top + at2.row * line };
1047
+ };
1048
+ const fields = s.fields.map((field) => {
1049
+ const at2 = place2(field.w);
1050
+ return { ...field, ...at2, ...field.meter ? { meter: { ...field.meter, x: at2.x } } : {} };
1051
+ });
1052
+ const trail = s.trail ? { ...s.trail, ...place2(s.trail.w) } : void 0;
1053
+ return { ...s, x, y, w: width, h: h + placer.rows() * line + top, fields, ...trail ? { trail } : {} };
1024
1054
  }
1025
1055
  function shiftContent(layout, dx, dy) {
1026
1056
  const move = (rect) => {
@@ -9179,7 +9209,8 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
9179
9209
  const arrivals = new Map((timeline.states ?? []).flatMap((s) => s.lit[0] ? [[s.box, s.lit[0].start]] : []));
9180
9210
  const meters = new Map((timeline.meters ?? []).map((meter) => [meter.field, meter.keys]));
9181
9211
  const gauge = (field) => field.meter ? kindParts("time").meterField({ ...field, meter: field.meter }, meters.get(field.name) ?? [[0, 0]], ctx) : void 0;
9182
- if (layout.strip) L.band.push(strip(layout.strip, fieldChanges(diagram, timeline, layout), ctx, isState, arrivals, gauge));
9212
+ const drawStrip = (s) => strip(s, fieldChanges(diagram, timeline, layout), ctx, isState, arrivals, gauge);
9213
+ if (layout.strip && !follow) L.band.push(drawStrip(layout.strip));
9183
9214
  for (const line of layout.lifelines) L.base.push(lifeline(line.x, line.y1, line.y2));
9184
9215
  if (isGitLayout(layout)) {
9185
9216
  const git = kindParts("git").drawGit(layout, diagram, timeline, ctx);
@@ -9231,7 +9262,7 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
9231
9262
  L.node.push(linked(box.id, card(box, ctx, on.get(box.id) ?? [], subs.get(box.id) ?? [], isState ? state?.lit ?? [] : void 0)));
9232
9263
  if (state?.done !== void 0) L.node.push(doneMark(box, state.done, ctx));
9233
9264
  }
9234
- for (const b of layout.badges) L.badge.push(badge(b, ctx, isState));
9265
+ for (const b of layout.badges) if (!(follow && onStrip(layout, b))) L.badge.push(badge(b, ctx, isState));
9235
9266
  for (const l of layout.labels) {
9236
9267
  const time = timeline.labels.find((t) => t.step === l.step && t.event === l.event);
9237
9268
  if (time) L.top.push(label(l, fadeBefore(l, time, timeline.steps), ctx));
@@ -9251,7 +9282,8 @@ function drawSvg(diagram, layout, timeline, palette, theme, follow, ink = [], tr
9251
9282
  const { near, far, nearY, farY } = LOOK.shadow;
9252
9283
  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>`;
9253
9284
  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("") : "";
9254
- 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 };
9285
+ 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("");
9286
+ 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 };
9255
9287
  const css = `.dg-${id}{${FONT_VARS};--T:${timeline.total}s;${vars}}${PART_CSS}${m.frames.join("")}`;
9256
9288
  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>`;
9257
9289
  }
@@ -9260,6 +9292,9 @@ function union(rects) {
9260
9292
  const y = Math.min(...rects.map((r) => r.y));
9261
9293
  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 };
9262
9294
  }
9295
+ function onStrip(layout, badge2) {
9296
+ return layout.strip !== void 0 && badge2.y >= layout.strip.y;
9297
+ }
9263
9298
  function focusOf(layout, diagram, step) {
9264
9299
  const rects = focusParts(layout, diagram, step);
9265
9300
  return rects.length === 0 ? void 0 : union(rects);
@@ -9305,31 +9340,33 @@ function focusParts(layout, diagram, step) {
9305
9340
  }
9306
9341
  return rects;
9307
9342
  }
9308
- function followView(layout, timeline, diagram, m, id, content, follow, heads) {
9343
+ function followView(layout, timeline, diagram, m, id, content, follow, heads, drawTable) {
9309
9344
  const F = LOOK.follow;
9310
9345
  const M = LOOK.mini;
9311
9346
  const frameWidth = Math.max(1, follow.width);
9312
9347
  const full = Math.min(layout.width, frameWidth);
9348
+ const worldH = layout.strip ? layout.strip.y : layout.height;
9313
9349
  const title = FIGURE_TEXT[follow.lang].overview;
9314
9350
  const sized = (vh2) => {
9315
9351
  const mw2 = Math.min(M.w, full * 0.4, vh2 * 0.4 / layout.height * layout.width);
9316
9352
  const k2 = mw2 / layout.width;
9317
- const mh2 = layout.height * k2;
9353
+ const mh2 = worldH * k2;
9318
9354
  const bw2 = Math.max(mw2, Math.ceil(textWidth(title, TYPE.miniTitle)));
9319
9355
  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 };
9320
9356
  };
9321
- const natural = sized(Math.min(layout.height, Math.max(F.minH, full * F.aspect)));
9357
+ const natural = sized(Math.min(worldH, Math.max(F.minH, full * F.aspect)));
9322
9358
  const bare = natural.beside && frameWidth < F.narrow;
9323
- const room = follow.height === void 0 ? Number.POSITIVE_INFINITY : natural.beside ? follow.height : follow.height - natural.bgH - M.inset;
9324
- 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 };
9359
+ const tableH = layout.strip ? rewrapStrip(layout.strip, 0, 0, full).h + M.inset : 0;
9360
+ const room = follow.height === void 0 ? Number.POSITIVE_INFINITY : (natural.beside ? follow.height : follow.height - natural.bgH - M.inset) - tableH;
9361
+ 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 };
9325
9362
  const vw = beside && !bare ? Math.min(layout.width, frameWidth - bgW - M.inset) : full;
9326
9363
  const clampX = (x) => Math.min(layout.width - vw / 2, Math.max(vw / 2, x));
9327
9364
  const top = heads === "" ? 0 : Math.max(...layout.boxes.map((b) => b.y + b.h)) + F.headRoom;
9328
9365
  const strip2 = heads === "" ? 0 : F.head.pad * 2 + F.head.h;
9329
9366
  const below = vh - strip2;
9330
- const clampY = (y) => Math.min(layout.height - below / 2, Math.max(top + below / 2, y));
9367
+ const clampY = (y) => Math.min(worldH - below / 2, Math.max(top + below / 2, y));
9331
9368
  const r = LOOK.badge.r;
9332
- let prev = [layout.width / 2, layout.height / 2];
9369
+ let prev = [layout.width / 2, worldH / 2];
9333
9370
  const middles = timeline.steps.map((_, s) => {
9334
9371
  if (isTimeLayout(layout)) {
9335
9372
  const f2 = kindParts("time").timeFocus(layout, timeline, s, focusParts(layout, diagram, s), vw, below);
@@ -9340,7 +9377,7 @@ function followView(layout, timeline, diagram, m, id, content, follow, heads) {
9340
9377
  prev = f ? [f.x + f.w / 2, f.y + f.h / 2] : prev;
9341
9378
  const at2 = [clampX(prev[0]), clampY(prev[1])];
9342
9379
  const b = layout.badges.find((x) => x.step === s);
9343
- if (!b || Math.abs(b.x - at2[0]) <= vw / 2 - r && Math.abs(b.y - at2[1]) <= below / 2 - r) return at2;
9380
+ 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;
9344
9381
  const near = badgeFocus(b, focusParts(layout, diagram, s), vw, below);
9345
9382
  prev = [near.x + near.w / 2, near.y + near.h / 2];
9346
9383
  return [clampX(prev[0]), clampY(prev[1])];
@@ -9380,7 +9417,11 @@ function followView(layout, timeline, diagram, m, id, content, follow, heads) {
9380
9417
  const mini = bare ? { clip: "", body: "" } : overview();
9381
9418
  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>`;
9382
9419
  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}`;
9383
- return { body, w: beside && !bare ? vw + M.inset + bgW : full, h: beside ? vh : bgY + bgH };
9420
+ const w = beside && !bare ? vw + M.inset + bgW : full;
9421
+ const bottom = beside ? vh : bgY + bgH;
9422
+ if (!layout.strip) return { body, w, h: bottom };
9423
+ const table = rewrapStrip(layout.strip, 0, bottom + M.inset, full);
9424
+ return { body: body + drawTable(table, layout.strip), w, h: table.y + table.h };
9384
9425
  }
9385
9426
  function paletteOf(options, theme) {
9386
9427
  const palette = resolvePalette(options.palette);