@kensnzk/koyu 0.5.0 → 0.11.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 (128) hide show
  1. package/README.ja.md +43 -11
  2. package/README.md +51 -11
  3. package/dist/check.d.ts +34 -0
  4. package/dist/check.d.ts.map +1 -0
  5. package/dist/check.js +500 -0
  6. package/dist/check.js.map +1 -0
  7. package/dist/cli.d.ts +3 -0
  8. package/dist/cli.d.ts.map +1 -0
  9. package/dist/cli.js +319 -0
  10. package/dist/cli.js.map +1 -0
  11. package/dist/diff.d.ts +90 -0
  12. package/dist/diff.d.ts.map +1 -0
  13. package/dist/diff.js +522 -0
  14. package/dist/diff.js.map +1 -0
  15. package/dist/graph.d.ts +81 -0
  16. package/dist/graph.d.ts.map +1 -0
  17. package/dist/graph.js +328 -0
  18. package/dist/graph.js.map +1 -0
  19. package/dist/index.d.ts +9 -0
  20. package/dist/index.d.ts.map +1 -0
  21. package/dist/index.js +10 -0
  22. package/dist/index.js.map +1 -0
  23. package/dist/light.d.ts +15 -0
  24. package/dist/light.d.ts.map +1 -0
  25. package/dist/light.js +55 -0
  26. package/dist/light.js.map +1 -0
  27. package/dist/mcp.d.ts +3 -0
  28. package/dist/mcp.d.ts.map +1 -0
  29. package/dist/mcp.js +354 -0
  30. package/dist/mcp.js.map +1 -0
  31. package/dist/model.d.ts +264 -0
  32. package/dist/model.d.ts.map +1 -0
  33. package/dist/model.js +361 -0
  34. package/dist/model.js.map +1 -0
  35. package/dist/parse-file.d.ts +9 -0
  36. package/dist/parse-file.d.ts.map +1 -0
  37. package/dist/parse-file.js +22 -0
  38. package/dist/parse-file.js.map +1 -0
  39. package/dist/parse.d.ts +16 -0
  40. package/dist/parse.d.ts.map +1 -0
  41. package/dist/parse.js +922 -0
  42. package/dist/parse.js.map +1 -0
  43. package/dist/plan.d.ts +8 -0
  44. package/dist/plan.d.ts.map +1 -0
  45. package/dist/plan.js +267 -0
  46. package/dist/plan.js.map +1 -0
  47. package/dist/site.d.ts +24 -0
  48. package/dist/site.d.ts.map +1 -0
  49. package/dist/site.js +53 -0
  50. package/dist/site.js.map +1 -0
  51. package/examples/comparison/README.md +16 -1
  52. package/examples/comparison/gen-ifc4.ts +1 -1
  53. package/examples/comparison/gen-ifcx.ts +2 -2
  54. package/examples/comparison/two-rooms.ifcx +1 -1
  55. package/examples/house/L1.muro +16 -0
  56. package/examples/house/L2.muro +19 -0
  57. package/examples/house/assets.muro +9 -0
  58. package/examples/house/main.muro +27 -0
  59. package/examples/house/site.muro +31 -0
  60. package/examples/house.muro +1 -1
  61. package/examples/mansion.muro +1 -1
  62. package/examples/office.muro +1 -1
  63. package/examples/steps/01-one-room.muro +4 -0
  64. package/examples/steps/02-two-rooms.muro +5 -0
  65. package/examples/steps/03-door.muro +9 -0
  66. package/examples/steps/04-exterior.muro +15 -0
  67. package/examples/steps/05-two-storeys.muro +27 -0
  68. package/examples/steps/06-finished.muro +30 -0
  69. package/examples/steps/README.md +25 -0
  70. package/examples/tower/L1.muro +80 -0
  71. package/examples/tower/L11.muro +47 -0
  72. package/examples/tower/L2.muro +69 -0
  73. package/examples/tower/L3.muro +28 -0
  74. package/examples/tower/assets.muro +13 -0
  75. package/examples/tower/main.muro +37 -0
  76. package/examples/tower/site-geometry.muro +7 -0
  77. package/examples/tower/site.muro +33 -0
  78. package/examples/tower/typical.muro +124 -0
  79. package/examples/two-rooms.canonical.json +5 -2
  80. package/examples/two-rooms.muro +6 -5
  81. package/package.json +28 -2
  82. package/src/check.ts +352 -63
  83. package/src/cli.ts +76 -11
  84. package/src/diff.ts +608 -0
  85. package/src/graph.ts +90 -10
  86. package/src/index.ts +14 -2
  87. package/src/mcp.ts +390 -0
  88. package/src/model.ts +260 -55
  89. package/src/parse-file.ts +28 -0
  90. package/src/parse.ts +562 -44
  91. package/src/plan.ts +33 -4
  92. package/src/site.ts +13 -5
  93. package/.github/workflows/ci.yml +0 -16
  94. package/.zenodo.json +0 -20
  95. package/CITATION.cff +0 -26
  96. package/docs/decisions/0001-notation-v0.md +0 -29
  97. package/docs/decisions/0002-height-and-offsets.md +0 -27
  98. package/docs/decisions/0003-uncounted-divisions.md +0 -36
  99. package/docs/decisions/0004-typical-floors.md +0 -21
  100. package/docs/decisions/0005-zones-and-unions.md +0 -23
  101. package/docs/decisions/0006-voids-and-light.md +0 -31
  102. package/docs/decisions/0007-semi-outdoor-air.md +0 -27
  103. package/docs/decisions/0008-vocabulary-and-level-attr.md +0 -23
  104. package/docs/decisions/0009-site-and-exterior.md +0 -29
  105. package/docs/ifc-coverage.md +0 -82
  106. package/docs/ifcx-notes.md +0 -25
  107. package/docs/img/house-L1.svg +0 -80
  108. package/docs/img/house-L2.svg +0 -53
  109. package/docs/img/mansion-L1.svg +0 -113
  110. package/docs/img/mansion-L10.svg +0 -111
  111. package/docs/img/mansion-L5.svg +0 -160
  112. package/docs/img/office-L1.svg +0 -116
  113. package/docs/img/office-L2.svg +0 -109
  114. package/docs/img/two-rooms.svg +0 -39
  115. package/docs/log/2026-07-22.md +0 -13
  116. package/docs/log/2026-07-23.md +0 -51
  117. package/docs/roadmap.md +0 -55
  118. package/docs/writing-architecture.md +0 -119
  119. package/spec/notation-v0.md +0 -164
  120. package/spec/vocabulary.md +0 -62
  121. package/test/core.test.ts +0 -171
  122. package/test/design2.test.ts +0 -97
  123. package/test/house.test.ts +0 -74
  124. package/test/mansion.test.ts +0 -99
  125. package/test/office.test.ts +0 -71
  126. package/test/uncounted.test.ts +0 -120
  127. package/test/vertical.test.ts +0 -75
  128. package/tsconfig.json +0 -13
