@cardenelabs/dragon 0.41.1 → 0.42.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.
Files changed (44) hide show
  1. package/README.md +21 -1
  2. package/dist/cli.cjs +4094 -961
  3. package/dist/cli.cjs.map +1 -1
  4. package/dist/cli.js +4094 -961
  5. package/dist/cli.js.map +1 -1
  6. package/dist/export.cjs +3681 -939
  7. package/dist/export.cjs.map +1 -1
  8. package/dist/export.d.cts +1 -1
  9. package/dist/export.d.ts +1 -1
  10. package/dist/export.js +3681 -939
  11. package/dist/export.js.map +1 -1
  12. package/dist/index.cjs +4016 -815
  13. package/dist/index.cjs.map +1 -1
  14. package/dist/index.d.cts +159 -3
  15. package/dist/index.d.ts +159 -3
  16. package/dist/index.js +4016 -815
  17. package/dist/index.js.map +1 -1
  18. package/dist/{ink-B_7OXxtb.d.cts → ink-B8EZL7JV.d.cts} +95 -3
  19. package/dist/{ink-B_7OXxtb.d.ts → ink-B8EZL7JV.d.ts} +95 -3
  20. package/dist/node.cjs +2461 -726
  21. package/dist/node.cjs.map +1 -1
  22. package/dist/node.js +2461 -726
  23. package/dist/node.js.map +1 -1
  24. package/dist/player.global.js +2 -2
  25. package/package.json +1 -1
  26. package/src/field-messages.ts +12 -0
  27. package/src/figure-text.ts +26 -0
  28. package/src/index.ts +11 -1
  29. package/src/layout/scene.ts +23 -2
  30. package/src/layout/time.ts +680 -0
  31. package/src/look/values.ts +142 -2
  32. package/src/messages.ts +108 -5
  33. package/src/parser.ts +427 -6
  34. package/src/player.ts +48 -10
  35. package/src/printer.ts +63 -12
  36. package/src/render/icons.ts +2 -0
  37. package/src/render/parts.ts +29 -9
  38. package/src/render/svg.ts +129 -21
  39. package/src/render/time.ts +291 -0
  40. package/src/schema.ts +109 -10
  41. package/src/schemas/diagram.schema.json +224 -12
  42. package/src/schemas/validate-diagram.js +1 -1
  43. package/src/timeline.ts +147 -10
  44. package/src/words.ts +39 -6
package/src/timeline.ts CHANGED
@@ -6,11 +6,18 @@
6
6
  * 次の同じ主役が出発するまで着いた先に留まり、次が無ければ終わりまで留まる。
7
7
  * 線の名前はその段の間だけ出し、同じ段に何本あっても同時に見えるのは 2 つまでにする。
