@kensnzk/koyu 0.15.0 → 0.17.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 +14 -10
- package/README.md +16 -13
- package/dist/cli.js +162 -84
- package/dist/cli.js.map +1 -1
- package/dist/core/derive.d.ts +264 -0
- package/dist/core/derive.d.ts.map +1 -0
- package/dist/core/derive.js +576 -0
- package/dist/core/derive.js.map +1 -0
- package/dist/{check.d.ts → core/diagnose.d.ts} +15 -15
- package/dist/core/diagnose.d.ts.map +1 -0
- package/dist/{check.js → core/diagnose.js} +269 -223
- package/dist/core/diagnose.js.map +1 -0
- package/dist/{diff.d.ts → core/diff.d.ts} +3 -2
- package/dist/core/diff.d.ts.map +1 -0
- package/dist/{diff.js → core/diff.js} +89 -43
- package/dist/core/diff.js.map +1 -0
- package/dist/{fabric.d.ts → core/fabric.d.ts} +5 -3
- package/dist/core/fabric.d.ts.map +1 -0
- package/dist/{fabric.js → core/fabric.js} +12 -11
- package/dist/core/fabric.js.map +1 -0
- package/dist/{graph.d.ts → core/graph.d.ts} +2 -4
- package/dist/core/graph.d.ts.map +1 -0
- package/dist/{graph.js → core/graph.js} +53 -54
- package/dist/core/graph.js.map +1 -0
- package/dist/core/light.d.ts +24 -0
- package/dist/core/light.d.ts.map +1 -0
- package/dist/{light.js → core/light.js} +17 -12
- package/dist/core/light.js.map +1 -0
- package/dist/{model.d.ts → core/model.d.ts} +178 -18
- package/dist/core/model.d.ts.map +1 -0
- package/dist/{model.js → core/model.js} +307 -68
- package/dist/core/model.js.map +1 -0
- package/dist/core/parse.d.ts.map +1 -0
- package/dist/{parse.js → core/parse.js} +546 -133
- package/dist/core/parse.js.map +1 -0
- package/dist/{poly.d.ts → core/poly.d.ts} +3 -6
- package/dist/core/poly.d.ts.map +1 -0
- package/dist/{poly.js → core/poly.js} +8 -13
- package/dist/core/poly.js.map +1 -0
- package/dist/core/site.d.ts.map +1 -0
- package/dist/{site.js → core/site.js} +2 -2
- package/dist/core/site.js.map +1 -0
- package/dist/core/tolerance.d.ts +26 -0
- package/dist/core/tolerance.d.ts.map +1 -0
- package/dist/core/tolerance.js +48 -0
- package/dist/core/tolerance.js.map +1 -0
- package/dist/{vertical.d.ts → core/vertical.d.ts} +48 -12
- package/dist/core/vertical.d.ts.map +1 -0
- package/dist/{vertical.js → core/vertical.js} +53 -105
- package/dist/core/vertical.js.map +1 -0
- package/dist/core/vocabulary.d.ts +40 -0
- package/dist/core/vocabulary.d.ts.map +1 -0
- package/dist/core/vocabulary.js +176 -0
- package/dist/core/vocabulary.js.map +1 -0
- package/dist/{axo.d.ts → draw/axo.d.ts} +1 -1
- package/dist/draw/axo.d.ts.map +1 -0
- package/dist/{axo.js → draw/axo.js} +53 -81
- package/dist/draw/axo.js.map +1 -0
- package/dist/draw/index.d.ts +3 -0
- package/dist/draw/index.d.ts.map +1 -0
- package/dist/draw/index.js +11 -0
- package/dist/draw/index.js.map +1 -0
- package/dist/draw/plan.d.ts +10 -0
- package/dist/draw/plan.d.ts.map +1 -0
- package/dist/draw/plan.js +284 -0
- package/dist/draw/plan.js.map +1 -0
- package/dist/index.d.ts +16 -11
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +55 -12
- package/dist/index.js.map +1 -1
- package/dist/mcp.js +112 -50
- package/dist/mcp.js.map +1 -1
- package/dist/parse-file.d.ts +1 -1
- package/dist/parse-file.d.ts.map +1 -1
- package/dist/parse-file.js +19 -4
- package/dist/parse-file.js.map +1 -1
- package/dist/validate/access.d.ts +6 -0
- package/dist/validate/access.d.ts.map +1 -0
- package/dist/validate/access.js +248 -0
- package/dist/validate/access.js.map +1 -0
- package/dist/validate/envelope.d.ts +4 -0
- package/dist/validate/envelope.d.ts.map +1 -0
- package/dist/validate/envelope.js +55 -0
- package/dist/validate/envelope.js.map +1 -0
- package/dist/validate/index.d.ts +60 -0
- package/dist/validate/index.d.ts.map +1 -0
- package/dist/validate/index.js +77 -0
- package/dist/validate/index.js.map +1 -0
- package/dist/validate/light.d.ts +6 -0
- package/dist/validate/light.d.ts.map +1 -0
- package/dist/validate/light.js +28 -0
- package/dist/validate/light.js.map +1 -0
- package/dist/validate/runs.d.ts +16 -0
- package/dist/validate/runs.d.ts.map +1 -0
- package/dist/validate/runs.js +60 -0
- package/dist/validate/runs.js.map +1 -0
- package/dist/validate/site.d.ts +6 -0
- package/dist/validate/site.d.ts.map +1 -0
- package/dist/validate/site.js +63 -0
- package/dist/validate/site.js.map +1 -0
- package/editors/vscode/.vscodeignore +2 -0
- package/editors/vscode/README.md +28 -0
- package/editors/vscode/extension.js +150 -0
- package/editors/vscode/language-configuration.json +19 -0
- package/editors/vscode/package.json +57 -0
- package/editors/vscode/syntaxes/koyu.tmLanguage.json +226 -0
- package/examples/basement/main.muro +3 -3
- package/examples/complex/main.muro +1 -1
- package/examples/complex/podium.muro +1 -1
- package/examples/complex/site.muro +6 -6
- package/examples/house/L2.muro +1 -1
- package/examples/house/main.muro +2 -2
- package/examples/house/site.muro +4 -4
- package/examples/house.muro +7 -7
- package/examples/mansion.muro +3 -3
- package/examples/office.muro +4 -4
- package/examples/steps/01-one-room.muro +1 -1
- package/examples/steps/02-two-rooms.muro +1 -1
- package/examples/steps/03-door.muro +1 -1
- package/examples/steps/04-exterior.muro +2 -2
- package/examples/steps/05-two-storeys.muro +2 -2
- package/examples/steps/06-finished.muro +3 -3
- package/examples/tower/L2.muro +1 -1
- package/examples/tower/main.muro +1 -1
- package/examples/tower/site.muro +4 -4
- package/examples/twin/main.muro +2 -2
- package/examples/twin/podium.muro +4 -4
- package/examples/twin/site.muro +8 -8
- package/examples/two-rooms.canonical.json +6 -4
- package/examples/two-rooms.muro +3 -3
- package/package.json +18 -3
- package/src/cli.ts +173 -83
- package/src/core/derive.ts +869 -0
- package/src/{check.ts → core/diagnose.ts} +313 -235
- package/src/{diff.ts → core/diff.ts} +91 -43
- package/src/{fabric.ts → core/fabric.ts} +22 -12
- package/src/{graph.ts → core/graph.ts} +64 -63
- package/src/core/light.ts +69 -0
- package/src/{model.ts → core/model.ts} +361 -74
- package/src/{parse.ts → core/parse.ts} +618 -135
- package/src/{poly.ts → core/poly.ts} +8 -16
- package/src/{site.ts → core/site.ts} +2 -2
- package/src/core/tolerance.ts +55 -0
- package/src/{vertical.ts → core/vertical.ts} +73 -116
- package/src/core/vocabulary.ts +210 -0
- package/src/{axo.ts → draw/axo.ts} +51 -94
- package/src/draw/index.ts +11 -0
- package/src/draw/plan.ts +344 -0
- package/src/index.ts +201 -34
- package/src/mcp.ts +119 -50
- package/src/parse-file.ts +19 -5
- package/src/validate/access.ts +291 -0
- package/src/validate/envelope.ts +59 -0
- package/src/validate/index.ts +107 -0
- package/src/validate/light.ts +43 -0
- package/src/validate/runs.ts +87 -0
- package/src/validate/site.ts +84 -0
- package/dist/axo.d.ts.map +0 -1
- package/dist/axo.js.map +0 -1
- package/dist/check.d.ts.map +0 -1
- package/dist/check.js.map +0 -1
- package/dist/diff.d.ts.map +0 -1
- package/dist/diff.js.map +0 -1
- package/dist/fabric.d.ts.map +0 -1
- package/dist/fabric.js.map +0 -1
- package/dist/graph.d.ts.map +0 -1
- package/dist/graph.js.map +0 -1
- package/dist/light.d.ts +0 -15
- package/dist/light.d.ts.map +0 -1
- package/dist/light.js.map +0 -1
- package/dist/model.d.ts.map +0 -1
- package/dist/model.js.map +0 -1
- package/dist/parse.d.ts.map +0 -1
- package/dist/parse.js.map +0 -1
- package/dist/plan.d.ts +0 -10
- package/dist/plan.d.ts.map +0 -1
- package/dist/plan.js +0 -354
- package/dist/plan.js.map +0 -1
- package/dist/poly.d.ts.map +0 -1
- package/dist/poly.js.map +0 -1
- package/dist/site.d.ts.map +0 -1
- package/dist/site.js.map +0 -1
- package/dist/vertical.d.ts.map +0 -1
- package/dist/vertical.js.map +0 -1
- package/src/light.ts +0 -63
- package/src/plan.ts +0 -472
- /package/dist/{parse.d.ts → core/parse.d.ts} +0 -0
- /package/dist/{site.d.ts → core/site.d.ts} +0 -0
package/src/cli.ts
CHANGED
|
@@ -8,14 +8,18 @@
|
|
|
8
8
|
// npm run koyu -- stats examples/office.muro
|
|
9
9
|
// npm run koyu -- levels examples/office.muro # テキストの矩計 (高さの積み上がり)
|
|
10
10
|
// npm run koyu -- json examples/office.muro
|
|
11
|
+
//
|
|
12
|
+
// **人向けの出力は英語である。**機械が読む面 (診断・Finding・MCP) と同じ言葉に揃えてあり、
|
|
13
|
+
// locale 引数は持たない — 同じ文言の台帳を二つ持たないためである。
|
|
11
14
|
|
|
12
15
|
import { mkdirSync, writeFileSync } from "node:fs";
|
|
13
16
|
import { dirname } from "node:path";
|
|
14
|
-
import { check, checkDiagnostics, type Diagnostic } from "./
|
|
15
|
-
import { renderDiff, semanticDiff } from "./diff.js";
|
|
16
|
-
import { doorsBetween, neighbors } from "./graph.js";
|
|
17
|
-
import {
|
|
18
|
-
import {
|
|
17
|
+
import { check, checkDiagnostics, type Diagnostic } from "./core/diagnose.js";
|
|
18
|
+
import { renderDiff, semanticDiff } from "./core/diff.js";
|
|
19
|
+
import { doorsBetween, neighbors } from "./core/graph.js";
|
|
20
|
+
import { daylightInputs } from "./core/light.js";
|
|
21
|
+
import { validate, type Finding } from "./validate/index.js";
|
|
22
|
+
import { siteReport } from "./core/site.js";
|
|
19
23
|
import {
|
|
20
24
|
areaM2,
|
|
21
25
|
displayName,
|
|
@@ -27,16 +31,24 @@ import {
|
|
|
27
31
|
toCanonical,
|
|
28
32
|
zoneAreaM2,
|
|
29
33
|
type Model,
|
|
30
|
-
|
|
34
|
+
srcRef,
|
|
35
|
+
isOutside,
|
|
36
|
+
isVoid
|
|
37
|
+
} from "./core/model.js";
|
|
31
38
|
import { parseFile } from "./parse-file.js";
|
|
32
|
-
import { svgPlan } from "./plan.js";
|
|
33
|
-
import { svgAxo } from "./axo.js";
|
|
34
|
-
import { slopeText, verticalRuns } from "./vertical.js";
|
|
39
|
+
import { svgPlan } from "./draw/plan.js";
|
|
40
|
+
import { svgAxo } from "./draw/axo.js";
|
|
41
|
+
import { slopeText, verticalRuns } from "./core/vertical.js";
|
|
35
42
|
|
|
36
43
|
function load(file: string): Model {
|
|
37
44
|
return parseFile(file); // import による合成もここで働く
|
|
38
45
|
}
|
|
39
46
|
|
|
47
|
+
/** 数と名詞 — 英語は数が先に立ち、1のときだけ単数形になる */
|
|
48
|
+
function qty(count: number, one: string, many: string): string {
|
|
49
|
+
return `${count} ${count === 1 ? one : many}`;
|
|
50
|
+
}
|
|
51
|
+
|
|
40
52
|
/** `-l L1..L5` / `-l L1,L3` をレベル名の列へ */
|
|
41
53
|
/**
|
|
42
54
|
* `-l` の解決。**解決できない指定は空配列に落とさない** — 空配列は「一枚も描かない」を
|
|
@@ -50,19 +62,19 @@ function expandLevelArg(model: Model, arg: string): string[] {
|
|
|
50
62
|
if (!m) {
|
|
51
63
|
const names = arg.split(",");
|
|
52
64
|
const unknown = names.filter((n) => !all.includes(n));
|
|
53
|
-
if (unknown.length > 0) die(
|
|
65
|
+
if (unknown.length > 0) die(`Undeclared level: ${unknown.join(",")} (declared: ${all.join(" ")})`);
|
|
54
66
|
return names;
|
|
55
67
|
}
|
|
56
68
|
const za = model.levels[m[1]!]?.z;
|
|
57
69
|
const zb = model.levels[m[2]!]?.z;
|
|
58
70
|
if (za === undefined || zb === undefined) {
|
|
59
71
|
const bad = [m[1]!, m[2]!].filter((n) => model.levels[n] === undefined);
|
|
60
|
-
die(
|
|
72
|
+
die(`Undeclared level: ${bad.join(",")} (declared: ${all.join(" ")})`);
|
|
61
73
|
}
|
|
62
74
|
const out = levelsSorted(model)
|
|
63
75
|
.filter((l) => l.z >= Math.min(za!, zb!) && l.z <= Math.max(za!, zb!))
|
|
64
76
|
.map((l) => l.name);
|
|
65
|
-
if (out.length === 0) die(
|
|
77
|
+
if (out.length === 0) die(`No level falls in the range ${arg}`);
|
|
66
78
|
return out;
|
|
67
79
|
}
|
|
68
80
|
|
|
@@ -80,13 +92,42 @@ function opt(rest: string[], ...names: string[]): string | undefined {
|
|
|
80
92
|
return undefined;
|
|
81
93
|
}
|
|
82
94
|
|
|
95
|
+
/**
|
|
96
|
+
* 数を取る引数。**読めない値を黙って NaN のまま通さない。**
|
|
97
|
+
* `-s abc` は `width="NaN"` のSVGを終了コード0で書き出していた — 生成に成功したと言いながら
|
|
98
|
+
* 開けない図を残すのは、呼び方の問題を作品の問題に化けさせる。呼び方の問題として返す (ADR-0028)
|
|
99
|
+
*/
|
|
100
|
+
function numOpt(rest: string[], ...names: string[]): number | undefined {
|
|
101
|
+
const raw = opt(rest, ...names);
|
|
102
|
+
if (raw === undefined) return undefined;
|
|
103
|
+
const v = Number(raw);
|
|
104
|
+
if (!Number.isFinite(v) || v <= 0) die(`${names[0]} takes a positive number: ${raw}`);
|
|
105
|
+
return v;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/** 語彙の決まった引数。台帳に無い値は呼び方の問題である */
|
|
109
|
+
function enumOpt<T extends string>(
|
|
110
|
+
rest: string[],
|
|
111
|
+
allowed: readonly T[],
|
|
112
|
+
...names: string[]
|
|
113
|
+
): T | undefined {
|
|
114
|
+
const raw = opt(rest, ...names);
|
|
115
|
+
if (raw === undefined) return undefined;
|
|
116
|
+
if (!(allowed as readonly string[]).includes(raw)) {
|
|
117
|
+
die(`${names[0]} is one of ${allowed.join(" / ")}: ${raw}`);
|
|
118
|
+
}
|
|
119
|
+
return raw as T;
|
|
120
|
+
}
|
|
121
|
+
|
|
83
122
|
function main(argv: string[]): number {
|
|
84
123
|
const [cmd, file, ...rest] = argv;
|
|
85
124
|
if (!cmd || !file) {
|
|
86
125
|
console.log(
|
|
87
|
-
"
|
|
88
|
-
" check:
|
|
89
|
-
"
|
|
126
|
+
"Usage: koyu <check|validate|layers|diff|plan|axo|doors|graph|stats|levels|runs|light|site|json> <file.muro> [args...]\n" +
|
|
127
|
+
" check: --json (emit Diagnostic[] as JSON) / --strict (exit 1 if there are warnings) — structural consistency only\n" +
|
|
128
|
+
" validate: --json (emit Finding[] as JSON) — architectural judgement (not what check guarantees)\n" +
|
|
129
|
+
" layers: the layers that took part in composition, weakest first. --attrs for the provenance of each attribute\n" +
|
|
130
|
+
" diff: koyu diff <a.muro> <b.muro> [--json] — the difference in the language of composition (0=no difference / 1=differences / 2=the input is broken)",
|
|
90
131
|
);
|
|
91
132
|
return 2;
|
|
92
133
|
}
|
|
@@ -96,7 +137,7 @@ function main(argv: string[]): number {
|
|
|
96
137
|
// 終了コードは 0=差分なし / 1=差分あり / 2=入力が壊れている — checkの0/1と紛れない
|
|
97
138
|
const fileB = rest[0];
|
|
98
139
|
if (!fileB) {
|
|
99
|
-
console.log("
|
|
140
|
+
console.log("Usage: koyu diff <a.muro> <b.muro> [--json]");
|
|
100
141
|
return 2;
|
|
101
142
|
}
|
|
102
143
|
let ma: Model;
|
|
@@ -116,7 +157,7 @@ function main(argv: string[]): number {
|
|
|
116
157
|
if (rest.includes("--json")) {
|
|
117
158
|
console.log(JSON.stringify(d, null, 1));
|
|
118
159
|
} else if (lines.length === 0) {
|
|
119
|
-
console.log("
|
|
160
|
+
console.log("No differences");
|
|
120
161
|
} else {
|
|
121
162
|
for (const l of lines) console.log(l);
|
|
122
163
|
}
|
|
@@ -158,13 +199,56 @@ function main(argv: string[]): number {
|
|
|
158
199
|
for (const e of errors) console.log(`✖ ${e}`);
|
|
159
200
|
if (errors.length === 0) {
|
|
160
201
|
console.log(
|
|
161
|
-
`✔
|
|
162
|
-
(warnings.length ? ` (
|
|
202
|
+
`✔ Consistent — ${qty(model.spaces.size, "space", "spaces")} / ${qty(model.boundaries.length, "boundary", "boundaries")}` +
|
|
203
|
+
(warnings.length ? ` (${qty(warnings.length, "warning", "warnings")})` : ""),
|
|
163
204
|
);
|
|
205
|
+
// **緑の意味を、緑を出す場所で言う。**構造整合が成り立っただけであって、
|
|
206
|
+
// 建築として妥当かはここでは何も言っていない (docs/reference/scope.md)
|
|
207
|
+
console.log(" Structural consistency only — architectural validity is what koyu validate says, separately");
|
|
164
208
|
return strict && warnings.length > 0 ? 1 : 0;
|
|
165
209
|
}
|
|
166
210
|
return 1;
|
|
167
211
|
}
|
|
212
|
+
case "validate": {
|
|
213
|
+
// 建築的な判定 (docs/reference/scope.md)。**check の保証ではない** — 型もコードの綴りも別で、
|
|
214
|
+
// 終了コードだけが同じ流儀 (0=違反なし / 1=違反あり)
|
|
215
|
+
const findings = validate(model);
|
|
216
|
+
if (rest.includes("--json")) {
|
|
217
|
+
console.log(JSON.stringify(findings, null, 1));
|
|
218
|
+
return findings.some((f) => f.level === "violation") ? 1 : 0;
|
|
219
|
+
}
|
|
220
|
+
const label = (f: Finding) => (f.level === "violation" ? "✖" : "⚠");
|
|
221
|
+
for (const f of findings) {
|
|
222
|
+
const where = f.line !== undefined ? `${srcRef(f.line, f.file)}: ` : "";
|
|
223
|
+
console.log(`${label(f)} [${f.rule}] ${where}${f.message}`);
|
|
224
|
+
}
|
|
225
|
+
const violations = findings.filter((f) => f.level === "violation").length;
|
|
226
|
+
const cautions = findings.length - violations;
|
|
227
|
+
console.log(
|
|
228
|
+
findings.length === 0
|
|
229
|
+
? "✔ Nothing caught by validation (this is a judgement, not a guarantee about the composition)"
|
|
230
|
+
: `Validation — ${qty(violations, "violation", "violations")} / ${qty(cautions, "caution", "cautions")}`,
|
|
231
|
+
);
|
|
232
|
+
return violations > 0 ? 1 : 0;
|
|
233
|
+
}
|
|
234
|
+
case "layers": {
|
|
235
|
+
// 合成の規則1と6 (docs/reference/muro/import.md) — 強度順序を見せ、最終値の出所を言う。
|
|
236
|
+
// **暗黙の解決はどこにも無い**ことを、目で確かめられるようにするための面である
|
|
237
|
+
if (model.layers.length === 0) {
|
|
238
|
+
console.log("No layers (parsing a single file involves no composition)");
|
|
239
|
+
return 0;
|
|
240
|
+
}
|
|
241
|
+
console.log("Layers (weakest first — later layers are stronger):");
|
|
242
|
+
model.layers.forEach((l, i) => console.log(` ${i}\t${l}`));
|
|
243
|
+
if (rest.includes("--attrs")) {
|
|
244
|
+
console.log("\nAttribute provenance:");
|
|
245
|
+
const rows = [...model.attrSrc].sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
|
|
246
|
+
for (const [key, layerIdx] of rows) {
|
|
247
|
+
console.log(` ${key}\t← ${layerIdx} ${model.layers[layerIdx] ?? "?"}`);
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
return 0;
|
|
251
|
+
}
|
|
168
252
|
case "json": {
|
|
169
253
|
process.stdout.write(toCanonical(model));
|
|
170
254
|
return 0;
|
|
@@ -174,7 +258,7 @@ function main(argv: string[]): number {
|
|
|
174
258
|
// 未宣言のレベルは呼び方の問題 — 生のスタックトレースで落ちない (ADR-0028)
|
|
175
259
|
if (level !== undefined && model.levels[level] === undefined) {
|
|
176
260
|
die(
|
|
177
|
-
|
|
261
|
+
`Undeclared level: ${level} (declared: ${levelsSorted(model).map((l) => l.name).join(" ")})`,
|
|
178
262
|
);
|
|
179
263
|
}
|
|
180
264
|
const explicit = opt(rest, "-o");
|
|
@@ -183,21 +267,21 @@ function main(argv: string[]): number {
|
|
|
183
267
|
const svg = svgPlan(model, { level });
|
|
184
268
|
mkdirSync(dirname(outFile), { recursive: true });
|
|
185
269
|
writeFileSync(outFile, svg);
|
|
186
|
-
console.log(
|
|
270
|
+
console.log(`Generated the plan: ${outFile}`);
|
|
187
271
|
return 0;
|
|
188
272
|
}
|
|
189
273
|
case "doors": {
|
|
190
274
|
const [from, to] = rest;
|
|
191
275
|
if (!from || !to) {
|
|
192
|
-
console.log("
|
|
276
|
+
console.log("Usage: koyu doors <file> /pathA /pathB");
|
|
193
277
|
return 2;
|
|
194
278
|
}
|
|
195
279
|
const route = doorsBetween(model, from, to);
|
|
196
280
|
if (!route) {
|
|
197
|
-
console.log(
|
|
281
|
+
console.log(`Cannot reach ${to} from ${from}`);
|
|
198
282
|
return 1;
|
|
199
283
|
}
|
|
200
|
-
console.log(`${route.doors}
|
|
284
|
+
console.log(`${qty(route.doors, "door", "doors")} — ${route.path.join(" → ")}`);
|
|
201
285
|
return 0;
|
|
202
286
|
}
|
|
203
287
|
case "graph": {
|
|
@@ -207,18 +291,18 @@ function main(argv: string[]): number {
|
|
|
207
291
|
for (const n of ns) {
|
|
208
292
|
const mark =
|
|
209
293
|
n.boundary.kind === "open"
|
|
210
|
-
? "〰
|
|
294
|
+
? "〰 open"
|
|
211
295
|
: n.boundary.kind === "wall" && n.boundary.air && !n.passable
|
|
212
|
-
? "|
|
|
296
|
+
? "| railing etc. (open to the air, not passable)"
|
|
213
297
|
: n.boundary.kind === "stair"
|
|
214
|
-
? "↕
|
|
298
|
+
? "↕ stair"
|
|
215
299
|
: n.boundary.kind === "shaft"
|
|
216
|
-
? "↕
|
|
300
|
+
? "↕ shaft (not passable)"
|
|
217
301
|
: n.boundary.kind === "void"
|
|
218
|
-
? "↕
|
|
302
|
+
? "↕ void"
|
|
219
303
|
: n.passable
|
|
220
|
-
? `—
|
|
221
|
-
: "|
|
|
304
|
+
? `— ${qty(n.doors, "door", "doors")}`
|
|
305
|
+
: "| wall";
|
|
222
306
|
const attrs = Object.entries(n.boundary.attrs)
|
|
223
307
|
.map(([k, v]) => `${k}:${v}`)
|
|
224
308
|
.join(" ");
|
|
@@ -241,130 +325,136 @@ function main(argv: string[]): number {
|
|
|
241
325
|
console.log(`${l.name}`);
|
|
242
326
|
let sub = 0;
|
|
243
327
|
for (const s of onLevel) {
|
|
244
|
-
if (s
|
|
245
|
-
console.log(` ${s.path}\t${displayName(s)}\
|
|
328
|
+
if (isVoid(s)) {
|
|
329
|
+
console.log(` ${s.path}\t${displayName(s)}\tvoid (not counted as floor area)`);
|
|
246
330
|
continue;
|
|
247
331
|
}
|
|
248
332
|
const a = areaM2(s)!;
|
|
249
|
-
if (s
|
|
333
|
+
if (isOutside(s)) {
|
|
250
334
|
outdoorTotal += a;
|
|
251
|
-
console.log(` ${s.path}\t${displayName(s)}\t${s.type}\t${a.toFixed(2)}
|
|
335
|
+
console.log(` ${s.path}\t${displayName(s)}\t${s.type ?? "(untyped)"}\t${a.toFixed(2)} m2 (outdoor, not counted)`);
|
|
252
336
|
continue;
|
|
253
337
|
}
|
|
254
338
|
if (isSemiOutdoor(model, s)) {
|
|
255
339
|
semiTotal += a;
|
|
256
340
|
console.log(
|
|
257
|
-
` ${s.path}\t${displayName(s)}\t${s.type}\t${a.toFixed(2)}
|
|
341
|
+
` ${s.path}\t${displayName(s)}\t${s.type ?? "(untyped)"}\t${a.toFixed(2)} m2 (semi-outdoor, reported separately)`,
|
|
258
342
|
);
|
|
259
343
|
continue;
|
|
260
344
|
}
|
|
261
345
|
sub += a;
|
|
262
346
|
total += a;
|
|
263
|
-
|
|
347
|
+
// 型は任意なので、書かれなかった行にも小計の座が要る。**既定の語は捏造しない** —
|
|
348
|
+
// "(untyped)" は集計の見出しであって、その空間の型ではない (mcp の "(unspecified)" と同じ構え)
|
|
349
|
+
const label = s.type ?? "(untyped)";
|
|
350
|
+
byType.set(label, (byType.get(label) ?? 0) + a);
|
|
264
351
|
const use = effectiveUse(model, s);
|
|
265
352
|
if (use) byUse.set(use, (byUse.get(use) ?? 0) + a);
|
|
266
|
-
console.log(` ${s.path}\t${displayName(s)}\t${
|
|
353
|
+
console.log(` ${s.path}\t${displayName(s)}\t${label}\t${a.toFixed(2)} m2`);
|
|
267
354
|
}
|
|
268
|
-
console.log(`
|
|
355
|
+
console.log(` Subtotal ${sub.toFixed(2)} m2`);
|
|
269
356
|
}
|
|
270
|
-
console.log(
|
|
357
|
+
console.log(`Total ${total.toFixed(2)} m2 (indoor floor area)`);
|
|
271
358
|
if (outdoorTotal > 0) {
|
|
272
|
-
console.log(
|
|
359
|
+
console.log(`Outdoor ${outdoorTotal.toFixed(2)} m2 (plazas, open ground and the like — not counted as floor area)`);
|
|
273
360
|
}
|
|
274
361
|
if (semiTotal > 0) {
|
|
275
|
-
console.log(
|
|
362
|
+
console.log(`Semi-outdoor ${semiTotal.toFixed(2)} m2 (balconies, external stairs and the like — whether they count is a matter of regulatory detail, so it is reported separately)`);
|
|
276
363
|
}
|
|
277
364
|
const zonesToShow = [...model.zones.values()].filter((z) => z.attrs["site"] !== 1);
|
|
278
365
|
if (zonesToShow.length > 0) {
|
|
279
|
-
console.log("
|
|
366
|
+
console.log("By zone (counted aggregation):");
|
|
280
367
|
for (const z of zonesToShow.sort((a, b) => (a.path < b.path ? -1 : 1))) {
|
|
281
368
|
const nm = z.attrs["name"];
|
|
282
369
|
console.log(
|
|
283
|
-
` ${z.path}\t${typeof nm === "string" ? nm : ""}\t${zoneAreaM2(model, z.path).toFixed(2)}
|
|
370
|
+
` ${z.path}\t${typeof nm === "string" ? nm : ""}\t${zoneAreaM2(model, z.path).toFixed(2)} m2`,
|
|
284
371
|
);
|
|
285
372
|
}
|
|
286
373
|
}
|
|
287
|
-
for (const [t, a] of byType) console.log(` ${t}: ${a.toFixed(2)}
|
|
374
|
+
for (const [t, a] of byType) console.log(` ${t}: ${a.toFixed(2)} m2`);
|
|
288
375
|
if (byUse.size > 0) {
|
|
289
376
|
const parts = [...byUse.entries()].map(
|
|
290
|
-
([u, a]) => `${u} ${a.toFixed(2)}
|
|
377
|
+
([u, a]) => `${u} ${a.toFixed(2)} m2 (${((a / total) * 100).toFixed(1)}%)`,
|
|
291
378
|
);
|
|
292
|
-
console.log(`use
|
|
379
|
+
console.log(`By use: ${parts.join(" / ")}`);
|
|
293
380
|
}
|
|
294
381
|
return 0;
|
|
295
382
|
}
|
|
296
383
|
case "light": {
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
384
|
+
// 採光は**判定**である — core が返すのは床面積と有効窓面積という数だけで、
|
|
385
|
+
// 1/7 の合否は検証の面 (validate) が言う (docs/reference/scope.md)
|
|
386
|
+
const inputs = daylightInputs(model);
|
|
387
|
+
if (inputs.length === 0) {
|
|
388
|
+
console.log("Nothing is in daylight scope (write daylight:1 on the rooms to be judged)");
|
|
300
389
|
return 0;
|
|
301
390
|
}
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
391
|
+
const failing = new Set(
|
|
392
|
+
validate(model).filter((f) => f.rule === "daylight.ratio").flatMap((f) => f.path ?? []),
|
|
393
|
+
);
|
|
394
|
+
for (const d of inputs) {
|
|
395
|
+
const ok = !failing.has(d.space.path);
|
|
396
|
+
const ratio = d.window > 0 ? `1/${(d.floor / d.window).toFixed(1)}` : "no window";
|
|
306
397
|
console.log(
|
|
307
|
-
`${
|
|
308
|
-
(
|
|
398
|
+
`${ok ? "✔" : "✖"} ${d.space.path}\t${displayName(d.space)}\twindow ${d.window.toFixed(2)} m2 / floor ${d.floor.toFixed(2)} m2 = ${ratio} (needs 1/7 ≈ ${(d.floor / 7).toFixed(2)} m2)` +
|
|
399
|
+
(d.missingH ? " ⚠ windows without h: are not counted" : ""),
|
|
309
400
|
);
|
|
310
401
|
}
|
|
311
402
|
console.log(
|
|
312
|
-
|
|
313
|
-
? `✔
|
|
314
|
-
: `✖ ${
|
|
403
|
+
failing.size === 0
|
|
404
|
+
? `✔ Every room meets 1/7 — ${qty(inputs.length, "room", "rooms")} in scope (a rough judgement with no correction factor — this is validation, not what check guarantees)`
|
|
405
|
+
: `✖ Short of 1/7: ${failing.size} of ${qty(inputs.length, "room", "rooms")} (this is a validation judgement)`,
|
|
315
406
|
);
|
|
316
|
-
return
|
|
407
|
+
return failing.size === 0 ? 0 : 1;
|
|
317
408
|
}
|
|
318
409
|
case "site": {
|
|
319
410
|
// 敷地の問い: 敷地面積・接道・建蔽率・容積率 (基本計画のボリューム検討の数字)
|
|
320
411
|
const r = siteReport(model);
|
|
321
412
|
if (!r.siteZone && r.roads.length === 0) {
|
|
322
|
-
console.log("
|
|
413
|
+
console.log("There is no site (write site:1 on a zone and road:<width> on the road)");
|
|
323
414
|
return 1;
|
|
324
415
|
}
|
|
325
416
|
const site = r.declaredArea ?? r.derivedArea;
|
|
326
417
|
if (r.siteZone) {
|
|
327
418
|
const nm = r.siteZone.attrs["name"];
|
|
328
|
-
console.log(
|
|
419
|
+
console.log(`Site ${r.siteZone.path}${typeof nm === "string" ? ` (${nm})` : ""}`);
|
|
329
420
|
}
|
|
330
421
|
if (r.polygon) {
|
|
331
|
-
console.log(`
|
|
422
|
+
console.log(` Site shape: polygon with ${r.polygon.points.length} vertices (a polygon declaration — given geometry)`);
|
|
332
423
|
}
|
|
333
424
|
if (r.declaredArea !== undefined) {
|
|
334
|
-
const ok = Math.abs(r.declaredArea - r.derivedArea) < 0.05;
|
|
335
425
|
console.log(
|
|
336
|
-
`
|
|
426
|
+
` Site area: declared ${r.declaredArea.toFixed(2)} m2 / derived ${r.derivedArea.toFixed(2)} m2`,
|
|
337
427
|
);
|
|
338
428
|
} else {
|
|
339
|
-
console.log(`
|
|
429
|
+
console.log(` Site area (derived): ${r.derivedArea.toFixed(2)} m2`);
|
|
340
430
|
}
|
|
341
431
|
for (const road of r.roads) {
|
|
342
432
|
const nm = road.road.attrs["name"];
|
|
343
433
|
console.log(
|
|
344
|
-
`
|
|
434
|
+
` Road: ${road.road.path}${typeof nm === "string" ? ` (${nm})` : ""} width ${road.width}mm / frontage ${road.frontage}mm`,
|
|
345
435
|
);
|
|
346
436
|
}
|
|
347
|
-
console.log(`
|
|
348
|
-
console.log(`
|
|
437
|
+
console.log(` Building footprint (horizontal projection, rough): ${r.footprint.toFixed(2)} m2 → building coverage ratio ${((r.footprint / site) * 100).toFixed(1)}%`);
|
|
438
|
+
console.log(` Total floor area: ${r.totalFloor.toFixed(2)} m2 → floor area ratio ${((r.totalFloor / site) * 100).toFixed(1)}%`);
|
|
349
439
|
return 0;
|
|
350
440
|
}
|
|
351
441
|
case "axo": {
|
|
352
442
|
// 軸測図 — 立体をそのまま投影する。平面と同じく生成物のSVGなので、
|
|
353
443
|
// 実行環境もWebGLも要らず、生成して見るという同じ手で立体を確かめられる
|
|
354
444
|
const outPath = opt(rest, "-o", "--out") ?? "out/axo.svg";
|
|
355
|
-
const dirOpt =
|
|
445
|
+
const dirOpt = enumOpt(rest, ["NE", "NW", "SE", "SW"] as const, "-d", "--dir");
|
|
356
446
|
const lv = opt(rest, "-l", "--levels");
|
|
357
|
-
const sc =
|
|
447
|
+
const sc = numOpt(rest, "-s", "--scale");
|
|
358
448
|
const svg = svgAxo(model, {
|
|
359
449
|
...(dirOpt ? { dir: dirOpt } : {}),
|
|
360
450
|
...(lv ? { levels: expandLevelArg(model, lv) } : {}),
|
|
361
|
-
...(sc ? { scale:
|
|
451
|
+
...(sc !== undefined ? { scale: sc } : {}),
|
|
362
452
|
...(rest.includes("--ceilings") ? { ceilings: true } : {}),
|
|
363
453
|
...(rest.includes("--no-walls") ? { walls: false } : {}),
|
|
364
454
|
});
|
|
365
455
|
mkdirSync(dirname(outPath), { recursive: true });
|
|
366
456
|
writeFileSync(outPath, svg);
|
|
367
|
-
console.log(
|
|
457
|
+
console.log(`Generated the axonometric: ${outPath}`);
|
|
368
458
|
return 0;
|
|
369
459
|
}
|
|
370
460
|
|
|
@@ -372,7 +462,7 @@ function main(argv: string[]): number {
|
|
|
372
462
|
// 縦動線 (ADR-0021): 段数も踏面も勾配も原本には書かれていない。全て導出値である
|
|
373
463
|
const runs = verticalRuns(model);
|
|
374
464
|
if (runs.length === 0) {
|
|
375
|
-
console.log("
|
|
465
|
+
console.log("There is no vertical circulation (write stair:N / ramp:N / escalator:N / lift:1 on a space)");
|
|
376
466
|
return 0;
|
|
377
467
|
}
|
|
378
468
|
for (const r of runs) {
|
|
@@ -385,10 +475,10 @@ function main(argv: string[]): number {
|
|
|
385
475
|
}
|
|
386
476
|
const shape =
|
|
387
477
|
r.device === "stair"
|
|
388
|
-
? `${r.risers}
|
|
389
|
-
:
|
|
478
|
+
? `${qty(r.risers, "riser", "risers")} of ${Math.round(r.riser)}mm, tread ${Math.round(r.tread)}mm`
|
|
479
|
+
: `slope ${slopeText(r.slope)}`;
|
|
390
480
|
console.log(
|
|
391
|
-
`${head}\
|
|
481
|
+
`${head}\trise ${r.rise}mm\t${r.form === "return" ? "return" : "straight"}\t${shape}\tgoing ${Math.round(r.going)}mm\t${r.path}`,
|
|
392
482
|
);
|
|
393
483
|
}
|
|
394
484
|
return 0;
|
|
@@ -398,7 +488,7 @@ function main(argv: string[]): number {
|
|
|
398
488
|
// テキストの矩計: レベルの積み上がりと高さの検算
|
|
399
489
|
const levels = levelsSorted(model);
|
|
400
490
|
if (levels.length === 0) {
|
|
401
|
-
console.log("
|
|
491
|
+
console.log("No level is defined");
|
|
402
492
|
return 1;
|
|
403
493
|
}
|
|
404
494
|
for (let i = levels.length - 1; i >= 0; i--) {
|
|
@@ -413,21 +503,21 @@ function main(argv: string[]): number {
|
|
|
413
503
|
const pitch = upper.z - l.z;
|
|
414
504
|
const detail =
|
|
415
505
|
l.h !== undefined && upper.slab !== undefined
|
|
416
|
-
? ` =
|
|
417
|
-
(pitch - l.h - upper.slab > 0 ? ` +
|
|
506
|
+
? ` = ceiling ${l.h} + slab ${upper.slab}` +
|
|
507
|
+
(pitch - l.h - upper.slab > 0 ? ` + ${pitch - l.h - upper.slab} left over` : "")
|
|
418
508
|
: "";
|
|
419
|
-
console.log(` ↑
|
|
509
|
+
console.log(` ↑ storey height ${pitch}${detail}`);
|
|
420
510
|
}
|
|
421
511
|
}
|
|
422
512
|
const spaces = [...model.spaces.values()].filter((s) => s.rects.length > 0 && s.level);
|
|
423
513
|
const overrides = spaces.filter((s) => typeof s.attrs["h"] === "number");
|
|
424
514
|
for (const s of overrides) {
|
|
425
|
-
console.log(
|
|
515
|
+
console.log(`Per-space ceiling height: ${s.path} h:${heff(model, s)}`);
|
|
426
516
|
}
|
|
427
517
|
return 0;
|
|
428
518
|
}
|
|
429
519
|
default:
|
|
430
|
-
console.log(
|
|
520
|
+
console.log(`Unknown command: ${cmd}`);
|
|
431
521
|
return 2;
|
|
432
522
|
}
|
|
433
523
|
}
|