@kensnzk/koyu 0.5.0 → 0.13.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 (160) hide show
  1. package/README.ja.md +43 -11
  2. package/README.md +51 -11
  3. package/dist/axo.d.ts +16 -0
  4. package/dist/axo.d.ts.map +1 -0
  5. package/dist/axo.js +211 -0
  6. package/dist/axo.js.map +1 -0
  7. package/dist/check.d.ts +109 -0
  8. package/dist/check.d.ts.map +1 -0
  9. package/dist/check.js +957 -0
  10. package/dist/check.js.map +1 -0
  11. package/dist/cli.d.ts +3 -0
  12. package/dist/cli.d.ts.map +1 -0
  13. package/dist/cli.js +410 -0
  14. package/dist/cli.js.map +1 -0
  15. package/dist/diff.d.ts +105 -0
  16. package/dist/diff.d.ts.map +1 -0
  17. package/dist/diff.js +583 -0
  18. package/dist/diff.js.map +1 -0
  19. package/dist/fabric.d.ts +28 -0
  20. package/dist/fabric.d.ts.map +1 -0
  21. package/dist/fabric.js +105 -0
  22. package/dist/fabric.js.map +1 -0
  23. package/dist/graph.d.ts +118 -0
  24. package/dist/graph.d.ts.map +1 -0
  25. package/dist/graph.js +627 -0
  26. package/dist/graph.js.map +1 -0
  27. package/dist/index.d.ts +12 -0
  28. package/dist/index.d.ts.map +1 -0
  29. package/dist/index.js +13 -0
  30. package/dist/index.js.map +1 -0
  31. package/dist/light.d.ts +15 -0
  32. package/dist/light.d.ts.map +1 -0
  33. package/dist/light.js +53 -0
  34. package/dist/light.js.map +1 -0
  35. package/dist/mcp.d.ts +3 -0
  36. package/dist/mcp.d.ts.map +1 -0
  37. package/dist/mcp.js +361 -0
  38. package/dist/mcp.js.map +1 -0
  39. package/dist/model.d.ts +379 -0
  40. package/dist/model.d.ts.map +1 -0
  41. package/dist/model.js +464 -0
  42. package/dist/model.js.map +1 -0
  43. package/dist/parse-file.d.ts +9 -0
  44. package/dist/parse-file.d.ts.map +1 -0
  45. package/dist/parse-file.js +22 -0
  46. package/dist/parse-file.js.map +1 -0
  47. package/dist/parse.d.ts +16 -0
  48. package/dist/parse.d.ts.map +1 -0
  49. package/dist/parse.js +1040 -0
  50. package/dist/parse.js.map +1 -0
  51. package/dist/plan.d.ts +10 -0
  52. package/dist/plan.d.ts.map +1 -0
  53. package/dist/plan.js +354 -0
  54. package/dist/plan.js.map +1 -0
  55. package/dist/poly.d.ts +78 -0
  56. package/dist/poly.d.ts.map +1 -0
  57. package/dist/poly.js +277 -0
  58. package/dist/poly.js.map +1 -0
  59. package/dist/site.d.ts +24 -0
  60. package/dist/site.d.ts.map +1 -0
  61. package/dist/site.js +54 -0
  62. package/dist/site.js.map +1 -0
  63. package/dist/vertical.d.ts +176 -0
  64. package/dist/vertical.d.ts.map +1 -0
  65. package/dist/vertical.js +669 -0
  66. package/dist/vertical.js.map +1 -0
  67. package/examples/basement/main.muro +84 -0
  68. package/examples/comparison/README.md +64 -1
  69. package/examples/comparison/gen-ifc4.ts +1 -1
  70. package/examples/comparison/gen-ifcx.ts +2 -2
  71. package/examples/comparison/two-rooms.ifcx +1 -1
  72. package/examples/complex/L1.muro +132 -0
  73. package/examples/complex/assets.muro +17 -0
  74. package/examples/complex/basement.muro +40 -0
  75. package/examples/complex/core.muro +40 -0
  76. package/examples/complex/hotel.muro +117 -0
  77. package/examples/complex/main.muro +67 -0
  78. package/examples/complex/office.muro +41 -0
  79. package/examples/complex/plant.muro +34 -0
  80. package/examples/complex/podium.muro +140 -0
  81. package/examples/complex/site.muro +18 -0
  82. package/examples/house/L1.muro +16 -0
  83. package/examples/house/L2.muro +19 -0
  84. package/examples/house/assets.muro +9 -0
  85. package/examples/house/main.muro +27 -0
  86. package/examples/house/site.muro +31 -0
  87. package/examples/house.muro +3 -3
  88. package/examples/mansion.muro +18 -13
  89. package/examples/office.muro +1 -1
  90. package/examples/steps/01-one-room.muro +4 -0
  91. package/examples/steps/02-two-rooms.muro +5 -0
  92. package/examples/steps/03-door.muro +9 -0
  93. package/examples/steps/04-exterior.muro +15 -0
  94. package/examples/steps/05-two-storeys.muro +27 -0
  95. package/examples/steps/06-finished.muro +30 -0
  96. package/examples/steps/README.md +25 -0
  97. package/examples/tower/L1.muro +80 -0
  98. package/examples/tower/L11.muro +49 -0
  99. package/examples/tower/L2.muro +71 -0
  100. package/examples/tower/L3.muro +31 -0
  101. package/examples/tower/assets.muro +14 -0
  102. package/examples/tower/main.muro +37 -0
  103. package/examples/tower/site-geometry.muro +7 -0
  104. package/examples/tower/site.muro +33 -0
  105. package/examples/tower/typical.muro +131 -0
  106. package/examples/two-rooms.canonical.json +30 -3
  107. package/examples/two-rooms.muro +11 -7
  108. package/package.json +29 -2
  109. package/src/axo.ts +258 -0
  110. package/src/check.ts +948 -122
  111. package/src/cli.ts +175 -12
  112. package/src/diff.ts +676 -0
  113. package/src/fabric.ts +123 -0
  114. package/src/graph.ts +451 -61
  115. package/src/index.ts +38 -2
  116. package/src/light.ts +4 -7
  117. package/src/mcp.ts +397 -0
  118. package/src/model.ts +462 -67
  119. package/src/parse-file.ts +28 -0
  120. package/src/parse.ts +682 -45
  121. package/src/plan.ts +152 -14
  122. package/src/poly.ts +295 -0
  123. package/src/site.ts +19 -11
  124. package/src/vertical.ts +884 -0
  125. package/.github/workflows/ci.yml +0 -16
  126. package/.zenodo.json +0 -20
  127. package/CITATION.cff +0 -26
  128. package/docs/decisions/0001-notation-v0.md +0 -29
  129. package/docs/decisions/0002-height-and-offsets.md +0 -27
  130. package/docs/decisions/0003-uncounted-divisions.md +0 -36
  131. package/docs/decisions/0004-typical-floors.md +0 -21
  132. package/docs/decisions/0005-zones-and-unions.md +0 -23
  133. package/docs/decisions/0006-voids-and-light.md +0 -31
  134. package/docs/decisions/0007-semi-outdoor-air.md +0 -27
  135. package/docs/decisions/0008-vocabulary-and-level-attr.md +0 -23
  136. package/docs/decisions/0009-site-and-exterior.md +0 -29
  137. package/docs/ifc-coverage.md +0 -82
  138. package/docs/ifcx-notes.md +0 -25
  139. package/docs/img/house-L1.svg +0 -80
  140. package/docs/img/house-L2.svg +0 -53
  141. package/docs/img/mansion-L1.svg +0 -113
  142. package/docs/img/mansion-L10.svg +0 -111
  143. package/docs/img/mansion-L5.svg +0 -160
  144. package/docs/img/office-L1.svg +0 -116
  145. package/docs/img/office-L2.svg +0 -109
  146. package/docs/img/two-rooms.svg +0 -39
  147. package/docs/log/2026-07-22.md +0 -13
  148. package/docs/log/2026-07-23.md +0 -51
  149. package/docs/roadmap.md +0 -55
  150. package/docs/writing-architecture.md +0 -119
  151. package/spec/notation-v0.md +0 -164
  152. package/spec/vocabulary.md +0 -62
  153. package/test/core.test.ts +0 -171
  154. package/test/design2.test.ts +0 -97
  155. package/test/house.test.ts +0 -74
  156. package/test/mansion.test.ts +0 -99
  157. package/test/office.test.ts +0 -71
  158. package/test/uncounted.test.ts +0 -120
  159. package/test/vertical.test.ts +0 -75
  160. package/tsconfig.json +0 -13