package/dist/cli.js ADDED
@@ -0,0 +1,319 @@
1
+ #!/usr/bin/env node
2
+ // koyu — CLI
3
+ // npm run koyu -- check examples/office.muro # --json で構造化診断、--strict で警告も終了コード1
4
+ // npm run koyu -- diff before.muro after.muro # 構成の言葉の差分 (--json で ModelDiff)
5
+ // npm run koyu -- plan examples/office.muro -l L2 -o out/office-L2.svg
6
+ // npm run koyu -- doors examples/office.muro /L2/office /out
7
+ // npm run koyu -- graph examples/office.muro
8
+ // npm run koyu -- stats examples/office.muro
9
+ // npm run koyu -- levels examples/office.muro # テキストの矩計 (高さの積み上がり)
10
+ // npm run koyu -- json examples/office.muro
11
+ import { mkdirSync, writeFileSync } from "node:fs";
12
+ import { dirname } from "node:path";
13
+ import { check, checkDiagnostics } from "./check.js";
14
+ import { renderDiff, semanticDiff } from "./diff.js";
15
+ import { doorsBetween, neighbors } from "./graph.js";
16
+ import { daylight } from "./light.js";
17
+ import { siteReport } from "./site.js";
18
+ import { areaM2, displayName, effectiveUse, heff, isSemiOutdoor, levelsSorted, SourceError, toCanonical, zoneAreaM2, } from "./model.js";
19
+ import { parseFile } from "./parse-file.js";
20
+ import { svgPlan } from "./plan.js";
21
+ function load(file) {
22
+ return parseFile(file); // import による合成もここで働く
23
+ }
24
+ function opt(rest, ...names) {
25
+ for (const n of names) {
26
+ const i = rest.indexOf(n);
27
+ if (i >= 0 && rest[i + 1])
28
+ return rest[i + 1];
29
+ }
30
+ return undefined;
31
+ }
32
+ function main(argv) {
33
+ const [cmd, file, ...rest] = argv;
34
+ if (!cmd || !file) {
35
+ console.log("使い方: koyu <check|diff|plan|doors|graph|stats|levels|light|site|json> <file.muro> [引数...]\n" +
36
+ " check: --json (Diagnostic[]をJSONで出力) / --strict (警告があれば終了コード1)\n" +
37
+ " diff: koyu diff <a.muro> <b.muro> [--json] — 構成の言葉の差分 (0=差分なし / 1=差分あり / 2=入力が壊れている)");
38
+ return 2;
39
+ }
40
+ if (cmd === "diff") {
41
+ // semantic diff (ADR-0018) — 構成の言葉で二つのモデルを比べる。
42
+ // 終了コードは 0=差分なし / 1=差分あり / 2=入力が壊れている — checkの0/1と紛れない
43
+ const fileB = rest[0];
44
+ if (!fileB) {
45
+ console.log("使い方: koyu diff <a.muro> <b.muro> [--json]");
46
+ return 2;
47
+ }
48
+ let ma;
49
+ let mb;
50
+ try {
51
+ ma = load(file);
52
+ mb = load(fileB);
53
+ }
54
+ catch (e) {
55
+ if (e instanceof SourceError) {
56
+ console.error(`✖ ${e.message}`);
57
+ return 2;
58
+ }
59
+ throw e;
60
+ }
61
+ const d = semanticDiff(ma, mb);
62
+ const lines = renderDiff(d);
63
+ if (rest.includes("--json")) {
64
+ console.log(JSON.stringify(d, null, 1));
65
+ }
66
+ else if (lines.length === 0) {
67
+ console.log("差分なし");
68
+ }
69
+ else {
70
+ for (const l of lines)
71
+ console.log(l);
72
+ }
73
+ return lines.length === 0 ? 0 : 1;
74
+ }
75
+ let model;
76
+ try {
77
+ model = load(file);
78
+ }
79
+ catch (e) {
80
+ // check --json は構文・合成エラー (SourceError) でも有効JSONを返す — SYN01 の1件に写す (ADR-0016)
81
+ if (cmd === "check" && rest.includes("--json") && e instanceof SourceError) {
82
+ const d = {
83
+ code: "SYN01",
84
+ severity: "error",
85
+ message: e.raw,
86
+ ...(e.line ? { line: e.line } : {}),
87
+ ...(e.file !== undefined ? { file: e.file } : {}),
88
+ };
89
+ console.log(JSON.stringify([d], null, 1));
90
+ return 1;
91
+ }
92
+ throw e;
93
+ }
94
+ switch (cmd) {
95
+ case "check": {
96
+ const strict = rest.includes("--strict");
97
+ if (rest.includes("--json")) {
98
+ const diags = checkDiagnostics(model);
99
+ console.log(JSON.stringify(diags, null, 1));
100
+ const bad = diags.some((d) => d.severity === "error") ||
101
+ (strict && diags.some((d) => d.severity === "warning"));
102
+ return bad ? 1 : 0;
103
+ }
104
+ const { errors, warnings } = check(model);
105
+ for (const w of warnings)
106
+ console.log(`⚠ ${w}`);
107
+ for (const e of errors)
108
+ console.log(`✖ ${e}`);
109
+ if (errors.length === 0) {
110
+ console.log(`✔ 整合 — 空間 ${model.spaces.size} / 境界 ${model.boundaries.length}` +
111
+ (warnings.length ? ` (警告 ${warnings.length})` : ""));
112
+ return strict && warnings.length > 0 ? 1 : 0;
113
+ }
114
+ return 1;
115
+ }
116
+ case "json": {
117
+ process.stdout.write(toCanonical(model));
118
+ return 0;
119
+ }
120
+ case "plan": {
121
+ const level = opt(rest, "-l", "--level") ?? Object.keys(model.levels)[0];
122
+ const explicit = opt(rest, "-o");
123
+ const outFile = explicit ?? `${file.replace(/\.muro$/, "")}-${level}.svg`;
124
+ const svg = svgPlan(model, { level });
125
+ mkdirSync(dirname(outFile), { recursive: true });
126
+ writeFileSync(outFile, svg);
127
+ console.log(`平面図を生成しました: ${outFile}`);
128
+ return 0;
129
+ }
130
+ case "doors": {
131
+ const [from, to] = rest;
132
+ if (!from || !to) {
133
+ console.log("使い方: koyu doors <file> /パスA /パスB");
134
+ return 2;
135
+ }
136
+ const route = doorsBetween(model, from, to);
137
+ if (!route) {
138
+ console.log(`${from} から ${to} へは到達できません`);
139
+ return 1;
140
+ }
141
+ console.log(`${route.doors}枚 — ${route.path.join(" → ")}`);
142
+ return 0;
143
+ }
144
+ case "graph": {
145
+ for (const s of model.spaces.values()) {
146
+ const ns = neighbors(model, s.path);
147
+ console.log(`${s.path} (${displayName(s)})`);
148
+ for (const n of ns) {
149
+ const mark = n.boundary.kind === "open"
150
+ ? "〰 開放"
151
+ : n.boundary.kind === "wall" && n.boundary.air && !n.passable
152
+ ? "| 手すり等(外気開放・通行不可)"
153
+ : n.boundary.kind === "stair"
154
+ ? "↕ 階段"
155
+ : n.boundary.kind === "shaft"
156
+ ? "↕ シャフト(通行不可)"
157
+ : n.boundary.kind === "void"
158
+ ? "↕ 吹抜け"
159
+ : n.passable
160
+ ? `— 扉${n.doors}`
161
+ : "| 壁";
162
+ const attrs = Object.entries(n.boundary.attrs)
163
+ .map(([k, v]) => `${k}:${v}`)
164
+ .join(" ");
165
+ console.log(` ${mark} → ${n.space.path}${attrs ? ` (${attrs})` : ""}`);
166
+ }
167
+ }
168
+ return 0;
169
+ }
170
+ case "stats": {
171
+ const levels = levelsSorted(model);
172
+ const spaces = [...model.spaces.values()];
173
+ let total = 0;
174
+ const byType = new Map();
175
+ const byUse = new Map();
176
+ let semiTotal = 0;
177
+ for (const l of levels) {
178
+ const onLevel = spaces.filter((s) => s.level === l.name && s.rects.length > 0);
179
+ if (onLevel.length === 0)
180
+ continue;
181
+ console.log(`${l.name}`);
182
+ let sub = 0;
183
+ for (const s of onLevel) {
184
+ if (s.type === "void") {
185
+ console.log(` ${s.path}\t${displayName(s)}\t吹抜け (床面積不算入)`);
186
+ continue;
187
+ }
188
+ const a = areaM2(s);
189
+ if (isSemiOutdoor(model, s)) {
190
+ semiTotal += a;
191
+ console.log(` ${s.path}\t${displayName(s)}\t${s.type}\t${a.toFixed(2)}㎡ (半屋外・別掲)`);
192
+ continue;
193
+ }
194
+ sub += a;
195
+ total += a;
196
+ byType.set(s.type, (byType.get(s.type) ?? 0) + a);
197
+ const use = effectiveUse(model, s);
198
+ if (use)
199
+ byUse.set(use, (byUse.get(use) ?? 0) + a);
200
+ console.log(` ${s.path}\t${displayName(s)}\t${s.type}\t${a.toFixed(2)}㎡`);
201
+ }
202
+ console.log(` 小計 ${sub.toFixed(2)}㎡`);
203
+ }
204
+ console.log(`合計 ${total.toFixed(2)}㎡ (屋内床面積)`);
205
+ if (semiTotal > 0) {
206
+ console.log(`半屋外 ${semiTotal.toFixed(2)}㎡ (バルコニー・屋外階段等 — 算入条件は法規細部のため別掲)`);
207
+ }
208
+ const zonesToShow = [...model.zones.values()].filter((z) => z.attrs["site"] !== 1);
209
+ if (zonesToShow.length > 0) {
210
+ console.log("ゾーン別 (数える集約):");
211
+ for (const z of zonesToShow.sort((a, b) => (a.path < b.path ? -1 : 1))) {
212
+ const nm = z.attrs["name"];
213
+ console.log(` ${z.path}\t${typeof nm === "string" ? nm : ""}\t${zoneAreaM2(model, z.path).toFixed(2)}㎡`);
214
+ }
215
+ }
216
+ for (const [t, a] of byType)
217
+ console.log(` ${t}: ${a.toFixed(2)}㎡`);
218
+ if (byUse.size > 0) {
219
+ const parts = [...byUse.entries()].map(([u, a]) => `${u} ${a.toFixed(2)}㎡ (${((a / total) * 100).toFixed(1)}%)`);
220
+ console.log(`use別: ${parts.join(" / ")}`);
221
+ }
222
+ return 0;
223
+ }
224
+ case "light": {
225
+ const results = daylight(model);
226
+ if (results.length === 0) {
227
+ console.log("対象の居室 (住居系) がありません");
228
+ return 0;
229
+ }
230
+ let fail = 0;
231
+ for (const r of results) {
232
+ if (!r.ok)
233
+ fail++;
234
+ const ratio = r.window > 0 ? `1/${(r.floor / r.window).toFixed(1)}` : "窓なし";
235
+ console.log(`${r.ok ? "✔" : "✖"} ${r.space.path}\t${displayName(r.space)}\t窓 ${r.window.toFixed(2)}㎡ / 床 ${r.floor.toFixed(2)}㎡ = ${ratio} (必要 1/7 ≈ ${r.need.toFixed(2)}㎡)` +
236
+ (r.missingH ? " ⚠ h未指定の窓は数えていません" : ""));
237
+ }
238
+ console.log(fail === 0
239
+ ? `✔ 全${results.length}室が 1/7 を満たします (補正係数なしの粗い判定)`
240
+ : `✖ ${results.length}室中 ${fail}室が不足しています`);
241
+ return fail === 0 ? 0 : 1;
242
+ }
243
+ case "site": {
244
+ // 敷地の問い: 敷地面積・接道・建蔽率・容積率 (基本計画のボリューム検討の数字)
245
+ const r = siteReport(model);
246
+ if (!r.siteZone && r.roads.length === 0) {
247
+ console.log("敷地がありません (zone に site:1 を、道路に road:幅員 を宣言します)");
248
+ return 1;
249
+ }
250
+ const site = r.declaredArea ?? r.derivedArea;
251
+ if (r.siteZone) {
252
+ const nm = r.siteZone.attrs["name"];
253
+ console.log(`敷地 ${r.siteZone.path}${typeof nm === "string" ? ` (${nm})` : ""}`);
254
+ }
255
+ if (r.polygon) {
256
+ console.log(` 敷地形状: 多角形 ${r.polygon.points.length}頂点 (polygon宣言 — 所与のジオメトリ)`);
257
+ }
258
+ if (r.declaredArea !== undefined) {
259
+ const ok = Math.abs(r.declaredArea - r.derivedArea) < 0.05;
260
+ console.log(` 敷地面積: 宣言 ${r.declaredArea.toFixed(2)}㎡ / 導出 ${r.derivedArea.toFixed(2)}㎡ ${ok ? "✔ 一致" : `⚠ 不一致 (${r.polygon ? "測量値と多角形の食い違い" : "タイルの隙間か重なり"})`}`);
261
+ }
262
+ else {
263
+ console.log(` 敷地面積 (導出): ${r.derivedArea.toFixed(2)}㎡`);
264
+ }
265
+ for (const road of r.roads) {
266
+ const nm = road.road.attrs["name"];
267
+ console.log(` 接道: ${road.road.path}${typeof nm === "string" ? ` (${nm})` : ""} 幅員${road.width}mm ・ 接道長 ${road.frontage}mm ${road.frontage >= 2000 ? "✔ 2m以上" : "✖ 2m未満"}`);
268
+ }
269
+ console.log(` 建築面積 (水平投影・粗): ${r.footprint.toFixed(2)}㎡ → 建蔽率 ${((r.footprint / site) * 100).toFixed(1)}%`);
270
+ console.log(` 延べ面積: ${r.totalFloor.toFixed(2)}㎡ → 容積率 ${((r.totalFloor / site) * 100).toFixed(1)}%`);
271
+ return 0;
272
+ }
273
+ case "levels": {
274
+ // テキストの矩計: レベルの積み上がりと高さの検算
275
+ const levels = levelsSorted(model);
276
+ if (levels.length === 0) {
277
+ console.log("レベルが定義されていません");
278
+ return 1;
279
+ }
280
+ for (let i = levels.length - 1; i >= 0; i--) {
281
+ const l = levels[i];
282
+ const upper = levels[i + 1];
283
+ console.log(`${l.name}\tz:${l.z}` +
284
+ (l.h !== undefined ? `\th:${l.h}` : "") +
285
+ (l.slab !== undefined ? `\tslab:${l.slab}` : ""));
286
+ if (upper) {
287
+ const pitch = upper.z - l.z;
288
+ const detail = l.h !== undefined && upper.slab !== undefined
289
+ ? ` = 天井${l.h} + slab${upper.slab}` +
290
+ (pitch - l.h - upper.slab > 0 ? ` + 余り${pitch - l.h - upper.slab}` : "")
291
+ : "";
292
+ console.log(` ↑ 階高 ${pitch}${detail}`);
293
+ }
294
+ }
295
+ const spaces = [...model.spaces.values()].filter((s) => s.rects.length > 0 && s.level);
296
+ const overrides = spaces.filter((s) => typeof s.attrs["h"] === "number");
297
+ for (const s of overrides) {
298
+ console.log(`個別天井高: ${s.path} h:${heff(model, s)}`);
299
+ }
300
+ return 0;
301
+ }
302
+ default:
303
+ console.log(`未知のコマンドです: ${cmd}`);
304
+ return 2;
305
+ }
306
+ }
307
+ try {
308
+ process.exitCode = main(process.argv.slice(2));
309
+ }
310
+ catch (e) {
311
+ if (e instanceof SourceError) {
312
+ console.error(`✖ ${e.message}`);
313
+ process.exitCode = 1;
314
+ }
315
+ else {
316
+ throw e;
317
+ }
318
+ }
319
+ //# sourceMappingURL=cli.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
package/dist/diff.d.ts ADDED
@@ -0,0 +1,90 @@
1
+ import { type Edge, type Model } from "./model.js";
2
+ /** フィールドの変化。from/toの片方が無ければ、その側に無かった (追加/削除) */
3
+ export interface FieldChange {
4
+ field: string;
5
+ from?: string;
6
+ to?: string;
7
+ }
8
+ /** 変化した要素 — pathは新しい側 (b) の名 */
9
+ export interface ChangedItem {
10
+ path: string;
11
+ fields: FieldChange[];
12
+ }
13
+ /** uid一致・パス不一致 = 改名 (ADR-0015)。境界の対応はuidが継ぐため洪水にならない */
14
+ export interface RenamedItem {
15
+ from: string;
16
+ to: string;
17
+ uid: string;
18
+ }
19
+ /** 通り座標の変化。名は位置 (X1=先頭) から読む — 座標の挿入は以降の名の付け替えとして現れる */
20
+ export interface GridChange {
21
+ axis: "X" | "Y";
22
+ name: string;
23
+ kind: "added" | "removed" | "moved";
24
+ from?: number;
25
+ to?: number;
26
+ }
27
+ export interface SpaceItem {
28
+ path: string;
29
+ type: string;
30
+ areaM2?: number;
31
+ }
32
+ export interface BoundaryItem {
33
+ between: [string, string];
34
+ edge?: Edge;
35
+ kind: string;
36
+ t?: number;
37
+ }
38
+ export interface BoundaryChange {
39
+ between: [string, string];
40
+ edge?: Edge;
41
+ fields: FieldChange[];
42
+ }
43
+ export interface ModelDiff {
44
+ version?: {
45
+ from: string;
46
+ to: string;
47
+ };
48
+ name?: {
49
+ from?: string;
50
+ to?: string;
51
+ };
52
+ grid: GridChange[];
53
+ levels: {
54
+ added: string[];
55
+ removed: string[];
56
+ changed: ChangedItem[];
57
+ };
58
+ assets: {
59
+ added: string[];
60
+ removed: string[];
61
+ changed: ChangedItem[];
62
+ };
63
+ polygons: {
64
+ added: string[];
65
+ removed: string[];
66
+ changed: ChangedItem[];
67
+ };
68
+ zones: {
69
+ added: string[];
70
+ removed: string[];
71
+ renamed: RenamedItem[];
72
+ changed: ChangedItem[];
73
+ };
74
+ spaces: {
75
+ added: SpaceItem[];
76
+ removed: SpaceItem[];
77
+ renamed: RenamedItem[];
78
+ changed: ChangedItem[];
79
+ };
80
+ boundaries: {
81
+ added: BoundaryItem[];
82
+ removed: BoundaryItem[];
83
+ changed: BoundaryChange[];
84
+ };
85
+ }
86
+ /** 二つのModelの意味差分。toCanonical(a)===toCanonical(b) なら空 (不変量) */
87
+ export declare function semanticDiff(a: Model, b: Model): ModelDiff;
88
+ /** 日本語の差分行 (空なら差分なし)。並びはsemanticDiffが決めた正準順のまま */
89
+ export declare function renderDiff(d: ModelDiff): string[];
90
+ //# sourceMappingURL=diff.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../src/diff.ts"],"names":[],"mappings":"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"}