@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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cardenelabs/dragon",
3
- "version": "0.43.0",
3
+ "version": "0.45.0",
4
4
  "description": "Dragon — 動く図を、人は行ごとの記法で、AI は JSON で書く。時系列図と構成図を段ごとに動かし、mp4・GIF・HTML・PNG に書き出す。",
5
5
  "license": "MIT",
6
6
  "author": "cardene777",
@@ -39,6 +39,16 @@
39
39
  "default": "./dist/index.cjs"
40
40
  }
41
41
  },
42
+ "./light": {
43
+ "import": {
44
+ "types": "./dist/light/index.d.ts",
45
+ "default": "./dist/light/index.js"
46
+ },
47
+ "require": {
48
+ "types": "./dist/light/index.d.cts",
49
+ "default": "./dist/light/index.cjs"
50
+ }
51
+ },
42
52
  "./fonts": {
43
53
  "import": "./dist/fonts.js",
44
54
  "require": "./dist/fonts.cjs"
@@ -77,7 +87,9 @@
77
87
  },
78
88
  "sideEffects": [
79
89
  "./dist/fonts.js",
80
- "./dist/fonts.cjs"
90
+ "./dist/fonts.cjs",
91
+ "./src/kinds/all.ts",
92
+ "./src/render/svg.ts"
81
93
  ],