package/src/cli.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  #!/usr/bin/env node
2
- // koyu v0.1 — CLI
3
- // npm run koyu -- check examples/office.muro
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)
4
5
  // npm run koyu -- plan examples/office.muro -l L2 -o out/office-L2.svg
5
6
  // npm run koyu -- doors examples/office.muro /L2/office /out
6
7
  // npm run koyu -- graph examples/office.muro
@@ -8,9 +9,10 @@
8
9
  // npm run koyu -- levels examples/office.muro # テキストの矩計 (高さの積み上がり)
9
10
  // npm run koyu -- json examples/office.muro
10
11
 
11
- import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
12
+ import { mkdirSync, writeFileSync } from "node:fs";
12
13
  import { dirname } from "node:path";
13
- import { check } from "./check.js";
14
+ import { check, checkDiagnostics, type Diagnostic } from "./check.js";
15
+ import { renderDiff, semanticDiff } from "./diff.js";
14
16
  import { doorsBetween, neighbors } from "./graph.js";
15
17
  import { daylight } from "./light.js";
16
18
  import { siteReport } from "./site.js";
@@ -26,12 +28,48 @@ import {
26
28
  zoneAreaM2,
27
29
  type Model,
28
30
  } from "./model.js";
29
- import { parse } from "./parse.js";
31
+ import { parseFile } from "./parse-file.js";
30
32
  import { svgPlan } from "./plan.js";