8
8
  * 状態遷移図では、段が終わった後も線の名前を最後の段まで薄く残す (#3171)。薄い名前は 2 つまでの数に入れない。
9
+ * 止め絵を選んだ図では、最後の段で起きることが済んでから繰り返す前まで (`whole`)、全ての段の線の名前を最後の段と同じ濃さで出す (#3200)。
10
+ * その間に見えている名前は繰り返す前まで延ばし、見えていない名前は同じ間に出し直す (`again`)。状態遷移図の薄い名前はその間の前で消す。
9
11
  * 状態遷移図では、主役の運ぶ物が乗っている状態を光らせ、運ぶ物が出た状態には少し後に済んだ印を出す (#3163)。
10
12
  * 枝分かれの図では、commit を積む出来事と枝を切る出来事も線と同じ間で引く (#3164)。
13
+ * 時間軸の図では、針を進める出来事 (`now`) で針を目盛り 1 つずつ決まった秒数で進める (#3165)。針が進む目盛りの列の線は、
14
+ * 段の中の書いた順に依らず、針がその目盛りに入った時に引き、線を引き終えるまで針は次の目盛りへ進まない。
15
+ * 針を進める出来事より後に書いた出来事は、針が止まってから起こす。物差しの欄は、針が進む段では針の進みに比例して満ち、
16
+ * 区切りの境から進む時は 0 から満ち直す。針が進まない段では値を書いた時に変わる。
11
17
  * 札を動かす線が運ぶ枝の札は運ぶ物の表に載せない。札は同じ時刻にいくつも出ていて、どの札も主役ではないので、
12
18
  * 枝分かれの図を描く部品が札ごとに動かす。線に書いた運ぶ物 (`tag` と `carry`) だけを表に載せる。
13
19
  */
20
+ import { ratioOf } from "./layout/scene";
14
21
  import { MOTION } from "./look/values";
15
22
  import type { Diagram } from "./schema";
16
23
  import { STATE_ENDS } from "./words";
@@ -42,6 +49,8 @@ export interface LabelTime extends Span {
42
49
  event: number;
43
50
  /** 状態遷移図だけが持つ。段が終わった後に薄く残す間 */
44
51
  after?: Span;
52
+ /** 止め絵を選んだ図だけが持つ。最後の段で起きることが済んでから、最後の段と同じ濃さで出し直す間 (#3200) */
53
+ again?: Span;
45
54
  }
46
55
 
47
56
  /** 処理、箱の字の書き換え、中身の帯の値が起きる時刻。 */
@@ -71,23 +80,79 @@ export interface Timeline {
71
80
  events: EventTime[];
72
81
  /** 段ごとの止め絵の時刻。その段で起きることが全部見えている */
73
82
  stills: number[];
83
+ /** 止め絵を選んだ図だけが持つ。最後の段で起きることが済んでから繰り返す前まで、全ての段の線の名前と箱の中の処理を出す間 (#3200) */
84
+ whole?: Span;
74
85
  /** 状態遷移図だけが持つ */
75
86
  states?: StateTime[];
87
+ /** 時間軸の図だけが持つ (#3165)。針の動き。[時刻, 目盛りの境の位置] の並びで、間は真っ直ぐ進む */
88
+ needle?: [number, number][];
89
+ /** 時間軸の図だけが持つ。針が目盛りを過ぎた (右の境に着いた) 時刻 */
90
+ units?: { unit: number; passed: number }[];
91
+ /** 時間軸の図だけが持つ。物差しの欄の満ち具合の動き。[時刻, 割合] の並びで、間は真っ直ぐ変わる */
92
+ meters?: { field: string; keys: [number, number][] }[];
76
93
  }
77
94
 
78
95
  interface Planned {
79
96
  edges: { event: number; a: number; b: number; carries: boolean; coin: boolean; named: boolean }[];
80
97
  events: { event: number; at: number }[];
81
98
  busy: number;
99
+ /** 時間軸の図の、針の動き ([段の始まりからの時刻, 境の位置]) と、針が目盛りを過ぎた時刻 */
100
+ sweep?: { keys: [number, number][]; passed: { unit: number; at: number }[] };
82
101
  }
83
102
 
84
- /** 段の中で起きることの時刻 (段の始まりから)。線は少しずつずらして引き、書き換えは直前の線が着いてから起こす。 */
85
- function plan(step: Diagram["steps"][number]): Planned {
103
+ type EdgeEvent = Extract<Diagram["steps"][number]["events"][number], { type: "edge" }>;
104
+
105
+ /** 時間軸の図の段を組む時に渡す、段の始まりの針の位置と、目盛り 1 つを進む秒数 */
106
+ interface Needle {
107
+ from: number;
108
+ speed: number;
109
+ }
110
+
111
+ /**
112
+ * 段の中で起きることの時刻 (段の始まりから)。線は少しずつずらして引き、書き換えは直前の線が着いてから起こす。
113
+ * 時間軸の図では `needle` を渡し、針を進める出来事の所で針を目盛り 1 つずつ進める。針が進む目盛りの列の線はその目盛りに入った時に引く
114
+ */
115
+ function plan(step: Diagram["steps"][number], needle?: Needle): Planned {
86
116
  const out: Planned = { edges: [], events: [], busy: 0 };
87
117
  let cursor = MOTION.edgeAt;
88
118
  let arrived: number | undefined;
89
119
  let changes = 0;
120
+ let settled = Number.NEGATIVE_INFINITY;
121
+ const line = (e: number, event: EdgeEvent, a: number): number => {
122
+ const carries = event.carry.kind !== "none";
123
+ const b = a + (carries ? MOTION.drawCarry : MOTION.draw);
124
+ out.edges.push({ event: e, a, b, carries, coin: event.carry.kind === "coin", named: event.label !== undefined });
125
+ out.busy = Math.max(out.busy, b);
126
+ return b;
127
+ };
128
+ const nows = needle ? step.events.flatMap((event, e) => (event.type === "now" ? [{ e, to: event.to }] : [])) : [];
129
+ const p0 = needle?.from ?? 0;
130
+ const p1 = Math.max(p0, ...nows.map((n) => n.to + 1));
131
+ const pulled = (event: Diagram["steps"][number]["events"][number]): event is EdgeEvent => event.type === "edge" && event.at !== undefined && event.at >= p0 && event.at < p1;
90
132
  step.events.forEach((event, e) => {
133
+ if (needle && e === nows[0]?.e) {
134
+ // 針は、前に書いた書き換えが起きてから動き出す
135
+ let t = Math.max(cursor, settled + MOTION.change);
136
+ const keys: [number, number][] = [[t, p0]];
137
+ const passed: { unit: number; at: number }[] = [];
138
+ for (let u = p0; u < p1; u++) {
139
+ const entry = t;
140
+ const lines = step.events.flatMap((ev, k) => (pulled(ev) && ev.at === u ? [{ k, ev }] : []));
141
+ const done = lines.reduce((latest, l, j) => Math.max(latest, line(l.k, l.ev, entry + MOTION.stagger * j)), entry);
142
+ const end = Math.max(entry + needle.speed, lines.length > 0 ? done + MOTION.time.wait : entry);
143
+ if (end - needle.speed > entry + 1e-9) keys.push([end - needle.speed, u]);
144
+ keys.push([end, u + 1]);
145
+ passed.push({ unit: u, at: end });
146
+ t = end;
147
+ }
148
+ out.sweep = { keys, passed };
149
+ out.busy = Math.max(out.busy, t);
150
+ cursor = t + MOTION.time.after;
151
+ arrived = t;
152
+ changes = 0;
153
+ return;
154
+ }
155
+ if (event.type === "now" || (needle && pulled(event))) return;
91
156
  // 枝分かれの図の commit を積む出来事と枝を切る出来事は、親から引く線と同じ間で引く
92
157
  if (event.type === "commit" || event.type === "branch") {
93
158
  const a = cursor;
@@ -98,14 +163,10 @@ function plan(step: Diagram["steps"][number]): Planned {
98
163
  changes = 0;
99
164
  out.busy = Math.max(out.busy, b);
100
165
  } else if (event.type === "edge") {
101
- const carries = event.carry.kind !== "none";
102
166
  const a = cursor;
103
- const b = a + (carries ? MOTION.drawCarry : MOTION.draw);
104
- out.edges.push({ event: e, a, b, carries, coin: event.carry.kind === "coin", named: event.label !== undefined });
167
+ arrived = line(e, event, a);
105
168
  cursor = a + MOTION.stagger;
106
- arrived = b;
107
169
  changes = 0;
108
- out.busy = Math.max(out.busy, b);
109
170
  } else if (event.type === "action") {
110
171
  out.events.push({ event: e, at: cursor });
111
172
  out.busy = Math.max(out.busy, cursor + MOTION.action);
@@ -115,13 +176,26 @@ function plan(step: Diagram["steps"][number]): Planned {
115
176
  const at = (arrived ?? cursor) + MOTION.change * changes++;
116
177
  out.events.push({ event: e, at });
117
178
  out.busy = Math.max(out.busy, at);
179
+ settled = Math.max(settled, at);
118
180
  }
119
181
  });
182
+ // 針が進む目盛りの列の線は書いた順と別に引くので、引き始める順に並べ直す
183
+ out.edges.sort((x, y) => x.a - y.a);
120
184
  return out;
121
185
  }
122
186
 
123
- export function buildTimeline(diagram: Diagram): Timeline {
124
- const plans = diagram.steps.map(plan);
187
+ /** 時刻の表を作る。`still` を立てると、最後の段の止め絵に全ての段の線の名前と箱の中の処理を出す間 (`whole`) を持つ (#3200) */
188
+ export function buildTimeline(diagram: Diagram, still = false): Timeline {
189
+ const time = diagram.kind === "time" ? diagram.time : undefined;
190
+ const T = MOTION.time;
191
+ const speed = time ? Math.min(T.unitMax, Math.max(T.unitMin, T.axis / Math.max(1, time.scale.count))) : 0;
192
+ let at = 0;
193
+ const plans = diagram.steps.map((step) => {
194
+ if (!time) return plan(step);
195
+ const p = plan(step, { from: at, speed });
196
+ at = p.sweep?.keys[p.sweep.keys.length - 1]?.[1] ?? at;
197
+ return p;
198
+ });
125
199
  const steps: Span[] = [];
126
200
  let t = MOTION.intro;
127
201
  diagram.steps.forEach((step, s) => {
@@ -133,6 +207,10 @@ export function buildTimeline(diagram: Diagram): Timeline {
133
207
  const end = t;
134
208
  const total = Math.ceil(end + MOTION.outro);
135
209
  const last = total - MOTION.tail;
210
+ const lastSpan = steps[steps.length - 1];
211
+ const whole = still && lastSpan ? { start: lastSpan.start + (plans[plans.length - 1]?.busy ?? 0), end: last } : undefined;
212
+ // 状態遷移図の薄い名前は、全ての段の名前を出し直す前に消す
213
+ const faint = whole?.start ?? last;
136
214
 
137
215
  const edges: EdgeTime[] = [];
138
216
  const labels: LabelTime[] = [];
@@ -155,7 +233,13 @@ export function buildTimeline(diagram: Diagram): Timeline {
155
233
  const later = named[k + 2];
156
234
  if (later) label.end = Math.min(label.end, later.start);
157
235
  });
158
- if (diagram.kind === "state") for (const label of named) label.after = { start: label.end, end: last };
236
+ for (const label of named) {
237
+ if (whole && label.end > whole.start) label.end = whole.end;
238
+ else {
239
+ if (diagram.kind === "state" && label.end < faint) label.after = { start: label.end, end: faint };
240
+ if (whole) label.again = whole;
241
+ }
242
+ }
159
243
  labels.push(...named);
160
244
  for (const event of p.events) events.push({ step: s, event: event.event, at: span.start + event.at });
161
245
  });
@@ -182,6 +266,14 @@ export function buildTimeline(diagram: Diagram): Timeline {
182
266
  }
183
267
  carriers.sort((x, y) => x.depart - y.depart);
184
268
  const states = diagram.kind === "state" ? stateTimes(diagram, edges, last) : undefined;
269
+ const needle: [number, number][] = [[0, 0]];
270
+ const units: { unit: number; passed: number }[] = [];
271
+ plans.forEach((p, s) => {
272
+ const start = (steps[s] as Span).start;
273
+ for (const [t, position] of p.sweep?.keys ?? []) needle.push([start + t, position]);
274
+ for (const u of p.sweep?.passed ?? []) units.push({ unit: u.unit, passed: start + u.at });
275
+ });
276
+ needle.push([total, at]);
185
277
 
186
278
  return {
187
279
  total,
@@ -193,10 +285,55 @@ export function buildTimeline(diagram: Diagram): Timeline {
193
285
  badges: steps.map((span, s) => ({ step: s, appears: span.start })),
194
286
  events,
195
287
  stills: steps.map((span) => span.end - MOTION.still),
288
+ ...(whole ? { whole } : {}),
196
289
  ...(states ? { states } : {}),
290
+ ...(time ? { needle, units, meters: meterTimes(diagram, plans, steps) } : {}),
197
291
  };
198
292
  }
199
293
 
294
+ /**
295
+ * 時間軸の図の物差しの欄の満ち具合 (#3165)。段で最後に書いた値へ向かって変わる。
296
+ * 針が進む段では針の進みに比例して満ち、区切りの境から進む時はその境で 0 に戻ってから満ち直す。針が進まない段では値を書いた時に変わる
297
+ */
298
+ function meterTimes(diagram: Diagram, plans: Planned[], steps: Span[]): { field: string; keys: [number, number][] }[] {
299
+ const length = diagram.time?.period?.length;
300
+ return (diagram.strip?.meters ?? []).map(({ field }) => {
301
+ const keys: [number, number][] = [[0, 0]];
302
+ let value = 0;
303
+ plans.forEach((p, s) => {
304
+ const start = (steps[s] as Span).start;
305
+ const sets = (diagram.steps[s]?.events ?? []).flatMap((event, e) => {
306
+ const ratio = event.type === "strip" && event.field === field && event.value !== undefined ? ratioOf(event.value) : undefined;
307
+ return ratio === undefined ? [] : [{ e, ratio }];
308
+ });
309
+ const set = sets[sets.length - 1];
310
+ if (!set) return;
311
+ const sweep = p.sweep?.keys ?? [];
312
+ const first = sweep[0];
313
+ const lastKey = sweep[sweep.length - 1];
314
+ if (first && lastKey && lastKey[1] > first[1]) {
315
+ const [p0, p1] = [first[1], lastKey[1]];
316
+ let base = value;
317
+ let from = p0;
318
+ const boundary = length ? Math.floor((p1 - 1e-9) / length) * length : 0;
319
+ if (boundary > 0 && boundary >= p0) {
320
+ const tb = start + (sweep.find(([, position]) => position === boundary)?.[0] ?? first[0]);
321
+ const prev = (keys[keys.length - 1] as [number, number])[0];
322
+ keys.push([Math.max(prev, tb - MOTION.time.reset), value], [tb, 0]);
323
+ base = 0;
324
+ from = boundary;
325
+ }
326
+ for (const [t, position] of sweep) if (position >= from) keys.push([start + t, base + ((set.ratio - base) * (position - from)) / (p1 - from)]);
327
+ } else {
328
+ const at = start + (p.events.find((x) => x.event === set.e)?.at ?? 0);
329
+ keys.push([at, value], [at + MOTION.fade, set.ratio]);
330
+ }
331
+ value = set.ratio;
332
+ });
333
+ return { field, keys };
334
+ });
335
+ }
336
+
200
337
  const isEnd = (id: string): boolean => (STATE_ENDS as readonly string[]).includes(id);
201
338
 
202
339
  /**
package/src/words.ts CHANGED
@@ -16,7 +16,7 @@ export type NotationLang = "ja" | "en";
16
16
  const keys = <K extends string>(table: Record<K, true>): K[] => Object.keys(table) as K[];
17
17
 
18
18
  /** 図の種類。最初の行の頭の語 */
19
- export const KINDS = keys<Diagram["kind"]>({ sequence: true, architecture: true, state: true, git: true });
19
+ export const KINDS = keys<Diagram["kind"]>({ sequence: true, architecture: true, state: true, git: true, time: true });
20
20
 
21
21
  /**
22
22
  * 状態遷移図の始まりと終わりの印の名前 (#3163)。線の送る側に `start`、受ける側に `finish` を書き、
@@ -25,11 +25,22 @@ export const KINDS = keys<Diagram["kind"]>({ sequence: true, architecture: true,
25
25
  export const STATE_ENDS = ["start", "finish"] as const;
26
26
  export type StateEnd = (typeof STATE_ENDS)[number];
27
27
 
28
+ /**
29
+ * 時間軸の図 (`time`、#3165) だけが書ける行の頭の語。目盛り、区切り、印の列、節目、拡大の範囲を最初の段より前に宣言し、
30
+ * 段の中で印の色を変え (`mark`)、範囲に括弧か囲みを出す (`span`)
31
+ */
32
+ export const TIME_HEADS = ["scale", "period", "row", "point", "zoom", "mark", "span"] as const;
33
+ /**
34
+ * 時間軸の図で針を進める行 (`now -> <目盛り>`) の送る側の名前。線の行と同じ形なので行の頭の語に入れない。
35
+ * 時間軸の図では名札に使えず、ほかの図では普通の名札のまま
36
+ */
37
+ export const NOW = "now";
38
+
28
39
  /**
29
40
  * 最初の行より後の行の頭の語。線の行だけは箱の名札から始まる。
30
- * `branch` と `commit` は枝分かれの図 (`git`) だけが書ける (#3164)
41
+ * `branch` と `commit` は枝分かれの図 (`git`) だけが書ける (#3164)。`source` は段の出典 (#3199)
31
42
  */
32
- export const HEADS = ["group", "end", "box", "strip", "step", "say", "code", "act", "note", "set", "branch", "commit"] as const;
43
+ export const HEADS = ["group", "end", "box", "strip", "step", "say", "code", "source", "act", "note", "set", "branch", "commit", ...TIME_HEADS] as const;
33
44
  type Head = (typeof HEADS)[number];
34
45
 
35
46
  /** 箱と区画の名札の後ろに、見せる名前を続ける語 (`box <名札> as <名前>`) */
@@ -46,17 +57,39 @@ export const HEAD = "HEAD";
46
57
  /** 枝分かれの図の行の中の語のうち、行の頭の語でも属性でもない語。見本帳の部品が受け持つ語に数える (`on` は commit の行に必ず書くので数えない) */
47
58
  export const GIT_WORDS = [FROM, COPY, MERGE] as const;
48
59
 
49
- /** 行ごとに書ける属性の鍵 */
60
+ /** 時間軸の図の節目の行で、節目を置く目盛りを続ける語 (`point <名札> at <目盛り>`)。必ず書くので部品の語に数えない */
61
+ export const AT = "at";
62
+
63
+ /**
64
+ * 行ごとに書ける属性の鍵。線の `at` と `into`、`note` の `color`、中身の帯の欄の `meter` は時間軸の図だけが書ける (#3165)。
65
+ * `meter` は `strip` の行の欄ごとに、欄の名前の後ろに書く (`strip <題>: <欄> [meter: <割合>]`)
66
+ * 箱の `link` は飛び先、段の出典の `url` は出典の在り処 (#3199)
67
+ */
50
68
  export const ATTRS = {
51
69
  diagram: ["view"],
52
70
  group: ["note", "color", "icon"],
53
- box: ["note", "color", "icon"],
54
- edge: ["carry", "tag", "side"],
71
+ box: ["note", "color", "icon", "link"],
72
+ source: ["url"],
73
+ edge: ["carry", "tag", "side", "at", "into"],
74
+ note: ["color"],
55
75
  set: ["tag"],
76
+ strip: ["meter"],
56
77
  branch: ["note"],
57
78
  commit: ["hash", "note"],
79
+ scale: ["from"],
80
+ period: ["from"],
81
+ row: ["color", "empty"],
82
+ mark: ["color"],
83
+ span: ["shape", "color"],
58
84
  } as const;
59
85
 
86
+ /** 線の属性のうち、時間軸の図だけが書ける鍵 */
87
+ export const TIME_EDGE_ATTRS = ["at", "into"] as const;
88
+ /** `span` の行の `shape` に書ける形。書かなければ括弧 */
89
+ export const SPAN_SHAPES = ["box"] as const;
90
+ /** 時間軸の図の目盛りの長さに書ける単位 */
91
+ export const DURATION_UNITS = ["ms", "s", "min", "h", "d"] as const;
92
+
60
93
  /** `carry` に書ける運ぶ物。封筒は書かない時、札は `tag` で書く */
61
94
  export const CARRIES = keys<Exclude<Carry["kind"], "envelope" | "tag">>({ coin: true, none: true });
62
95
  export const VIEWS = keys<ViewMode>({ fixed: true, follow: true });