82
94
  "scripts": {
83
95
  "build": "tsup",
package/src/api.ts ADDED
@@ -0,0 +1,71 @@
1
+ /**
2
+ * 既定の入口 (`index.ts`) と軽い入口 (`light.ts`) が共に出す部品 (#3248)。
3
+ * 図の種類の部品を読むかだけが 2 つの入口で違うので、ここでは種類の部品を読まない。
4
+ */
5
+ export { extractDiagrams, type Fence } from "./markdown";
6
+ export { type LineError, type ParseOptions, type Parsed, parseNotation } from "./parser";
7
+ export { printNotation } from "./printer";
8
+ export type { NotationLang } from "./words";
9
+ export {
10
+ type Box,
11
+ type Carry,
12
+ type Checked,
13
+ type CheckOptions,
14
+ type Color,
15
+ type Diagram,
16
+ type DiagramEvent,
17
+ type FieldError,
18
+ type GitBranch,
19
+ type GitCommit,
20
+ type LabelSide,
21
+ type LineupItem,
22
+ type LineupOrder,
23
+ type LineupStamp,
24
+ type Region,
25
+ type StatePath,
26
+ type Step,
27
+ type StepSource,
28
+ type StripMeter,
29
+ type TimeMarkEvent,
30
+ type TimePeriod,
31
+ type TimePoint,
32
+ type TimeRow,
33
+ type TimeScale,
34
+ type TimeSpanEvent,
35
+ type TimeSpec,
36
+ type TreeLeaf,
37
+ type TreeNode,
38
+ validateDiagram,
39
+ type ViewMode,
40
+ } from "./schema";
41
+ export { FORMAT_VERSION, type Read, readDiagram } from "./version";
42
+ export type {
43
+ Layout,
44
+ Point,
45
+ Rect,
46
+ SceneAction,
47
+ SceneBadge,
48
+ SceneBox,
49
+ SceneEdge,
50
+ SceneEnd,
51
+ SceneField,
52
+ SceneLabel,
53
+ SceneLifeline,
54
+ ScenePath,
55
+ SceneRegion,
56
+ SceneSide,
57
+ SceneStrip,
58
+ SceneTrail,
59
+ } from "./layout/scene";
60
+ export type { TimeAxis, TimeBox, TimeColumn, TimeLayout, TimeMark, TimePeriodPlaced, TimePointPlaced, TimeRowPlaced, TimeSpanPlaced, TimeTick, TimeWire, TimeZoom } from "./layout/time";
61
+ export type { TreeLayout, TreeLink, TreePlaced, TreeRun } from "./layout/tree";
62
+ export type { LaneText, LineupAt, LineupLane, LineupLayout, LineupPick, LineupSeal, LineupSeat, LineupStamp as LineupStampPlaced } from "./layout/lineup";
63
+ export { type Family, FONTS } from "./look/fonts";
64
+ export { type ColorKey, type ColorName, type Colors, DEFAULT_PALETTE, type Palette, PALETTES, READABLE_PX, resolvePalette, type TextStyle, type Theme } from "./look/values";
65
+ export { mountDiagram, type Player, type PlayerOptions } from "./player";
66
+ export { ICONS } from "./render/icons";
67
+ export { describeOverlap, type InkPart, type Overlap, type OverlapSpot } from "./render/ink";
68
+ export { iconSvg } from "./render/parts";
69
+ export { type Rendered, type RenderOptions, renderDiagram } from "./render/draw";
70
+ export type { CarrierTime, EdgeTime, EventTime, LabelTime, Span, StateTime, Timeline } from "./timeline";
71
+ export { chooseView } from "./view";
@@ -25,9 +25,11 @@ export interface FieldMessages {
25
25
  enum: (values: readonly string[]) => string;
26
26
  type: (type: string) => string;
27
27
  minLength: (limit: number) => string;
28
+ maxLength: (limit: number) => string;
28
29
  /** 書けない字を読めない形の決まりでは `undefined` */
29
30
  pattern: (forbidden: Forbidden | undefined) => string;
30
31
  minItems: (limit: number) => string;
32
+ maxItems: (limit: number) => string;
31
33
  minimum: (limit: number) => string;
32
34
  const: (value: string) => string;
33
35
  /** どの欄の組み合わせか判らない場所では `undefined` */
@@ -80,9 +82,11 @@ const ja: FieldMessages = {
80
82
  enum: (values) => `${values.join(" / ")} のどれかにする`,
81
83
  type: (type) => TYPES_JA[type] ?? `${type} にする`,
82
84
  minLength: (limit) => `${limit} 字以上書く`,
85
+ maxLength: (limit) => `${limit} 字までにする`,
83
86
  pattern: (forbidden) =>
84
87
  forbidden ? `${forbidden.space ? "空白と " : ""}${forbidden.chars.join(" ")} は使えない` : "使えない字が入っている",
85
88
  minItems: (limit) => `${limit} つ以上書く`,
89
+ maxItems: (limit) => `${limit} つまでにする`,
86
90
  minimum: (limit) => `${limit} 以上にする`,
87
91
  const: (value) => `${value} にする`,
88
92
  not: (allowed) => (allowed ? `${allowed.field} の欄は kind が ${allowed.kind} の時だけ書ける` : "この欄の組み合わせは書けない"),
@@ -105,11 +109,13 @@ const en: FieldMessages = {
105
109
  enum: (values) => `Use one of ${values.join(" / ")}`,
106
110
  type: (type) => TYPES_EN[type] ?? `Use ${type}`,
107
111
  minLength: (limit) => `Write at least ${plural(limit, "character")}`,
112
+ maxLength: (limit) => `Write at most ${plural(limit, "character")}`,
108
113
  pattern: (forbidden) =>
109
114
  forbidden
110
115
  ? `Cannot contain ${forbidden.space ? "spaces or " : ""}${forbidden.chars.join(" ")}`
111
116
  : "Contains characters that are not allowed",
112
117
  minItems: (limit) => `Write at least ${plural(limit, "item")}`,
118
+ maxItems: (limit) => `Write at most ${plural(limit, "item")}`,
113
119
  minimum: (limit) => `Use ${limit} or greater`,
114
120
  const: (value) => `Use ${value}`,
115
121
  not: (allowed) => (allowed ? `The ${allowed.field} field is allowed only when kind is ${allowed.kind}` : "This combination of fields is not allowed"),
@@ -9,6 +9,8 @@ import type { NotationLang } from "./words";
9
9
  export interface FigureText {
10
10
  /** 描けない時の断りの文。`detail` は誤りの場所と文を並べた物 */
11
11
  cannotDraw: (detail: string) => string;
12
+ /** 軽い入口で読んでいない種類を描いた時の誤り (#3248) */
13
+ kindNotLoaded: (kind: string) => string;
12
14
  /** 描く設定の `colors` (#3198) の誤り。色味に無い色の名前と、色の値として読めない値の色の名前 */
13
15
  unknownColor: (name: string) => string;
14
16
  unreadableColor: (name: string) => string;
@@ -58,6 +60,7 @@ const capital = (text: string): string => text.charAt(0).toUpperCase() + text.sl
58
60
  export const FIGURE_TEXT: Record<NotationLang, FigureText> = {
59
61
  ja: {
60
62
  cannotDraw: (detail) => `図を描けない: ${detail}`,
63
+ kindNotLoaded: (kind) => `${kind} の図の部品を読んでいない。描く前に loadKind を待つ`,
61
64
  unknownColor: (name) => `colors の ${name} は色味に無い色の名前`,
62
65
  unreadableColor: (name) => `colors の ${name} の値を色として読めない`,
63
66
  overview: "全体図",
@@ -87,6 +90,7 @@ export const FIGURE_TEXT: Record<NotationLang, FigureText> = {
87
90
  },
88
91
  en: {
89
92
  cannotDraw: (detail) => `Cannot draw the diagram: ${detail}`,
93
+ kindNotLoaded: (kind) => `The ${kind} diagram parts are not loaded. Await loadKind before drawing`,
90
94
  unknownColor: (name) => `colors.${name} is not a color name of the palette`,
91
95
  unreadableColor: (name) => `colors.${name} cannot be read as a color`,
92
96
  overview: "Overview",
package/src/index.ts CHANGED
@@ -1,71 +1,12 @@
1
1
  /**
2
- * dragon の入口。
2
+ * dragon の入口。全ての図の種類の部品を持ち、待たずに描ける。
3
3
  *
4
4
  * 図の原本は JSON で、人は行の頭の英語の語で行の種類を決める dragon記法で書く。記法と JSON は行き来でき、
5
5
  * JSON は JSON Schema 1 本で検査する。原本から図を描き、頁に置いて段ごとに動かす。
6
- * 頁に字を読み込むのは別の入口 `@cardenelabs/dragon/fonts`、原本の file を移すのは Node でだけ動く入口 `@cardenelabs/dragon/node`。
6
+ * 頁に字を読み込むのは別の入口 `@cardenelabs/dragon/fonts`、原本の file を移すのは Node でだけ動く入口 `@cardenelabs/dragon/node`、
7
+ * 図の種類の部品を後から読むのは別の入口 `@cardenelabs/dragon/light`。
7
8
  * この入口は頁を束ねる道具が読むため、Node の組み込みの module を読む部品を置かない (#3206)。
8
9
  */
9
- export { extractDiagrams, type Fence } from "./markdown";
10
- export { type LineError, type ParseOptions, type Parsed, parseNotation } from "./parser";
11
- export { printNotation } from "./printer";
12
- export type { NotationLang } from "./words";
13
- export {
14
- type Box,
15
- type Carry,
16
- type Checked,
17
- type CheckOptions,
18
- type Color,
19
- type Diagram,
20
- type DiagramEvent,
21
- type FieldError,
22
- type GitBranch,
23
- type GitCommit,
24
- type LabelSide,
25
- type Region,
26
- type StatePath,
27
- type Step,
28
- type StepSource,
29
- type StripMeter,
30
- type TimeMarkEvent,
31
- type TimePeriod,
32
- type TimePoint,
33
- type TimeRow,
34
- type TimeScale,
35
- type TimeSpanEvent,
36
- type TimeSpec,
37
- type TreeLeaf,
38
- type TreeNode,
39
- validateDiagram,
40
- type ViewMode,
41
- } from "./schema";
42
- export { FORMAT_VERSION, type Read, readDiagram } from "./version";
43
- export type {
44
- Layout,
45
- Point,
46
- Rect,
47
- SceneAction,
48
- SceneBadge,
49
- SceneBox,
50
- SceneEdge,
51
- SceneEnd,
52
- SceneField,
53
- SceneLabel,
54
- SceneLifeline,
55
- ScenePath,
56
- SceneRegion,
57
- SceneSide,
58
- SceneStrip,
59
- SceneTrail,
60
- } from "./layout/scene";
61
- export type { TimeAxis, TimeBox, TimeColumn, TimeLayout, TimeMark, TimePeriodPlaced, TimePointPlaced, TimeRowPlaced, TimeSpanPlaced, TimeTick, TimeWire, TimeZoom } from "./layout/time";
62
- export type { TreeLayout, TreeLink, TreePlaced, TreeRun } from "./layout/tree";
63
- export { type Family, FONTS } from "./look/fonts";
64
- export { type ColorKey, type ColorName, type Colors, DEFAULT_PALETTE, type Palette, PALETTES, READABLE_PX, resolvePalette, type TextStyle, type Theme } from "./look/values";
65
- export { mountDiagram, type Player, type PlayerOptions } from "./player";
66
- export { ICONS } from "./render/icons";
67
- export { describeOverlap, type InkPart, type Overlap, type OverlapSpot } from "./render/ink";
68
- export { iconSvg } from "./render/parts";
69
- export { type Rendered, type RenderOptions, renderDiagram } from "./render/svg";
70
- export type { CarrierTime, EdgeTime, EventTime, LabelTime, Span, StateTime, Timeline } from "./timeline";
71
- export { chooseView } from "./view";
10
+ import "./kinds/all";
11
+
12
+ export * from "./api";
@@ -0,0 +1,16 @@
1
+ /**
2
+ * 全ての種類の部品を読み込みの時に登録する (#3248)。全部入りの入口が読む。
3
+ * 読むだけで登録するので、`package.json` の `sideEffects` に載せて束ねる道具に消させない。
4
+ */
5
+ import * as git from "./git";
6
+ import * as lineup from "./lineup";
7
+ import { registerKind } from "./registry";
8
+ import * as state from "./state";
9
+ import * as time from "./time";
10
+ import * as tree from "./tree";
11
+
12
+ registerKind("git", git);
13
+ registerKind("lineup", lineup);
14
+ registerKind("state", state);
15
+ registerKind("time", time);
16
+ registerKind("tree", tree);
@@ -0,0 +1,3 @@
1
+ /** 枝分かれの図の描く部品 (#3248) */
2
+ export { layoutGit } from "../layout/git";
3
+ export { drawGit } from "../render/git";
@@ -0,0 +1,3 @@
1
+ /** 列の図の描く部品 (#3248) */
2
+ export { layoutLineup } from "../layout/lineup";
3
+ export { drawLineup } from "../render/lineup";
@@ -0,0 +1,46 @@
1
+ /**
2
+ * 図の種類ごとの描く部品の登録簿 (#3248)。
3
+ *
4
+ * 描く所 (`render/draw.ts`) は git、lineup、state、time、tree の部品をここから引く。
5
+ * 全部入りの入口は読み込みの時に全ての種類を登録し (`all.ts`)、軽い入口は `loadKind` が種類を読んだ時に登録する (`light.ts`)。
6
+ * 時系列図と構成図の部品は登録せず、描く所が直に読む。
7
+ */
8
+ import { FIGURE_TEXT } from "../figure-text";
9
+ import type { NotationLang } from "../words";
10
+ import type * as git from "./git";
11
+ import type * as lineup from "./lineup";
12
+ import type * as state from "./state";
13
+ import type * as time from "./time";
14
+ import type * as tree from "./tree";
15
+
16
+ /** 後から読む種類の名前。部品の型から導くと、部品の型が軽い入口の型の file へ漏れるので字で書く */
17
+ export type LaterKind = "git" | "lineup" | "state" | "time" | "tree";
18
+
19
+ export interface LaterKinds {
20
+ git: typeof git;
21
+ lineup: typeof lineup;
22
+ state: typeof state;
23
+ time: typeof time;
24
+ tree: typeof tree;
25
+ }
26
+
27
+ /** 後から読む種類 */
28
+ export const LATER_KINDS: readonly LaterKind[] = ["git", "lineup", "state", "time", "tree"];
29
+
30
+ const registered: Partial<LaterKinds> = {};
31
+
32
+ export function registerKind<K extends LaterKind>(kind: K, parts: LaterKinds[K]): void {
33
+ registered[kind] = parts;
34
+ }
35
+
36
+ /** 種類の部品を今すぐ描ける形で持っているか。時系列図と構成図は常に持つ */
37
+ export function kindLoaded(kind: string | undefined): boolean {
38
+ return !(LATER_KINDS as readonly (string | undefined)[]).includes(kind) || registered[kind as LaterKind] !== undefined;
39
+ }
40
+
41
+ /** 種類の部品。読んでいない時は、種類の名前を含む誤りで止まる */
42
+ export function kindParts<K extends LaterKind>(kind: K, lang: NotationLang = "ja"): LaterKinds[K] {
43
+ const parts = registered[kind];
44
+ if (parts === undefined) throw new Error(FIGURE_TEXT[lang].kindNotLoaded(kind));
45
+ return parts;
46
+ }
@@ -0,0 +1,2 @@
1
+ /** 状態遷移図の描く部品 (#3248)。描き方は描く所 (`render/draw.ts`) が持つので、置き方だけを持つ */
2
+ export { layoutState } from "../layout/state";
@@ -0,0 +1,3 @@
1
+ /** 時間軸の図の描く部品 (#3248) */
2
+ export { layoutTime } from "../layout/time";
3
+ export { drawTime, meterField, timeFocus } from "../render/time";
@@ -0,0 +1,3 @@
1
+ /** 木の図の描く部品 (#3248) */
2
+ export { layoutTree } from "../layout/tree";
3
+ export { drawTree } from "../render/tree";
package/src/layout/git.ts CHANGED
@@ -127,7 +127,6 @@ export interface GitLayout extends Layout {
127
127
  moves: GitMove[];
128
128
  }
129
129
 
130
- export const isGitLayout = (layout: Layout): layout is GitLayout => layout.kind === "git";
131
130
 
132
131
  /** 札が留まる所。commit と、その commit の上の札の段 (0 から数える) */
133
132
  interface Slot {
@@ -0,0 +1,218 @@
1
+ /**
2
+ * 列の図の置き場所 (#3239)。見た目の元は step 2 で本人が選んだ見本の「列の図」。
3
+ *
4
+ * 箱 (`box`) が列になり、宣言した順に上から同じ幅で並ぶ。列の名前は列の左上に、箱の下の字 (`sub`) は列の右上に置く。
5
+ * チップは列の左から等間隔の席に座り、図の幅は上限の枚数の列の幅で決まる。チップの数で図の幅を変えないのは、段によって図の大きさが変わらないため。
6
+ * 字がチップの幅の下限を超える時は全てのチップを同じ幅に広げ、列の名前と右上の字が 1 列に収まらない時は全ての列を広げる。
7
+ *
8
+ * 段の中の `line` を書いた順に辿り、チップが席に居る間を 1 回ずつ `LineupSeat` にする。
9
+ * 滑り始める所は、同じ列に居たチップならその席、ほかの列に居たチップなら段の始まりの居場所で、選んだ列に居ればその席、なければ最後に座った席。
10
+ * どの列にも居なかったチップは滑り始める所を持たない。同じ席に残るチップは前の `LineupSeat` のまま続ける。
11
+ * 元の列を書き換えない時は元の席のチップも残る。元の列を書き換えた時は、元の席の `until` に書き換えた出来事を書く。
12
+ *
13
+ * 原本の JSON が宣言していない列とチップを書く時は、その列とチップを除いて描く。同じ列に同じチップを書く時は最初の 1 枚だけを描く。
14
+ * 開いている列への `open` と、封をした列への `seal` は描かない。
15
+ *
16
+ * 段の番号は、その段で最初に変わる列の左の縁に、チップの並びの高さで置く。列の変わらない段は帯の左上に置き、それも無ければ前の段の番号と入れ替える。
17
+ */
18
+ import { type ColorKey, LOOK, TYPE } from "../look/values";
19
+ import type { Diagram } from "../schema";
20
+ import { LANE_MOST } from "../words";
21
+ import { textBox, textWidth } from "./measure";
22
+ import { boxColors, type Layout, layoutStrip, type Point, type Rect, replaceSameSpot, type SceneBadge, type SceneBox, stripNeed } from "./scene";
23
+
24
+ /** 列の中の字。`text` は描く字で、`y` から `h` は字の形の高さ */
25
+ export interface LaneText extends Rect {
26
+ text: string;
27
+ /** 基準線の高さ */
28
+ baseline: number;
29
+ }
30
+
31
+ /** 列。`track` はチップを並べる所で、上限の枚数の席が入る */
32
+ export interface LineupLane extends SceneBox {
33
+ title: LaneText;
34
+ /** 右上の字の最初の字。書かない列は持たない */
35
+ note?: LaneText;
36
+ /** 右上の字の右端 */
37
+ noteRight: number;
38
+ track: Rect;
39
+ }
40
+
41
+ /** 段の出来事の場所 */
42
+ export interface LineupAt {
43
+ step: number;
44
+ event: number;
45
+ }
46
+
47
+ /** チップが列の席に居る間 1 回分。`from` は滑り始める左上で、弾んで現れるチップは持たない。`until` は席を離れる出来事 */
48
+ export interface LineupSeat extends Rect, LineupAt {
49
+ id: string;
50
+ lane: string;
51
+ index: number;
52
+ from?: Point;
53
+ until?: LineupAt;
54
+ }
55
+
56
+ /** 封。`until` は開ける出来事 */
57
+ export interface LineupSeal extends Rect, LineupAt {
58
+ lane: string;
59
+ until?: LineupAt;
60
+ }
61
+
62
+ /** 札 */
63
+ export interface LineupStamp extends Rect, LineupAt {
64
+ lane: string;
65
+ text: string;
66
+ }
67
+
68
+ /** 列を選ぶ出来事。同じ列を続けて選んだ時は最初の 1 つだけを持つ */
69
+ export interface LineupPick extends LineupAt {
70
+ lane: string;
71
+ }
72
+
73
+ export interface LineupLayout extends Layout {
74
+ kind: "lineup";
75
+ lanes: LineupLane[];
76
+ chips: LineupSeat[];
77
+ seals: LineupSeal[];
78
+ stamps: LineupStamp[];
79
+ picks: LineupPick[];
80
+ }
81
+
82
+
83
+ /** 列の右上に出る字と、その字の形。段の中の `note` は太い字で描く */
84
+ function notesOf(diagram: Diagram, id: string, sub: string | undefined): number[] {
85
+ const written = diagram.steps.flatMap((step) => step.events.flatMap((e) => (e.type === "swap" && e.box === id ? [textWidth(e.text, TYPE.boxSubStrong)] : [])));
86
+ return sub === undefined ? written : [textWidth(sub, TYPE.boxSub), ...written];
87
+ }
88
+
89
+ export function layoutLineup(diagram: Diagram): LineupLayout {
90
+ const { margin, gap, lineup: N } = LOOK;
91
+ const items = diagram.lineup?.items ?? [];
92
+ const known = new Set(items.map((item) => item.id));
93
+ const chipW = Math.max(N.chip.w, ...items.map((item) => (item.label === undefined ? 0 : textWidth(item.label, TYPE.chip) + N.chip.padX * 2)));
94
+ const pitch = chipW + N.chip.gap;
95
+ const trackW = pitch * LANE_MOST - N.chip.gap;
96
+ const titled = diagram.boxes.map((b) => textWidth(b.name, TYPE.boxName) + N.textGap + Math.max(0, ...notesOf(diagram, b.id, b.sub)));
97
+ const laneW = Math.max(trackW + N.padX * 2, ...titled.map((w) => w + N.padX * 2), stripNeed(diagram));
98
+
99
+ const colors = boxColors(diagram);
100
+ const lanes: LineupLane[] = diagram.boxes.map((b, i) => {
101
+ const y = margin + i * (N.h + gap);
102
+ const baseline = y + N.textY;
103
+ const noteRight = margin + laneW - N.padX;
104
+ return {
105
+ id: b.id,
106
+ name: b.name,
107
+ ...(b.sub !== undefined ? { sub: b.sub } : {}),
108
+ color: colors.get(b.id) ?? "slate",
109
+ x: margin,
110
+ y,
111
+ w: laneW,
112
+ h: N.h,
113
+ cx: margin + laneW / 2,
114
+ cy: y + N.h / 2,
115
+ title: { ...textBox(b.name, margin + N.padX, baseline, TYPE.boxName), text: b.name, baseline },
116
+ ...(b.sub !== undefined ? { note: { ...textBox(b.sub, noteRight - textWidth(b.sub, TYPE.boxSub), baseline, TYPE.boxSub), text: b.sub, baseline } } : {}),
117
+ noteRight,
118
+ track: { x: margin + N.padX, y: y + N.trackY, w: trackW, h: N.chip.h },
119
+ };
120
+ });
121
+ const laneOf = new Map(lanes.map((lane) => [lane.id, lane]));
122
+
123
+ const chips: LineupSeat[] = [];
124
+ const seals: LineupSeal[] = [];
125
+ const stamps: LineupStamp[] = [];
126
+ const picks: LineupPick[] = [];
127
+ const seated = new Map<string, LineupSeat[]>();
128
+ const open = new Map<string, LineupSeal>();
129
+ let picked: string | undefined;
130
+ diagram.steps.forEach((step, s) => {
131
+ // 同じ段の `line` どうしは、段の始まりの居場所から滑る
132
+ const before = [...seated.values()].flat();
133
+ step.events.forEach((e, k) => {
134
+ if (e.type !== "line" && e.type !== "seal" && e.type !== "open" && e.type !== "pick" && e.type !== "stamp") return;
135
+ const lane = laneOf.get(e.box);
136
+ if (!lane) return;
137
+ const at: LineupAt = { step: s, event: k };
138
+ if (e.type === "seal" && !open.has(lane.id)) {
139
+ const { over } = N.seal;
140
+ const seal: LineupSeal = { ...at, lane: lane.id, x: lane.track.x - over, y: lane.track.y - over, w: lane.track.w + over * 2, h: lane.track.h + over * 2 };
141
+ seals.push(seal);
142
+ open.set(lane.id, seal);
143
+ } else if (e.type === "open") {
144
+ const seal = open.get(lane.id);
145
+ if (seal) seal.until = at;
146
+ open.delete(lane.id);
147
+ } else if (e.type === "pick" && picked !== lane.id) {
148
+ picks.push({ ...at, lane: lane.id });
149
+ picked = lane.id;
150
+ } else if (e.type === "stamp") {
151
+ const w = textWidth(e.text, TYPE.stamp) + N.stamp.padX * 2;
152
+ stamps.push({ ...at, lane: lane.id, text: e.text, x: lane.x + lane.w - N.padX - w, y: lane.track.y + (lane.track.h - N.stamp.h) / 2, w, h: N.stamp.h });
153
+ } else if (e.type === "line") {
154
+ const old = seated.get(lane.id) ?? [];
155
+ const order = [...new Set(e.items)].filter((id) => known.has(id)).slice(0, LANE_MOST);
156
+ const placed = order.map((id, index): LineupSeat => {
157
+ const same = old.find((c) => c.id === id);
158
+ if (same?.index === index) return same;
159
+ const others = before.filter((c) => c.id === id);
160
+ const source = same ?? others.find((c) => c.lane === picked) ?? others.at(-1);
161
+ const seat: LineupSeat = { ...at, id, lane: lane.id, index, x: lane.track.x + pitch * index, y: lane.track.y, w: chipW, h: N.chip.h, ...(source ? { from: [source.x, source.y] as Point } : {}) };
162
+ chips.push(seat);
163
+ return seat;
164
+ });
165
+ for (const c of old) if (!placed.includes(c)) c.until = at;
166
+ seated.set(lane.id, placed);
167
+ }
168
+ });
169
+ });
170
+
171
+ const layout: LineupLayout = {
172
+ kind: "lineup",
173
+ width: 0,
174
+ height: 0,
175
+ regions: [],
176
+ boxes: lanes,
177
+ lifelines: [],
178
+ edges: [],
179
+ labels: [],
180
+ actions: [],
181
+ badges: [],
182
+ paths: [],
183
+ ends: [],
184
+ lanes,
185
+ chips,
186
+ seals,
187
+ stamps,
188
+ picks,
189
+ };
190
+ const bottom = Math.max(...lanes.map((lane) => lane.y + lane.h), margin);
191
+ const width = laneW + margin * 2;
192
+ const strip = layoutStrip(diagram, margin, bottom + gap, width - margin * 2);
193
+ layout.width = width;
194
+ layout.height = (strip ? strip.y + strip.h : bottom) + margin;
195
+ if (strip) layout.strip = strip;
196
+ layout.badges = badgesOf(diagram, layout);
197
+ return layout;
198
+ }
199
+
200
+ function badgesOf(diagram: Diagram, layout: LineupLayout): SceneBadge[] {
201
+ const { inset } = LOOK.badge;
202
+ const out: SceneBadge[] = [];
203
+ const put = (step: number, x: number, y: number, color: ColorKey): void => {
204
+ out.push({ step, x, y, color });
205
+ };
206
+ diagram.steps.forEach((step, s) => {
207
+ const lane = step.events.flatMap((e) => ("box" in e ? [e.box] : [])).flatMap((id) => layout.lanes.filter((l) => l.id === id))[0];
208
+ if (lane) {
209
+ put(s, lane.x, lane.track.y + lane.track.h / 2, lane.color);
210
+ return;
211
+ }
212
+ const before = out[out.length - 1];
213
+ if (layout.strip && step.events.some((e) => e.type === "strip")) put(s, layout.strip.x + inset, layout.strip.y + inset, "slate");
214
+ else if (before) out.push({ ...before, step: s });
215
+ else put(s, LOOK.margin, LOOK.margin, layout.lanes[0]?.color ?? "slate");
216
+ });
217
+ return replaceSameSpot(out);
218
+ }
@@ -159,7 +159,6 @@ export interface TimeLayout extends Layout {
159
159
  needle: { y1: number; y2: number };
160
160
  }
161
161
 
162
- export const isTimeLayout = (layout: Layout): layout is TimeLayout => layout.kind === "time";
163
162
 
164
163
  const SECONDS = { d: 86400, h: 3600, min: 60, s: 1, ms: 0.001 } as const;
165
164
  type TimeUnit = keyof typeof SECONDS;
@@ -92,7 +92,6 @@ export interface TreeLayout extends Layout {
92
92
  runs: TreeRun[];
93
93
  }
94
94
 
95
- export const isTreeLayout = (layout: Layout): layout is TreeLayout => layout.kind === "tree";
96
95
 
97
96
  /** 書いた順の木の箱。子は書いた後の、まだ親を持たない木の箱だけを残す */
98
97
  interface Grown {
package/src/light.ts ADDED
@@ -0,0 +1,31 @@
1
+ /**
2
+ * dragon の軽い入口 (`@cardenelabs/dragon/light`、#3248)。
3
+ *
4
+ * 既定の入口と同じ部品を出すが、git、lineup、state、time、tree の描く部品を持たず、`loadKind` を待った時に読む。
5
+ * 読んだ後は既定の入口と同じ関数で、待たずに同じ図を描く。読んでいない種類を描くと、その種類の名前を含む誤りで止まる。
6
+ * 最初に読む量を抑えたい頁を束ねる時に使い、この入口と既定の入口を 1 つの頁で混ぜない (混ぜると全ての部品が頁に入る)。
7
+ */
8
+ import { kindLoaded, LATER_KINDS, type LaterKind, type LaterKinds, registerKind } from "./kinds/registry";
9
+
10
+ export * from "./api";
11
+ export { kindLoaded, LATER_KINDS, type LaterKind };
12
+
13
+ const LOADERS: { [K in LaterKind]: () => Promise<LaterKinds[K]> } = {
14
+ git: () => import("./kinds/git"),
15
+ lineup: () => import("./kinds/lineup"),
16
+ state: () => import("./kinds/state"),
17
+ time: () => import("./kinds/time"),
18
+ tree: () => import("./kinds/tree"),
19
+ };
20
+
21
+ const isLater = (kind: string | undefined): kind is LaterKind => (LATER_KINDS as readonly (string | undefined)[]).includes(kind);
22
+
23
+ /** 種類の描く部品を読む。時系列図と構成図は初めから持つので何もしない。読み込みが落ちると拒否され、次に呼ぶと読み直す */
24
+ export async function loadKind(kind: string | undefined): Promise<void> {
25
+ if (!isLater(kind) || kindLoaded(kind)) return;
26
+ await register(kind);
27
+ }
28
+
29
+ async function register<K extends LaterKind>(kind: K): Promise<void> {
30
+ registerKind(kind, await LOADERS[kind]());
31
+ }