33
+ import { svgAxo } from "./axo.js";
34
+ import { slopeText, verticalRuns } from "./vertical.js";
31
35
 
32
36
  function load(file: string): Model {
33
- const src = readFileSync(file, "utf8");
34
- return parse(src);
37
+ return parseFile(file); // import による合成もここで働く
38
+ }
39
+
40
+ /** `-l L1..L5` / `-l L1,L3` をレベル名の列へ */
41
+ /**
42
+ * `-l` の解決。**解決できない指定は空配列に落とさない** — 空配列は「一枚も描かない」を
43
+ * 意味するので、中身の無いSVGを終了コード0で「生成しました」と印字することになる。
44
+ * 呼び方の問題は呼び方の問題として返す (ADR-0028)。
45
+ */
46
+ function expandLevelArg(model: Model, arg: string): string[] {
47
+ const all = levelsSorted(model).map((l) => l.name);
48
+ // 端点に数字を要求しない — complex の `R` (屋上) のようなレベル名も端点に取れる
49
+ const m = /^([^.,]+)\.\.([^.,]+)$/.exec(arg);
50
+ if (!m) {
51
+ const names = arg.split(",");
52
+ const unknown = names.filter((n) => !all.includes(n));
53
+ if (unknown.length > 0) die(`レベルが宣言されていません: ${unknown.join(",")} (宣言済み: ${all.join(" ")})`);
54
+ return names;
55
+ }
56
+ const za = model.levels[m[1]!]?.z;
57
+ const zb = model.levels[m[2]!]?.z;
58
+ if (za === undefined || zb === undefined) {
59
+ const bad = [m[1]!, m[2]!].filter((n) => model.levels[n] === undefined);
60
+ die(`レベルが宣言されていません: ${bad.join(",")} (宣言済み: ${all.join(" ")})`);
61
+ }
62
+ const out = levelsSorted(model)
63
+ .filter((l) => l.z >= Math.min(za!, zb!) && l.z <= Math.max(za!, zb!))
64
+ .map((l) => l.name);
65
+ if (out.length === 0) die(`レベル範囲 ${arg} に当たるレベルがありません`);
66
+ return out;
67
+ }
68
+
69
+ /** 呼び方の問題は終了コード2 (使い方と同じ扱い — 構成の問題ではない) */
70
+ function die(message: string): never {
71
+ console.error(message);
72
+ process.exit(2);
35
73
  }
