@cardenelabs/dragon 0.43.0 → 0.45.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 (97) hide show
  1. package/README.md +21 -0
  2. package/dist/cli.cjs +6804 -5032
  3. package/dist/cli.cjs.map +1 -1
  4. package/dist/cli.js +6804 -5032
  5. package/dist/cli.js.map +1 -1
  6. package/dist/export.cjs +7172 -5536
  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 +7171 -5537
  11. package/dist/export.js.map +1 -1
  12. package/dist/index.cjs +12244 -10449
  13. package/dist/index.cjs.map +1 -1
  14. package/dist/index.d.cts +55 -3
  15. package/dist/index.d.ts +55 -3
  16. package/dist/index.js +12244 -10449
  17. package/dist/index.js.map +1 -1
  18. package/dist/{ink-B6s_SMXG.d.cts → ink-DeDtzaTL.d.cts} +27 -3
  19. package/dist/{ink-B6s_SMXG.d.ts → ink-DeDtzaTL.d.ts} +27 -3
  20. package/dist/light/chunk-6ZUKJ3VO.js +489 -0
  21. package/dist/light/chunk-6ZUKJ3VO.js.map +1 -0
  22. package/dist/light/chunk-CLS6JVKK.cjs +84 -0
  23. package/dist/light/chunk-CLS6JVKK.cjs.map +1 -0
  24. package/dist/light/chunk-JNSHZTPF.js +1141 -0
  25. package/dist/light/chunk-JNSHZTPF.js.map +1 -0
  26. package/dist/light/chunk-OUQ44P45.cjs +489 -0
  27. package/dist/light/chunk-OUQ44P45.cjs.map +1 -0
  28. package/dist/light/chunk-VRAW7VAQ.cjs +1141 -0
  29. package/dist/light/chunk-VRAW7VAQ.cjs.map +1 -0
  30. package/dist/light/chunk-YDKPEKGZ.js +84 -0
  31. package/dist/light/chunk-YDKPEKGZ.js.map +1 -0
  32. package/dist/light/git-C4RVNFT6.js +637 -0
  33. package/dist/light/git-C4RVNFT6.js.map +1 -0
  34. package/dist/light/git-I7D7RIW2.cjs +637 -0
  35. package/dist/light/git-I7D7RIW2.cjs.map +1 -0
  36. package/dist/light/index.cjs +9885 -0
  37. package/dist/light/index.cjs.map +1 -0
  38. package/dist/light/index.d.cts +976 -0
  39. package/dist/light/index.d.ts +976 -0
  40. package/dist/light/index.js +9885 -0
  41. package/dist/light/index.js.map +1 -0
  42. package/dist/light/lineup-FAIKTH3Y.cjs +283 -0
  43. package/dist/light/lineup-FAIKTH3Y.cjs.map +1 -0
  44. package/dist/light/lineup-YEG4HHEI.js +283 -0
  45. package/dist/light/lineup-YEG4HHEI.js.map +1 -0
  46. package/dist/light/state-P3LIVI3K.js +335 -0
  47. package/dist/light/state-P3LIVI3K.js.map +1 -0
  48. package/dist/light/state-ZZUK6AQT.cjs +335 -0
  49. package/dist/light/state-ZZUK6AQT.cjs.map +1 -0
  50. package/dist/light/time-64DJKYAL.cjs +719 -0
  51. package/dist/light/time-64DJKYAL.cjs.map +1 -0
  52. package/dist/light/time-B5WUQOFP.js +719 -0
  53. package/dist/light/time-B5WUQOFP.js.map +1 -0
  54. package/dist/light/tree-5HPREYW2.js +478 -0
  55. package/dist/light/tree-5HPREYW2.js.map +1 -0
  56. package/dist/light/tree-66EH4QVI.cjs +478 -0
  57. package/dist/light/tree-66EH4QVI.cjs.map +1 -0
  58. package/dist/node.cjs +1932 -680
  59. package/dist/node.cjs.map +1 -1
  60. package/dist/node.js +1932 -680
  61. package/dist/node.js.map +1 -1
  62. package/dist/player.global.js +3 -3
  63. package/package.json +14 -2
  64. package/src/api.ts +71 -0
  65. package/src/field-messages.ts +6 -0
  66. package/src/figure-text.ts +4 -0
  67. package/src/index.ts +6 -65
  68. package/src/kinds/all.ts +16 -0
  69. package/src/kinds/git.ts +3 -0
  70. package/src/kinds/lineup.ts +3 -0
  71. package/src/kinds/registry.ts +46 -0
  72. package/src/kinds/state.ts +2 -0
  73. package/src/kinds/time.ts +3 -0
  74. package/src/kinds/tree.ts +3 -0
  75. package/src/layout/git.ts +0 -1
  76. package/src/layout/lineup.ts +218 -0
  77. package/src/layout/time.ts +0 -1
  78. package/src/layout/tree.ts +0 -1
  79. package/src/light.ts +31 -0
  80. package/src/look/values.ts +31 -2
  81. package/src/messages.ts +54 -0
  82. package/src/parser.ts +123 -1
  83. package/src/player-global.ts +3 -0
  84. package/src/player.ts +1 -1
  85. package/src/printer.ts +30 -1
  86. package/src/render/draw.ts +731 -0
  87. package/src/render/lineup.ts +184 -0
  88. package/src/render/parts.ts +19 -7
  89. package/src/render/svg.ts +4 -697
  90. package/src/render/time.ts +1 -4
  91. package/src/render/tree.ts +3 -2
  92. package/src/schema.ts +52 -4
  93. package/src/schemas/diagram.schema.json +145 -22
  94. package/src/schemas/validate-diagram.js +1 -1
  95. package/src/timeline.ts +14 -0
  96. package/src/view.ts +1 -1
  97. package/src/words.ts +15 -2
