@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.
- package/README.ja.md +43 -11
- package/README.md +51 -11
- package/dist/check.d.ts +34 -0
- package/dist/check.d.ts.map +1 -0
- package/dist/check.js +500 -0
- package/dist/check.js.map +1 -0
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +319 -0
- package/dist/cli.js.map +1 -0
- package/dist/diff.d.ts +90 -0
- package/dist/diff.d.ts.map +1 -0
- package/dist/diff.js +522 -0
- package/dist/diff.js.map +1 -0
- package/dist/graph.d.ts +81 -0
- package/dist/graph.d.ts.map +1 -0
- package/dist/graph.js +328 -0
- package/dist/graph.js.map +1 -0
- package/dist/index.d.ts +9 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +10 -0
- package/dist/index.js.map +1 -0
- package/dist/light.d.ts +15 -0
- package/dist/light.d.ts.map +1 -0
- package/dist/light.js +55 -0
- package/dist/light.js.map +1 -0
- package/dist/mcp.d.ts +3 -0
- package/dist/mcp.d.ts.map +1 -0
- package/dist/mcp.js +354 -0
- package/dist/mcp.js.map +1 -0
- package/dist/model.d.ts +264 -0
- package/dist/model.d.ts.map +1 -0
- package/dist/model.js +361 -0
- package/dist/model.js.map +1 -0
- package/dist/parse-file.d.ts +9 -0
- package/dist/parse-file.d.ts.map +1 -0
- package/dist/parse-file.js +22 -0
- package/dist/parse-file.js.map +1 -0
- package/dist/parse.d.ts +16 -0
- package/dist/parse.d.ts.map +1 -0
- package/dist/parse.js +922 -0
- package/dist/parse.js.map +1 -0
- package/dist/plan.d.ts +8 -0
- package/dist/plan.d.ts.map +1 -0
- package/dist/plan.js +267 -0
- package/dist/plan.js.map +1 -0
- package/dist/site.d.ts +24 -0
- package/dist/site.d.ts.map +1 -0
- package/dist/site.js +53 -0
- package/dist/site.js.map +1 -0
- package/examples/comparison/README.md +16 -1
- package/examples/comparison/gen-ifc4.ts +1 -1
- package/examples/comparison/gen-ifcx.ts +2 -2
- package/examples/comparison/two-rooms.ifcx +1 -1
- package/examples/house/L1.muro +16 -0
- package/examples/house/L2.muro +19 -0
- package/examples/house/assets.muro +9 -0
- package/examples/house/main.muro +27 -0
- package/examples/house/site.muro +31 -0
- package/examples/house.muro +1 -1
- package/examples/mansion.muro +1 -1
- package/examples/office.muro +1 -1
- package/examples/steps/01-one-room.muro +4 -0
- package/examples/steps/02-two-rooms.muro +5 -0
- package/examples/steps/03-door.muro +9 -0
- package/examples/steps/04-exterior.muro +15 -0
- package/examples/steps/05-two-storeys.muro +27 -0
- package/examples/steps/06-finished.muro +30 -0
- package/examples/steps/README.md +25 -0
- package/examples/tower/L1.muro +80 -0
- package/examples/tower/L11.muro +47 -0
- package/examples/tower/L2.muro +69 -0
- package/examples/tower/L3.muro +28 -0
- package/examples/tower/assets.muro +13 -0
- package/examples/tower/main.muro +37 -0
- package/examples/tower/site-geometry.muro +7 -0
- package/examples/tower/site.muro +33 -0
- package/examples/tower/typical.muro +124 -0
- package/examples/two-rooms.canonical.json +5 -2
- package/examples/two-rooms.muro +6 -5
- package/package.json +28 -2
- package/src/check.ts +352 -63
- package/src/cli.ts +76 -11
- package/src/diff.ts +608 -0
- package/src/graph.ts +90 -10
- package/src/index.ts +14 -2
- package/src/mcp.ts +390 -0
- package/src/model.ts +260 -55
- package/src/parse-file.ts +28 -0
- package/src/parse.ts +562 -44
- package/src/plan.ts +33 -4
- package/src/site.ts +13 -5
- package/.github/workflows/ci.yml +0 -16
- package/.zenodo.json +0 -20
- package/CITATION.cff +0 -26
- package/docs/decisions/0001-notation-v0.md +0 -29
- package/docs/decisions/0002-height-and-offsets.md +0 -27
- package/docs/decisions/0003-uncounted-divisions.md +0 -36
- package/docs/decisions/0004-typical-floors.md +0 -21
- package/docs/decisions/0005-zones-and-unions.md +0 -23
- package/docs/decisions/0006-voids-and-light.md +0 -31
- package/docs/decisions/0007-semi-outdoor-air.md +0 -27
- package/docs/decisions/0008-vocabulary-and-level-attr.md +0 -23
- package/docs/decisions/0009-site-and-exterior.md +0 -29
- package/docs/ifc-coverage.md +0 -82
- package/docs/ifcx-notes.md +0 -25
- package/docs/img/house-L1.svg +0 -80
- package/docs/img/house-L2.svg +0 -53
- package/docs/img/mansion-L1.svg +0 -113
- package/docs/img/mansion-L10.svg +0 -111
- package/docs/img/mansion-L5.svg +0 -160
- package/docs/img/office-L1.svg +0 -116
- package/docs/img/office-L2.svg +0 -109
- package/docs/img/two-rooms.svg +0 -39
- package/docs/log/2026-07-22.md +0 -13
- package/docs/log/2026-07-23.md +0 -51
- package/docs/roadmap.md +0 -55
- package/docs/writing-architecture.md +0 -119
- package/spec/notation-v0.md +0 -164
- package/spec/vocabulary.md +0 -62
- package/test/core.test.ts +0 -171
- package/test/design2.test.ts +0 -97
- package/test/house.test.ts +0 -74
- package/test/mansion.test.ts +0 -99
- package/test/office.test.ts +0 -71
- package/test/uncounted.test.ts +0 -120
- package/test/vertical.test.ts +0 -75
- package/tsconfig.json +0 -13
package/src/cli.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
// koyu
|
|
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,
|
|
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,11 @@ import {
|
|
|
26
28
|
zoneAreaM2,
|
|
27
29
|
type Model,
|
|
28
30
|
} from "./model.js";
|
|
29
|
-
import {
|
|
31
|
+
import { parseFile } from "./parse-file.js";
|
|
30
32
|
import { svgPlan } from "./plan.js";
|
|
31
33
|
|
|
32
34
|
function load(file: string): Model {
|
|
33
|
-
|
|
34
|
-
return parse(src);
|
|
35
|
+
return parseFile(file); // import による合成もここで働く
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
function opt(rest: string[], ...names: string[]): string | undefined {
|
|
@@ -46,14 +47,75 @@ function main(argv: string[]): number {
|
|
|
46
47
|
const [cmd, file, ...rest] = argv;
|
|
47
48
|
if (!cmd || !file) {
|
|
48
49
|
console.log(
|
|
49
|
-
"使い方: koyu <check|plan|doors|graph|stats|levels|light|site|json> <file.muro> [引数...]"
|
|
50
|
+
"使い方: koyu <check|diff|plan|doors|graph|stats|levels|light|site|json> <file.muro> [引数...]\n" +
|
|
51
|
+
" check: --json (Diagnostic[]をJSONで出力) / --strict (警告があれば終了コード1)\n" +
|
|
52
|
+
" diff: koyu diff <a.muro> <b.muro> [--json] — 構成の言葉の差分 (0=差分なし / 1=差分あり / 2=入力が壊れている)",
|
|
50
53
|
);
|
|
51
54
|
return 2;
|
|
52
55
|
}
|
|
53
|
-
|
|
56
|
+
|
|
57
|
+
if (cmd === "diff") {
|
|
58
|
+
// semantic diff (ADR-0018) — 構成の言葉で二つのモデルを比べる。
|
|
59
|
+
// 終了コードは 0=差分なし / 1=差分あり / 2=入力が壊れている — checkの0/1と紛れない
|
|
60
|
+
const fileB = rest[0];
|
|
61
|
+
if (!fileB) {
|
|
62
|
+
console.log("使い方: koyu diff <a.muro> <b.muro> [--json]");
|
|
63
|
+
return 2;
|
|
64
|
+
}
|
|
65
|
+
let ma: Model;
|
|
66
|
+
let mb: Model;
|
|
67
|
+
try {
|
|
68
|
+
ma = load(file);
|
|
69
|
+
mb = load(fileB);
|
|
70
|
+
} catch (e) {
|
|
71
|
+
if (e instanceof SourceError) {
|
|
72
|
+
console.error(`✖ ${e.message}`);
|
|
73
|
+
return 2;
|
|
74
|
+
}
|
|
75
|
+
throw e;
|
|
76
|
+
}
|
|
77
|
+
const d = semanticDiff(ma, mb);
|
|
78
|
+
const lines = renderDiff(d);
|
|
79
|
+
if (rest.includes("--json")) {
|
|
80
|
+
console.log(JSON.stringify(d, null, 1));
|
|
81
|
+
} else if (lines.length === 0) {
|
|
82
|
+
console.log("差分なし");
|
|
83
|
+
} else {
|
|
84
|
+
for (const l of lines) console.log(l);
|
|
85
|
+
}
|
|
86
|
+
return lines.length === 0 ? 0 : 1;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
let model: Model;
|
|
90
|
+
try {
|
|
91
|
+
model = load(file);
|
|
92
|
+
} catch (e) {
|
|
93
|
+
// check --json は構文・合成エラー (SourceError) でも有効JSONを返す — SYN01 の1件に写す (ADR-0016)
|
|
94
|
+
if (cmd === "check" && rest.includes("--json") && e instanceof SourceError) {
|
|
95
|
+
const d: Diagnostic = {
|
|
96
|
+
code: "SYN01",
|
|
97
|
+
severity: "error",
|
|
98
|
+
message: e.raw,
|
|
99
|
+
...(e.line ? { line: e.line } : {}),
|
|
100
|
+
...(e.file !== undefined ? { file: e.file } : {}),
|
|
101
|
+
};
|
|
102
|
+
console.log(JSON.stringify([d], null, 1));
|
|
103
|
+
return 1;
|
|
104
|
+
}
|
|
105
|
+
throw e;
|
|
106
|
+
}
|
|
54
107
|
|
|
55
108
|
switch (cmd) {
|
|
56
109
|
case "check": {
|
|
110
|
+
const strict = rest.includes("--strict");
|
|
111
|
+
if (rest.includes("--json")) {
|
|
112
|
+
const diags = checkDiagnostics(model);
|
|
113
|
+
console.log(JSON.stringify(diags, null, 1));
|
|
114
|
+
const bad =
|
|
115
|
+
diags.some((d) => d.severity === "error") ||
|
|
116
|
+
(strict && diags.some((d) => d.severity === "warning"));
|
|
117
|
+
return bad ? 1 : 0;
|
|
118
|
+
}
|
|
57
119
|
const { errors, warnings } = check(model);
|
|
58
120
|
for (const w of warnings) console.log(`⚠ ${w}`);
|
|
59
121
|
for (const e of errors) console.log(`✖ ${e}`);
|
|
@@ -62,7 +124,7 @@ function main(argv: string[]): number {
|
|
|
62
124
|
`✔ 整合 — 空間 ${model.spaces.size} / 境界 ${model.boundaries.length}` +
|
|
63
125
|
(warnings.length ? ` (警告 ${warnings.length})` : ""),
|
|
64
126
|
);
|
|
65
|
-
return 0;
|
|
127
|
+
return strict && warnings.length > 0 ? 1 : 0;
|
|
66
128
|
}
|
|
67
129
|
return 1;
|
|
68
130
|
}
|
|
@@ -213,10 +275,13 @@ function main(argv: string[]): number {
|
|
|
213
275
|
const nm = r.siteZone.attrs["name"];
|
|
214
276
|
console.log(`敷地 ${r.siteZone.path}${typeof nm === "string" ? ` (${nm})` : ""}`);
|
|
215
277
|
}
|
|
278
|
+
if (r.polygon) {
|
|
279
|
+
console.log(` 敷地形状: 多角形 ${r.polygon.points.length}頂点 (polygon宣言 — 所与のジオメトリ)`);
|
|
280
|
+
}
|
|
216
281
|
if (r.declaredArea !== undefined) {
|
|
217
282
|
const ok = Math.abs(r.declaredArea - r.derivedArea) < 0.05;
|
|
218
283
|
console.log(
|
|
219
|
-
` 敷地面積: 宣言 ${r.declaredArea.toFixed(2)}㎡ / 導出 ${r.derivedArea.toFixed(2)}㎡ ${ok ? "✔ 一致" :
|
|
284
|
+
` 敷地面積: 宣言 ${r.declaredArea.toFixed(2)}㎡ / 導出 ${r.derivedArea.toFixed(2)}㎡ ${ok ? "✔ 一致" : `⚠ 不一致 (${r.polygon ? "測量値と多角形の食い違い" : "タイルの隙間か重なり"})`}`,
|
|
220
285
|
);
|
|
221
286
|
} else {
|
|
222
287
|
console.log(` 敷地面積 (導出): ${r.derivedArea.toFixed(2)}㎡`);
|