36
74
 
37
75
  function opt(rest: string[], ...names: string[]): string | undefined {
@@ -46,14 +84,75 @@ function main(argv: string[]): number {
46
84
  const [cmd, file, ...rest] = argv;
47
85
  if (!cmd || !file) {
48
86
  console.log(
49
- "使い方: koyu <check|plan|doors|graph|stats|levels|light|site|json> <file.muro> [引数...]",
87
+ "使い方: koyu <check|diff|plan|axo|doors|graph|stats|levels|runs|light|site|json> <file.muro> [引数...]\n" +
88
+ " check: --json (Diagnostic[]をJSONで出力) / --strict (警告があれば終了コード1)\n" +
89
+ " diff: koyu diff <a.muro> <b.muro> [--json] — 構成の言葉の差分 (0=差分なし / 1=差分あり / 2=入力が壊れている)",
50
90
  );
51
91
  return 2;
52
92
  }
53
- const model = load(file);
93
+
94
+ if (cmd === "diff") {
95
+ // semantic diff (ADR-0018) — 構成の言葉で二つのモデルを比べる。
96
+ // 終了コードは 0=差分なし / 1=差分あり / 2=入力が壊れている — checkの0/1と紛れない
97
+ const fileB = rest[0];
98
+ if (!fileB) {
99
+ console.log("使い方: koyu diff <a.muro> <b.muro> [--json]");
100
+ return 2;
101
+ }
102
+ let ma: Model;
103
+ let mb: Model;
104
+ try {
105
+ ma = load(file);
106
+ mb = load(fileB);
107
+ } catch (e) {
108
+ if (e instanceof SourceError) {
109
+ console.error(`✖ ${e.message}`);
110
+ return 2;
111
+ }
112
+ throw e;
113
+ }
114
+ const d = semanticDiff(ma, mb);
115
+ const lines = renderDiff(d);
116
+ if (rest.includes("--json")) {
117
+ console.log(JSON.stringify(d, null, 1));
118
+ } else if (lines.length === 0) {
119
+ console.log("差分なし");
120
+ } else {
121
+ for (const l of lines) console.log(l);
122
+ }
123
+ return lines.length === 0 ? 0 : 1;
124
+ }
125
+
126
+ let model: Model;
127
+ try {
128
+ model = load(file);
129
+ } catch (e) {
130
+ // check --json は構文・合成エラー (SourceError) でも有効JSONを返す — SYN01 の1件に写す (ADR-0016)
131
+ if (cmd === "check" && rest.includes("--json") && e instanceof SourceError) {
132
+ const d: Diagnostic = {
133
+ code: "SYN01",
134
+ severity: "error",
135
+ message: e.raw,
136
+ ...(e.line ? { line: e.line } : {}),
137
+ ...(e.file !== undefined ? { file: e.file } : {}),
138
+ };
139
+ console.log(JSON.stringify([d], null, 1));
140
+ return 1;
141
+ }
142
+ throw e;
143
+ }
54
144
 
55
145
  switch (cmd) {
56
146
  case "check": {
147
+ const strict = rest.includes("--strict");
148
+ if (rest.includes("--json")) {
149
+ const diags = checkDiagnostics(model);
150
+ console.log(JSON.stringify(diags, null, 1));
151
+ const bad =
152
+ diags.some((d) => d.severity === "error") ||
153
+ (strict && diags.some((d) => d.severity === "warning"));
154
+ return bad ? 1 : 0;
155
+ }
57
156
  const { errors, warnings } = check(model);
58
157
  for (const w of warnings) console.log(`⚠ ${w}`);
59
158
  for (const e of errors) console.log(`✖ ${e}`);
@@ -62,7 +161,7 @@ function main(argv: string[]): number {
62
161
  `✔ 整合 — 空間 ${model.spaces.size} / 境界 ${model.boundaries.length}` +
63
162
  (warnings.length ? ` (警告 ${warnings.length})` : ""),
64
163
  );
65
- return 0;
164
+ return strict && warnings.length > 0 ? 1 : 0;
66
165
  }
67
166
  return 1;
68
167
  }
@@ -72,6 +171,12 @@ function main(argv: string[]): number {
72
171
  }
73
172
  case "plan": {
74
173
  const level = opt(rest, "-l", "--level") ?? Object.keys(model.levels)[0];
174
+ // 未宣言のレベルは呼び方の問題 — 生のスタックトレースで落ちない (ADR-0028)
175
+ if (level !== undefined && model.levels[level] === undefined) {
176
+ die(
177
+ `レベルが宣言されていません: ${level} (宣言済み: ${levelsSorted(model).map((l) => l.name).join(" ")})`,
178
+ );
179
+ }
75
180
  const explicit = opt(rest, "-o");
76
181
  const outFile =
77
182
  explicit ?? `${file.replace(/\.muro$/, "")}-${level}.svg`;
@@ -129,6 +234,7 @@ function main(argv: string[]): number {
129
234
  const byType = new Map<string, number>();
130
235
  const byUse = new Map<string, number>();
131
236
  let semiTotal = 0;
237
+ let outdoorTotal = 0;
132
238
  for (const l of levels) {
133
239
  const onLevel = spaces.filter((s) => s.level === l.name && s.rects.length > 0);
134
240
  if (onLevel.length === 0) continue;
@@ -140,6 +246,11 @@ function main(argv: string[]): number {
140
246
  continue;
141
247
  }
142
248
  const a = areaM2(s)!;
249
+ if (s.type === "exterior") {
250
+ outdoorTotal += a;
251
+ console.log(` ${s.path}\t${displayName(s)}\t${s.type}\t${a.toFixed(2)}㎡ (屋外・不算入)`);
252
+ continue;
253
+ }
143
254
  if (isSemiOutdoor(model, s)) {
144
255
  semiTotal += a;
145
256
  console.log(
@@ -157,6 +268,9 @@ function main(argv: string[]): number {
157
268
  console.log(` 小計 ${sub.toFixed(2)}㎡`);
158
269
  }
159
270
  console.log(`合計 ${total.toFixed(2)}㎡ (屋内床面積)`);
271
+ if (outdoorTotal > 0) {
272
+ console.log(`屋外 ${outdoorTotal.toFixed(2)}㎡ (広場・空地等 — 床面積に算入しない)`);
273
+ }
160
274
  if (semiTotal > 0) {
161
275
  console.log(`半屋外 ${semiTotal.toFixed(2)}㎡ (バルコニー・屋外階段等 — 算入条件は法規細部のため別掲)`);
162
276
  }
@@ -182,7 +296,7 @@ function main(argv: string[]): number {
182
296
  case "light": {
183
297
  const results = daylight(model);
184
298
  if (results.length === 0) {
185
- console.log("対象の居室 (住居系) がありません");
299
+ console.log("採光の対象がありません (判定する室に daylight:1 を書きます)");
186
300
  return 0;
187
301
  }
188
302
  let fail = 0;
@@ -213,10 +327,13 @@ function main(argv: string[]): number {
213
327
  const nm = r.siteZone.attrs["name"];
214
328
  console.log(`敷地 ${r.siteZone.path}${typeof nm === "string" ? ` (${nm})` : ""}`);
215
329
  }
330
+ if (r.polygon) {
331
+ console.log(` 敷地形状: 多角形 ${r.polygon.points.length}頂点 (polygon宣言 — 所与のジオメトリ)`);
332
+ }
216
333
  if (r.declaredArea !== undefined) {
217
334
  const ok = Math.abs(r.declaredArea - r.derivedArea) < 0.05;
218
335
  console.log(
219
- ` 敷地面積: 宣言 ${r.declaredArea.toFixed(2)}㎡ / 導出 ${r.derivedArea.toFixed(2)}㎡ ${ok ? "✔ 一致" : "⚠ 不一致 (タイルの隙間か重なり)"}`,
336
+ ` 敷地面積: 宣言 ${r.declaredArea.toFixed(2)}㎡ / 導出 ${r.derivedArea.toFixed(2)}㎡ ${ok ? "✔ 一致" : `⚠ 不一致 (${r.polygon ? "測量値と多角形の食い違い" : "タイルの隙間か重なり"})`}`,
220
337
  );
221
338
  } else {
222
339
  console.log(` 敷地面積 (導出): ${r.derivedArea.toFixed(2)}㎡`);
@@ -231,6 +348,52 @@ function main(argv: string[]): number {
231
348
  console.log(` 延べ面積: ${r.totalFloor.toFixed(2)}㎡ → 容積率 ${((r.totalFloor / site) * 100).toFixed(1)}%`);
232
349
  return 0;
233
350
  }
351
+ case "axo": {
352
+ // 軸測図 — 立体をそのまま投影する。平面と同じく生成物のSVGなので、
353
+ // 実行環境もWebGLも要らず、生成して見るという同じ手で立体を確かめられる
354
+ const outPath = opt(rest, "-o", "--out") ?? "out/axo.svg";
355
+ const dirOpt = opt(rest, "-d", "--dir") as "NE" | "NW" | "SE" | "SW" | undefined;
356
+ const lv = opt(rest, "-l", "--levels");
357
+ const sc = opt(rest, "-s", "--scale");
358
+ const svg = svgAxo(model, {
359
+ ...(dirOpt ? { dir: dirOpt } : {}),
360
+ ...(lv ? { levels: expandLevelArg(model, lv) } : {}),
361
+ ...(sc ? { scale: Number(sc) } : {}),
362
+ ...(rest.includes("--ceilings") ? { ceilings: true } : {}),
363
+ ...(rest.includes("--no-walls") ? { walls: false } : {}),
364
+ });
365
+ mkdirSync(dirname(outPath), { recursive: true });
366
+ writeFileSync(outPath, svg);
367
+ console.log(`軸測図を生成しました: ${outPath}`);
368
+ return 0;
369
+ }
370
+
371
+ case "runs": {
372
+ // 縦動線 (ADR-0021): 段数も踏面も勾配も原本には書かれていない。全て導出値である
373
+ const runs = verticalRuns(model);
374
+ if (runs.length === 0) {
375
+ console.log("縦動線がありません (stair:N / ramp:N / escalator:N / lift:1 を空間に書きます)");
376
+ return 0;
377
+ }
378
+ for (const r of runs) {
379
+ const s = model.spaces.get(r.path);
380
+ const nm = s ? displayName(s) : r.path;
381
+ const head = `${r.level}${r.upper ? `→${r.upper}` : ""}\t${r.device}\t${nm}`;
382
+ if (r.device === "lift") {
383
+ console.log(`${head}\t${r.path}`);
384
+ continue;
385
+ }
386
+ const shape =
387
+ r.device === "stair"
388
+ ? `${r.risers}段 蹴上${Math.round(r.riser)} 踏面${Math.round(r.tread)}`
389
+ : `勾配 ${slopeText(r.slope)}`;
390
+ console.log(
391
+ `${head}\t上り${r.rise}mm\t${r.form === "return" ? "折返し" : "直"}\t${shape}\t走り${Math.round(r.going)}mm\t${r.path}`,
392
+ );
393
+ }
394
+ return 0;
395
+ }
396
+
234
397
  case "levels": {
235
398
  // テキストの矩計: レベルの積み上がりと高さの検算
236
399
  const levels = levelsSorted(model);