package/src/timeline.ts CHANGED
@@ -14,6 +14,7 @@
14
14
  * 段の中の書いた順に依らず、針がその目盛りに入った時に引き、線を引き終えるまで針は次の目盛りへ進まない。
15
15
  * 針を進める出来事より後に書いた出来事は、針が止まってから起こす。物差しの欄は、針が進む段では針の進みに比例して満ち、
16
16
  * 区切りの境から進む時は 0 から満ち直す。針が進まない段では値を書いた時に変わる。
17
+ * 列の図 (#3239) の列の並びを書く出来事と、封と札の出来事も線と同じ表に載せ、並びは滑り終えるまで、封は覆い終えるまでを引く間にする。
17
18
  * 札を動かす線が運ぶ枝の札は運ぶ物の表に載せない。札は同じ時刻にいくつも出ていて、どの札も主役ではないので、
18
19
  * 枝分かれの図を描く部品が札ごとに動かす。線に書いた運ぶ物 (`tag` と `carry`) だけを表に載せる。
19
20
  */
@@ -102,6 +103,9 @@ interface Planned {
102
103
 
103
104
  type EdgeEvent = Extract<Diagram["steps"][number]["events"][number], { type: "edge" }>;
104
105
 
106
+ /** 列の図の出来事の長さ */
107
+ const LINEUP_LENGTH = { line: MOTION.lineup.slide, seal: MOTION.lineup.seal, open: MOTION.fade, pick: MOTION.fade, stamp: MOTION.popFade } as const;
108
+
105
109
  /** 時間軸の図の段を組む時に渡す、段の始まりの針の位置と、目盛り 1 つを進む秒数 */
106
110
  interface Needle {
107
111
  from: number;
@@ -153,6 +157,16 @@ function plan(step: Diagram["steps"][number], needle?: Needle): Planned {
153
157
  return;
154
158
  }
155
159
  if (event.type === "now" || (needle && pulled(event))) return;
160
+ if (event.type === "line" || event.type === "seal" || event.type === "open" || event.type === "pick" || event.type === "stamp") {
161
+ const a = cursor;
162
+ const b = a + LINEUP_LENGTH[event.type];
163
+ out.edges.push({ event: e, a, b, carries: false, coin: false, named: false });
164
+ cursor = a + MOTION.lineup.stagger;
165
+ arrived = b;
166
+ changes = 0;
167
+ out.busy = Math.max(out.busy, b);
168
+ return;
169
+ }
156
170
  // 枝分かれの図の commit を積む出来事と枝を切る出来事と、木の図の葉と親を出す出来事は、親から引く線と同じ間で引く
157
171
  if (event.type === "commit" || event.type === "branch" || event.type === "leaf" || event.type === "node") {
158
172
  const a = cursor;
package/src/view.ts CHANGED
@@ -7,7 +7,7 @@
7
7
  * 書き手が原本の `view` で決めた時は、字の大きさに関わらずそれに従う。
8
8
  */
9
9
  import { READABLE_PX, TYPE } from "./look/values";
10
- import type { Rendered } from "./render/svg";
10
+ import type { Rendered } from "./render/draw";
11
11
  import type { ViewMode } from "./schema";
12
12
 
13
13
  export function chooseView(rendered: Pick<Rendered, "layout" | "view">, frameWidth: number, frameHeight?: number): { mode: ViewMode; textPx: number } {
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, time: true, tree: true });
19
+ export const KINDS = keys<Diagram["kind"]>({ sequence: true, architecture: true, state: true, git: true, time: true, tree: true, lineup: true });
20
20
 
21
21
  /**
22
22
  * 状態遷移図の始まりと終わりの印の名前 (#3163)。線の送る側に `start`、受ける側に `finish` を書き、
@@ -41,11 +41,23 @@ export const NOW = "now";
41
41
  */
42
42
  export const TREE_HEADS = ["leaf", "node"] as const;
43
43
 
44
+ /**
45
+ * 列の図 (`lineup`、#3239) だけが書ける行の頭の語。最初の段より前にチップを宣言し (`item`)、
46
+ * 段の中で列の並びを書き (`line`)、封をして開け (`seal` と `open`)、列を選び (`pick`)、札を押す (`stamp`)
47
+ */
48
+ export const LINEUP_HEADS = ["item", "line", "seal", "open", "pick", "stamp"] as const;
49
+ /** 1 列に並べられるチップの上限。図の幅はこの枚数の列の幅で決まる */
50
+ export const LANE_MOST = 12;
51
+ /** チップの字の上限 */
52
+ export const LABEL_MOST = 4;
53
+ /** 列の図の `box` の行に書ける属性の鍵。列は絵柄と飛び先を持たない */
54
+ export const LANE_ATTRS = ["note", "color"] as const;
55
+
44
56
  /**
45
57
  * 最初の行より後の行の頭の語。線の行だけは箱の名札から始まる。
46
58
  * `branch` と `commit` は枝分かれの図 (`git`) だけが書ける (#3164)。`source` は段の出典 (#3199)
47
59
  */
48
- export const HEADS = ["group", "end", "box", "strip", "step", "say", "code", "source", "act", "note", "set", "branch", "commit", ...TIME_HEADS, ...TREE_HEADS] as const;
60
+ export const HEADS = ["group", "end", "box", "strip", "step", "say", "code", "source", "act", "note", "set", "branch", "commit", ...TIME_HEADS, ...TREE_HEADS, ...LINEUP_HEADS] as const;
49
61
  type Head = (typeof HEADS)[number];
50
62
 
51
63
  /** 箱と区画の名札の後ろに、見せる名前を続ける語 (`box <名札> as <名前>`) */
@@ -86,6 +98,7 @@ export const ATTRS = {
86
98
  commit: ["hash", "note"],
87
99
  leaf: ["hash"],
88
100
  node: ["hash"],
101
+ item: ["color", "label"],
89
102
  scale: ["from"],
90
103
  period: ["from"],
91
104
  row: ["color", "empty"],