@kensnzk/koyu 0.16.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 +12 -8
- package/README.md +13 -10
- package/dist/cli.js +14 -11
- package/dist/cli.js.map +1 -1
- package/dist/core/derive.d.ts +13 -8
- package/dist/core/derive.d.ts.map +1 -1
- package/dist/core/derive.js +19 -13
- package/dist/core/derive.js.map +1 -1
- package/dist/core/diagnose.d.ts +4 -3
- package/dist/core/diagnose.d.ts.map +1 -1
- package/dist/core/diagnose.js +46 -11
- package/dist/core/diagnose.js.map +1 -1
- package/dist/core/diff.d.ts +3 -2
- package/dist/core/diff.d.ts.map +1 -1
- package/dist/core/diff.js +8 -5
- package/dist/core/diff.js.map +1 -1
- package/dist/core/fabric.d.ts +1 -3
- package/dist/core/fabric.d.ts.map +1 -1
- package/dist/core/fabric.js +8 -8
- package/dist/core/fabric.js.map +1 -1
- package/dist/core/graph.d.ts +2 -2
- package/dist/core/graph.d.ts.map +1 -1
- package/dist/core/graph.js +12 -5
- package/dist/core/graph.js.map +1 -1
- package/dist/core/light.d.ts.map +1 -1
- package/dist/core/light.js +2 -2
- package/dist/core/light.js.map +1 -1
- package/dist/core/model.d.ts +59 -10
- package/dist/core/model.d.ts.map +1 -1
- package/dist/core/model.js +128 -26
- package/dist/core/model.js.map +1 -1
- package/dist/core/parse.d.ts.map +1 -1
- package/dist/core/parse.js +83 -82
- package/dist/core/parse.js.map +1 -1
- package/dist/core/poly.d.ts +0 -4
- package/dist/core/poly.d.ts.map +1 -1
- package/dist/core/poly.js +1 -5
- package/dist/core/poly.js.map +1 -1
- package/dist/core/site.d.ts.map +1 -1
- package/dist/core/site.js +2 -2
- package/dist/core/site.js.map +1 -1
- package/dist/core/tolerance.d.ts +1 -1
- package/dist/core/tolerance.js +2 -2
- package/dist/core/tolerance.js.map +1 -1
- package/dist/core/vertical.d.ts +9 -2
- package/dist/core/vertical.d.ts.map +1 -1
- package/dist/core/vertical.js +8 -1
- package/dist/core/vertical.js.map +1 -1
- package/dist/core/vocabulary.d.ts.map +1 -1
- package/dist/core/vocabulary.js +17 -5
- package/dist/core/vocabulary.js.map +1 -1
- package/dist/draw/index.js +1 -1
- package/dist/draw/index.js.map +1 -1
- package/dist/draw/plan.js +5 -5
- package/dist/draw/plan.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +17 -11
- package/dist/index.js.map +1 -1
- package/dist/mcp.js +43 -12
- package/dist/mcp.js.map +1 -1
- package/dist/parse-file.d.ts.map +1 -1
- package/dist/parse-file.js +18 -3
- package/dist/parse-file.js.map +1 -1
- package/dist/validate/access.d.ts.map +1 -1
- package/dist/validate/access.js +23 -13
- package/dist/validate/access.js.map +1 -1
- package/dist/validate/envelope.d.ts.map +1 -1
- package/dist/validate/envelope.js +3 -3
- package/dist/validate/envelope.js.map +1 -1
- package/dist/validate/index.d.ts +1 -1
- package/dist/validate/index.d.ts.map +1 -1
- package/dist/validate/index.js +1 -1
- package/dist/validate/index.js.map +1 -1
- package/dist/validate/light.js +1 -1
- package/dist/validate/light.js.map +1 -1
- package/dist/validate/site.d.ts.map +1 -1
- package/dist/validate/site.js +2 -2
- package/dist/validate/site.js.map +1 -1
- package/editors/vscode/syntaxes/koyu.tmLanguage.json +2 -2
- 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 +1 -1
- package/examples/house/site.muro +4 -4
- package/examples/house.muro +6 -6
- package/examples/mansion.muro +2 -2
- package/examples/office.muro +3 -3
- package/examples/steps/04-exterior.muro +1 -1
- package/examples/steps/05-two-storeys.muro +1 -1
- package/examples/steps/06-finished.muro +2 -2
- 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 +1 -1
- package/examples/twin/podium.muro +4 -4
- package/examples/twin/site.muro +8 -8
- package/examples/two-rooms.canonical.json +4 -4
- package/examples/two-rooms.muro +2 -2
- package/package.json +5 -5
- package/src/cli.ts +15 -10
- package/src/core/derive.ts +32 -15
- package/src/core/diagnose.ts +63 -16
- package/src/core/diff.ts +10 -6
- package/src/core/fabric.ts +18 -9
- package/src/core/graph.ts +19 -5
- package/src/core/light.ts +2 -2
- package/src/core/model.ts +141 -31
- package/src/core/parse.ts +100 -85
- package/src/core/poly.ts +1 -8
- package/src/core/site.ts +2 -2
- package/src/core/tolerance.ts +2 -2
- package/src/core/vertical.ts +10 -3
- package/src/core/vocabulary.ts +18 -5
- package/src/draw/index.ts +1 -1
- package/src/draw/plan.ts +5 -5
- package/src/index.ts +30 -9
- package/src/mcp.ts +44 -11
- package/src/parse-file.ts +17 -3
- package/src/validate/access.ts +24 -12
- package/src/validate/envelope.ts +3 -3
- package/src/validate/index.ts +2 -2
- package/src/validate/light.ts +1 -1
- package/src/validate/site.ts +2 -2
- package/spec/README.md +0 -28
- package/spec/canonical-json.md +0 -98
- package/spec/composition.md +0 -121
- package/spec/derivation.md +0 -393
- package/spec/en/README.md +0 -30
- package/spec/en/canonical-json.md +0 -101
- package/spec/en/composition.md +0 -121
- package/spec/en/derivation.md +0 -393
- package/spec/en/language.md +0 -164
- package/spec/en/notation-v0.md +0 -145
- package/spec/en/scope.md +0 -229
- package/spec/en/semantics.md +0 -132
- package/spec/en/tools.md +0 -108
- package/spec/en/validation.md +0 -79
- package/spec/en/vocabulary.md +0 -103
- package/spec/language.md +0 -163
- package/spec/notation-v0.md +0 -184
- package/spec/scope.md +0 -229
- package/spec/semantics.md +0 -130
- package/spec/tools.md +0 -106
- package/spec/validation.md +0 -79
- package/spec/vocabulary.md +0 -114
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validate/index.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,EAAE;AACF,qDAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validate/index.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,EAAE;AACF,qDAAqD;AACrD,2DAA2D;AAC3D,yCAAyC;AACzC,EAAE;AACF,8CAA8C;AAC9C,kCAAkC;AAClC,EAAE;AACF,8CAA8C;AAC9C,0CAA0C;AAC1C,EAAE;AACF,gFAAgF;AAChF,iFAAiF;AACjF,EAAE;AACF,8CAA8C;AAC9C,iDAAiD;AACjD,EAAE;AACF,uCAAuC;AACvC,6CAA6C;AAG7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,cAAc,EAAE,SAAS,EAAE,gCAAgC;IAC3D,gBAAgB,EAAE,WAAW,EAAE,2BAA2B;IAC1D,kBAAkB,EAAE,SAAS,EAAE,2BAA2B;IAC1D,kBAAkB,EAAE,SAAS,EAAE,0CAA0C;IACzE,WAAW,EAAE,SAAS,EAAE,sBAAsB;IAC9C,kBAAkB,EAAE,SAAS,EAAE,wBAAwB;IACvD,oBAAoB,EAAE,WAAW,EAAE,oBAAoB;IACvD,iBAAiB,EAAE,WAAW,EAAE,0BAA0B;IAC1D,sBAAsB,EAAE,SAAS,EAAE,mBAAmB;IACtD,gBAAgB,EAAE,WAAW,EAAE,eAAe;IAC9C,oBAAoB,EAAE,SAAS,EAAE,4BAA4B;IAC7D,mBAAmB,EAAE,WAAW,EAAE,+BAA+B;IACjE,aAAa,EAAE,WAAW,EAAE,gBAAgB;IAC5C,WAAW,EAAE,SAAS,EAAE,kBAAkB;IAC1C,eAAe,EAAE,WAAW,EAAE,yBAAyB;CACG,CAAC;AAwB7D,sDAAsD;AACtD,MAAM,UAAU,OAAO,CACrB,IAAoB,EACpB,OAAe,EACf,KAAwD,EAAE;IAE1D,OAAO;QACL,IAAI;QACJ,KAAK,EAAE,gBAAgB,CAAC,IAAI,CAAC;QAC7B,OAAO;QACP,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,QAAQ,CAAC,KAAY;IACnC,OAAO;QACL,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAC1B,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAC1B,GAAG,WAAW,CAAC,KAAK,CAAC;QACrB,GAAG,cAAc,CAAC,KAAK,CAAC;QACxB,GAAG,YAAY,CAAC,KAAK,CAAC;KACvB,CAAC;AACJ,CAAC"}
|
package/dist/validate/light.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// 検証 — 採光 (法28条1項の粗い写し)
|
|
2
2
|
//
|
|
3
3
|
// **合否はここが言う。**core が返すのは `daylightInputs` — 床面積と、係数を掛けた
|
|
4
|
-
// 有効窓面積という**数**だけである (
|
|
4
|
+
// 有効窓面積という**数**だけである (docs/reference/scope.md「問いは合否を言わない」)。
|
|
5
5
|
// 1/7 という閾値は建築の側の規則であって、原本の構成が満たすべき不変量ではない。
|
|
6
6
|
//
|
|
7
7
|
// 判定は甘い。採光補正係数を掛けない粗い判定であり、基本計画の解像度に合わせた
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"light.js","sourceRoot":"","sources":["../../src/validate/light.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,EAAE;AACF,yDAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"light.js","sourceRoot":"","sources":["../../src/validate/light.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,EAAE;AACF,yDAAyD;AACzD,4DAA4D;AAC5D,4CAA4C;AAC5C,EAAE;AACF,yCAAyC;AACzC,gDAAgD;AAChD,sDAAsD;AAGtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAgB,MAAM,YAAY,CAAC;AAEnD,2CAA2C;AAC3C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC,MAAM,UAAU,gBAAgB,CAAC,KAAY;IAC3C,MAAM,GAAG,GAAc,EAAE,CAAC;IAC1B,KAAK,MAAM,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,GAAG,gBAAgB,CAAC;QACxC,IAAI,CAAC,CAAC,MAAM,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC;YAC3B,GAAG,CAAC,IAAI,CACN,OAAO,CACL,gBAAgB,EAChB,0BAA0B,CAAC,CAAC,KAAK,CAAC,IAAI,uBAAuB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,gBAAgB,WAAW,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,EACpL,EAAE,CACH,CACF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;YACf,GAAG,CAAC,IAAI,CACN,OAAO,CACL,kBAAkB,EAClB,qCAAqC,CAAC,CAAC,KAAK,CAAC,IAAI,2CAA2C,EAC5F,EAAE,CACH,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site.d.ts","sourceRoot":"","sources":["../../src/validate/site.ts"],"names":[],"mappings":"AAYA,OAAO,
|
|
1
|
+
{"version":3,"file":"site.d.ts","sourceRoot":"","sources":["../../src/validate/site.ts"],"names":[],"mappings":"AAYA,OAAO,EAA2D,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEvG,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAMnD,oCAAoC;AACpC,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,EAAE,CA4DpD"}
|
package/dist/validate/site.js
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
//
|
|
10
10
|
// 建蔽率・容積率は**数**なので core の siteReport が返す。上限と較べるのは、
|
|
11
11
|
// 用途地域という原本の外の事実を要するので、ここでも持たない — 持てるようになったら足す。
|
|
12
|
-
import { polygonAreaM2, regionOf, shapeEscapesPolygon } from "../core/model.js";
|
|
12
|
+
import { isOutside, polygonAreaM2, regionOf, shapeEscapesPolygon } from "../core/model.js";
|
|
13
13
|
import { siteReport } from "../core/site.js";
|
|
14
14
|
import { finding } from "./index.js";
|
|
15
15
|
/** 敷地の許容 mm — 境界上は内側扱い */
|
|
@@ -46,7 +46,7 @@ export function siteFindings(model) {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
for (const s of withRect) {
|
|
49
|
-
if (s
|
|
49
|
+
if (isOutside(s) || s.path.startsWith(poly.path + "/"))
|
|
50
50
|
continue;
|
|
51
51
|
// 照合するのは割付ではなく**導出された領域** — 敷地なりに切った外形はここで通る
|
|
52
52
|
for (const r of regionOf(s)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site.js","sourceRoot":"","sources":["../../src/validate/site.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,EAAE;AACF,qDAAqD;AACrD,iCAAiC;AACjC,EAAE;AACF,mCAAmC;AACnC,gDAAgD;AAChD,yCAAyC;AACzC,EAAE;AACF,mDAAmD;AACnD,gDAAgD;AAEhD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,mBAAmB,EAAc,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"site.js","sourceRoot":"","sources":["../../src/validate/site.ts"],"names":[],"mappings":"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"}
|
|
@@ -177,8 +177,8 @@
|
|
|
177
177
|
"captures": { "1": { "name": "entity.name.type.path.koyu" } }
|
|
178
178
|
},
|
|
179
179
|
"attr-ledger": {
|
|
180
|
-
"comment": "
|
|
181
|
-
"match": "\\b(underground|escalator|daylight|ceiling|landing|hinge|level|riser|slope|stair|style|swing|tread|pitch|entry|lane|lift|form|road|slab|site|area|turn|type|edge|
|
|
180
|
+
"comment": "The ledger keys that are not carrier-tier — the attributes the tools act on. ATTR_LEDGER in src/core/vocabulary.ts is the contract; free k:v gets a different colour",
|
|
181
|
+
"match": "\\b(underground|escalator|daylight|ceiling|landing|outside|hinge|level|riser|slope|stair|style|swing|tread|pitch|entry|lane|lift|form|road|slab|site|area|turn|type|edge|name|ramp|void|uid|air|use|at|h|w|t|d|x|y)(:)",
|
|
182
182
|
"captures": {
|
|
183
183
|
"1": { "name": "entity.other.attribute-name.koyu" },
|
|
184
184
|
"2": { "name": "punctuation.separator.key-value.koyu" }
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
# * 地下は level の underground:1 という宣言。zの負値からは推定しない (ADR-0022)。
|
|
12
12
|
# * 土に接する壁は spec 語彙 (spec:RC土圧壁)。境界の型は増やさない — 物の名は spec である。
|
|
13
13
|
|
|
14
|
-
koyu 1.
|
|
14
|
+
koyu 1.1
|
|
15
15
|
name 地下駐車場 — 縦動線の最小例
|
|
16
16
|
unit mm
|
|
17
17
|
|
|
@@ -48,8 +48,8 @@ boundary /B2..B1/st /B2..B1/mech t:250 spec:RC
|
|
|
48
48
|
boundary /B2..B1/ev /B2..B1/mech t:250 spec:RC
|
|
49
49
|
|
|
50
50
|
# 外周は土。物の名は spec 語彙が運ぶ (境界の型を増やさない)
|
|
51
|
-
space /out
|
|
52
|
-
space /road
|
|
51
|
+
space /out name:外部 outside:1
|
|
52
|
+
space /road road:12000 name:前面道路 outside:1
|
|
53
53
|
|
|
54
54
|
boundary /B2..B1/park /out edge:W t:500 spec:RC土圧壁
|
|
55
55
|
boundary /B2..B1/park /out edge:S t:500 spec:RC土圧壁
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
# 吹抜けは**床の不在**である。区画の扉を吹抜けに開くと、そこは床の無い所なので出られない。
|
|
14
14
|
# 西列の区画は回廊に面させ、回廊がモールへ回り込む — 吹抜けの縁は手すりになる
|
|
15
15
|
space /L2..L5/wgal corridor X2..X2+2400 Y1..Y6 + X2+2400..X3 Y2..Y2+3600 name:西回廊 use:common floor:石張り
|
|
16
|
-
space /L2..L5/atrium
|
|
16
|
+
space /L2..L5/atrium X2+2400..X3 Y1..Y2 + X2+2400..X3 Y2+3600..Y4 + X2+5600..X3 Y4..Y4+12000 + X2+2400..X3 Y4+12000..Y6 name:吹抜け void:1
|
|
17
17
|
space /L2..L5/mall corridor X3..X8 Y2..Y2+3600 name:モール use:common floor:石張り
|
|
18
18
|
space /L2..L5/north backyard X4..X7 Y5..Y6 name:北側サービス use:common
|
|
19
19
|
space /L2..L5/bohW backyard X3..X4 Y4-3200..Y6 name:バックヤード西 use:common
|
|
@@ -6,12 +6,12 @@
|
|
|
6
6
|
zone /site name:敷地 site:1
|
|
7
7
|
polygon /site -6000,-8000 26000,-8000 34000,-11000 64000,-11000 68000,-5000 68000,22000 60000,34000 44000,48000 6000,48000 -6000,28000
|
|
8
8
|
|
|
9
|
-
space /out
|
|
10
|
-
space /road-s
|
|
11
|
-
space /road-e
|
|
12
|
-
space /site/walk
|
|
13
|
-
space /site/plaza
|
|
14
|
-
space /site/east
|
|
9
|
+
space /out name:外部 outside:1
|
|
10
|
+
space /road-s road:22000 name:南側道路 outside:1
|
|
11
|
+
space /road-e road:16000 name:東側道路 outside:1
|
|
12
|
+
space /site/walk X1..X8 Y1-6000..Y1 level:L1 name:歩道状空地 outside:1
|
|
13
|
+
space /site/plaza X1-4000..X1 Y1..Y6 level:L1 name:西側広場 outside:1
|
|
14
|
+
space /site/east X8..X8+6000 Y1..Y6 level:L1 name:東側歩道状空地 outside:1
|
|
15
15
|
|
|
16
16
|
# 接道は「敷地と道路が接する長さ」— 建物の外壁が道路に面していても接道ではない
|
|
17
17
|
boundary /site/walk /road-s edge:S type:open
|
package/examples/house/L2.muro
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# 2階の層 — 上階の外壁は方角別のexteriorに面する。
|
|
2
2
|
|
|
3
3
|
space /home/bed1 bedroom X1..X2 Y1..Y3 level:L2 name:主寝室 daylight:1
|
|
4
|
-
space /home/void
|
|
4
|
+
space /home/void X2..X3 Y1..Y2 level:L2 name:リビング上部 void:1
|
|
5
5
|
space /home/hall2 hall X2..X3 Y2..Y3 level:L2 name:2階ホール
|
|
6
6
|
|
|
7
7
|
boundary /home/bed1 /out/road edge:S t:150 spec:EW
|
package/examples/house/main.muro
CHANGED
package/examples/house/site.muro
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
# /out は方角・性格ごとの複数のexterior空間に割れ (道路は road:幅員)、
|
|
3
3
|
# 地上の外部空間 (庭) はL1上の実在の空間として建物の周りをタイルする。
|
|
4
4
|
|
|
5
|
-
space /out/road
|
|
6
|
-
space /out/n
|
|
7
|
-
space /out/e
|
|
8
|
-
space /out/w
|
|
5
|
+
space /out/road name:南側道路 road:6000 outside:1
|
|
6
|
+
space /out/n name:北側隣地 outside:1
|
|
7
|
+
space /out/e name:東側隣地 outside:1
|
|
8
|
+
space /out/w name:西側隣地 outside:1
|
|
9
9
|
|
|
10
10
|
zone /site name:敷地 site:1 area:126.24
|
|
11
11
|
space /site/garden garden X1-1500..X3+1500 Y1-4000..Y1 level:L1 name:南庭
|
package/examples/house.muro
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
# 敷地 = zone site:1 (宣言面積と導出面積を site コマンドが突き合わせる)。
|
|
8
8
|
# L1の平面図はそのまま配置図兼用になる。
|
|
9
9
|
|
|
10
|
-
koyu 1.
|
|
10
|
+
koyu 1.1
|
|
11
11
|
name 小さな戸建住宅
|
|
12
12
|
unit mm
|
|
13
13
|
|
|
@@ -19,10 +19,10 @@ level L2 2900 h:2400 slab:500
|
|
|
19
19
|
level R 5800 slab:500
|
|
20
20
|
|
|
21
21
|
# ---- 外部 (敷地の外) — 方角・性格ごとに割る ----
|
|
22
|
-
space /out/road
|
|
23
|
-
space /out/n
|
|
24
|
-
space /out/e
|
|
25
|
-
space /out/w
|
|
22
|
+
space /out/road name:南側道路 road:6000 outside:1
|
|
23
|
+
space /out/n name:北側隣地 outside:1
|
|
24
|
+
space /out/e name:東側隣地 outside:1
|
|
25
|
+
space /out/w name:西側隣地 outside:1
|
|
26
26
|
|
|
27
27
|
# ---- 敷地 — 地上の外部空間が建物の周りをタイルする ----
|
|
28
28
|
zone /site name:敷地 site:1 area:126.24
|
|
@@ -36,7 +36,7 @@ zone /home name:住戸 use:exclusive
|
|
|
36
36
|
space /home/ldk ldk X1..X2 Y1..Y3 + X2..X3 Y1..Y2 level:L1 name:LDK floor:オーク daylight:1
|
|
37
37
|
space /home/hall1 hall X2..X3 Y2..Y3 level:L1 name:玄関・階段
|
|
38
38
|
space /home/bed1 bedroom X1..X2 Y1..Y3 level:L2 name:主寝室 daylight:1
|
|
39
|
-
space /home/void
|
|
39
|
+
space /home/void X2..X3 Y1..Y2 level:L2 name:リビング上部 void:1
|
|
40
40
|
space /home/hall2 hall X2..X3 Y2..Y3 level:L2 name:2階ホール
|
|
41
41
|
|
|
42
42
|
# ---- 1階: 室と庭の境界 (実在の矩形同士 — 線分は正確に導出される) ----
|
package/examples/mansion.muro
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
# 外部に対し open または air:1 (手すり等、遮蔽しない物) の境界を持つ空間として導出される)。
|
|
5
5
|
# 基準階は一度だけ書く — /L2..L9/ のスパンが8フロアに展開される。
|
|
6
6
|
|
|
7
|
-
koyu 1.
|
|
7
|
+
koyu 1.1
|
|
8
8
|
name 内廊下型集合住宅
|
|
9
9
|
unit mm
|
|
10
10
|
|
|
@@ -17,7 +17,7 @@ level L3..L9 6700 pitch:2900 h:2400 slab:500
|
|
|
17
17
|
level L10 27000 h:2600 slab:500 # ペントハウスは天井高2600
|
|
18
18
|
level R 30200 slab:600 # 屋上 (陸屋根)。L10の上限を与える
|
|
19
19
|
|
|
20
|
-
space /out
|
|
20
|
+
space /out name:外部 outside:1
|
|
21
21
|
|
|
22
22
|
# ============ 1階 — 共用部・機械室 ============
|
|
23
23
|
space /L1/hall hall X1..X2 Y1..Y3 name:エントランスホール use:common floor:タイル
|
package/examples/office.muro
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
# 基本計画の解像度で書く。垂れ壁や建具詳細は表現しない — 省略ではなく抽象度の選択。
|
|
3
3
|
# 高さの一貫性は level の宣言 (z / h / slab) と check の不変量が担保する。
|
|
4
4
|
|
|
5
|
-
koyu 1.
|
|
5
|
+
koyu 1.1
|
|
6
6
|
name 小さなオフィス
|
|
7
7
|
unit mm
|
|
8
8
|
|
|
@@ -13,7 +13,7 @@ level L1 0 h:2700 slab:600
|
|
|
13
13
|
level L2 4000 h:2700 slab:1300
|
|
14
14
|
level R 8000 slab:1300 # 屋根面。L2の空間の上限を与える
|
|
15
15
|
|
|
16
|
-
space /out
|
|
16
|
+
space /out name:外部 outside:1
|
|
17
17
|
|
|
18
18
|
# ---- 1階: エントランス+事務室、北側にコア ----
|
|
19
19
|
space /L1/hall hall X1..X2 Y1..Y2 name:エントランスホール use:common floor:フローリング h:6700 # 吹抜けで2層分
|
|
@@ -62,7 +62,7 @@ boundary /L1/wc-w /out t:180 spec:EW1
|
|
|
62
62
|
boundary /L1/machine /out t:180 spec:EW1
|
|
63
63
|
|
|
64
64
|
# ---- 2階: 会議室+執務室 (南の廊下芯Y2を跨いで広がる)、コアは1階と同位置 ----
|
|
65
|
-
space /L2/void
|
|
65
|
+
space /L2/void X1..X2 Y1..Y2 name:エントランス吹抜け void:1
|
|
66
66
|
space /L2/office office X2..X4 Y1..Y3 name:執務室 use:rentable floor:タイルカーペット
|
|
67
67
|
area X3+3200..X4 Y1..Y1+3200 name:リフレッシュコーナー floor:フローリング
|
|
68
68
|
space /L2/corridor corridor X1..X2 Y2..Y3 name:廊下 use:common
|
|
@@ -7,7 +7,7 @@ space /L1/ldk ldk X1..X2 Y1..Y2 daylight:1
|
|
|
7
7
|
space /L1/hall hall X2..X3 Y1..Y2
|
|
8
8
|
space /L2/bed bedroom X1..X2 Y1..Y2 daylight:1
|
|
9
9
|
space /L2/hall hall X2..X3 Y1..Y2
|
|
10
|
-
space /out
|
|
10
|
+
space /out outside:1
|
|
11
11
|
|
|
12
12
|
boundary /L1/ldk /L1/hall t:120
|
|
13
13
|
door w:800 h:2000
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
koyu 1.
|
|
1
|
+
koyu 1.1
|
|
2
2
|
name 小さな家
|
|
3
3
|
|
|
4
4
|
grid X 0 3600 5400
|
|
@@ -10,7 +10,7 @@ space /L1/ldk ldk X1..X2 Y1..Y2 name:LDK floor:オーク daylight:1
|
|
|
10
10
|
space /L1/hall hall X2..X3 Y1..Y2 name:玄関ホール floor:タイル
|
|
11
11
|
space /L2/bed bedroom X1..X2 Y1..Y2 name:寝室 floor:オーク daylight:1
|
|
12
12
|
space /L2/hall hall X2..X3 Y1..Y2 name:階段ホール
|
|
13
|
-
space /out
|
|
13
|
+
space /out name:外部 outside:1
|
|
14
14
|
|
|
15
15
|
boundary /L1/ldk /L1/hall t:120 spec:PW1
|
|
16
16
|
door w:800 h:2000 name:LDK扉
|
package/examples/tower/L2.muro
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
|
|
4
4
|
space /L2/s3 shop X1..X3 Y1-4600..Y2 name:クリニック use:rentable
|
|
5
5
|
space /L2/s4 shop X3..X5 Y1-4600..Y2 name:フィットネス use:rentable
|
|
6
|
-
space /L2/void
|
|
6
|
+
space /L2/void X5..X6 Y1-4600..Y2 name:ホール吹抜け void:1
|
|
7
7
|
space /L2/corridor corridor X1..X6 Y2..Y3 + X4..X4+3200 Y3..Y3+3200 name:共用廊下 use:common
|
|
8
8
|
space /L2/st2 stair X1..X1+3200 Y3..Y4 name:西階段 use:common
|
|
9
9
|
space /L2/stor service X1+3200..X2+3200 Y3..Y4 name:テナント倉庫 use:rentable
|
package/examples/tower/main.muro
CHANGED
package/examples/tower/site.muro
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
# 角地: 南12m道路+東6m道路。地上の外部空間は建物の周りをタイルする実在の空間。
|
|
3
3
|
# タイルは矩形の近似 — 面積の真は敷地形状 (site-geometry.muro のpolygon) が持つ。
|
|
4
4
|
|
|
5
|
-
space /out/road-s
|
|
6
|
-
space /out/road-e
|
|
7
|
-
space /out/n
|
|
8
|
-
space /out/w
|
|
5
|
+
space /out/road-s name:南側道路 road:12000 outside:1
|
|
6
|
+
space /out/road-e name:東側道路 road:6000 outside:1
|
|
7
|
+
space /out/n name:北側隣地 outside:1
|
|
8
|
+
space /out/w name:西側隣地 outside:1
|
|
9
9
|
|
|
10
10
|
zone /site name:敷地 site:1 area:1097.80
|
|
11
11
|
|
package/examples/twin/main.muro
CHANGED
|
@@ -8,10 +8,10 @@
|
|
|
8
8
|
# 縁は手すり (air:1) — 床の無い所に扉は開かない。
|
|
9
9
|
|
|
10
10
|
# ---- 吹抜けとエスカレーター (L2〜L4 で共有) ----
|
|
11
|
-
space /L2/avoid
|
|
12
|
-
space /L3/avoid
|
|
11
|
+
space /L2/avoid X12+3200..X13 Y5..Y11 + X12..X12+3200 Y5..Y6+5600 + X12..X12+3200 Y8+3600..Y11 name:吹抜け void:1
|
|
12
|
+
space /L3/avoid X12+3200..X13 Y5..Y11 + X12..X12+3200 Y5..Y7 + X12..X12+3200 Y8+3600..Y11 name:吹抜け void:1
|
|
13
13
|
# L4 の吹抜けは基壇のセットバックに合わせて短い — 段々は吹抜けにも及ぶ
|
|
14
|
-
space /L4/avoid
|
|
14
|
+
space /L4/avoid X12+3200..X13 Y6..Y10 + X12..X12+3200 Y6..Y7 + X12..X12+3200 Y8+3600..Y10 name:吹抜け void:1
|
|
15
15
|
space /L2..L4/es2 escalator X12..X12+3200 Y7..Y7+12000 name:エスカレーター use:common escalator:N
|
|
16
16
|
space /L2/es1 corridor X12..X12+3200 Y6+5600..Y7 name:エスカレーター乗降 use:common
|
|
17
17
|
boundary /L1/atrium /L2/avoid type:void
|
|
@@ -30,7 +30,7 @@ space /L2/s04 shop X14..X19 Y4..Y5 name:南区画03 use:rentable
|
|
|
30
30
|
space /L2/mallSw corridor X2..X11 Y5..Y6 name:南モール西 use:common floor:石張り
|
|
31
31
|
space /L2/mallSe corridor X14..X19 Y5..Y6 name:南モール東 use:common floor:石張り
|
|
32
32
|
# 西の1スパン (X2..X3) はエントランス吹抜け — 1階の大開口の上をガラスが2層で立つ
|
|
33
|
-
space /L2/alvoid
|
|
33
|
+
space /L2/alvoid X2..X3 Y7..Y9 name:エントランス吹抜け void:1
|
|
34
34
|
space /L2/es4 corridor X2..X3 Y6..Y7 name:下りエスカレーター乗り場 use:common
|
|
35
35
|
space /L2/es3 corridor X2..X3 Y9..Y10 name:上りエスカレーター降り場 use:common
|
|
36
36
|
space /L2/w01 corridor X3..X4 Y6..Y7 name:西通路南 use:common
|
package/examples/twin/site.muro
CHANGED
|
@@ -4,21 +4,21 @@
|
|
|
4
4
|
# この規模の容積を積む再開発は、公開空地が制度の裏づけになる (総合設計・都市再生特区)。
|
|
5
5
|
# 基壇の四隅の斜めは、この敷地の辺の振れをそのまま建物に写した隅切りである。
|
|
6
6
|
|
|
7
|
-
space /out
|
|
7
|
+
space /out name:外部 outside:1
|
|
8
8
|
|
|
9
9
|
zone /site name:敷地 site:1 area:23167.40
|
|
10
10
|
|
|
11
11
|
polygon /site 0,24000 14000,6000 46000,0 92000,3000 126000,0 158000,9000 168000,38000 164000,80000 168000,118000 152000,144000 104000,151200 58000,149000 16000,142000 0,100000
|
|
12
12
|
|
|
13
|
-
space /road-s
|
|
14
|
-
space /road-e
|
|
15
|
-
space /road-n
|
|
13
|
+
space /road-s X1..X21 Y1-22000..Y1 level:L1 name:南側道路 road:25000 outside:1
|
|
14
|
+
space /road-e X21..X21+18000 Y1..Y19 level:L1 name:東側道路 road:18000 outside:1
|
|
15
|
+
space /road-n X1..X21 Y19..Y19+16000 level:L1 name:北側道路 road:16000 outside:1
|
|
16
16
|
|
|
17
17
|
# 外構。北の大きな広場が公開空地の主体
|
|
18
|
-
space /site/plazaS
|
|
19
|
-
space /site/plazaE
|
|
20
|
-
space /site/plazaW
|
|
21
|
-
space /site/green
|
|
18
|
+
space /site/plazaS X2..X19 Y1..Y4 level:L1 name:南側広場 outside:1
|
|
19
|
+
space /site/plazaE X19..X21 Y1..Y12 level:L1 name:東側広場 outside:1
|
|
20
|
+
space /site/plazaW X1..X2 Y1..Y12 level:L1 name:西側広場 outside:1
|
|
21
|
+
space /site/green X1..X21 Y12..Y19 level:L1 name:北側広場・緑地 outside:1
|
|
22
22
|
|
|
23
23
|
boundary /site/plazaS /road-s type:open
|
|
24
24
|
boundary /site/plazaE /road-e type:open
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
|
-
"format": "koyu-canonical/1.
|
|
3
|
-
"koyu": "1.
|
|
2
|
+
"format": "koyu-canonical/1.1",
|
|
3
|
+
"koyu": "1.1",
|
|
4
4
|
"name": "二室",
|
|
5
5
|
"unit": "mm",
|
|
6
6
|
"grid": {
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
}
|
|
50
50
|
},
|
|
51
51
|
"/out": {
|
|
52
|
-
"type": "exterior",
|
|
53
52
|
"attrs": {
|
|
54
|
-
"name": "外部"
|
|
53
|
+
"name": "外部",
|
|
54
|
+
"outside": 1
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
},
|
package/examples/two-rooms.muro
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
# 書いてあるのは、扉を吊るために宣言した境界と、外皮の境界だけ。
|
|
5
5
|
# 両室に daylight:1 を書いたので、窓が要る — `koyu light` が 1/7 を確かめる (ADR-0020)。
|
|
6
6
|
|
|
7
|
-
koyu 1.
|
|
7
|
+
koyu 1.1
|
|
8
8
|
name 二室
|
|
9
9
|
unit mm
|
|
10
10
|
|
|
@@ -14,7 +14,7 @@ level L1 0 h:2400 slab:150
|
|
|
14
14
|
|
|
15
15
|
space /L1/a room X1..X2 Y1..Y2 name:居室A daylight:1
|
|
16
16
|
space /L1/b room X2..X3 Y1..Y2 name:居室B daylight:1
|
|
17
|
-
space /out
|
|
17
|
+
space /out name:外部 outside:1
|
|
18
18
|
|
|
19
19
|
boundary /L1/a /L1/b t:120 spec:PW1
|
|
20
20
|
door w:780 h:2000
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kensnzk/koyu",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.17.0",
|
|
4
4
|
"description": "空間を一次要素とするテキストネイティブ建築記述の探求 — writing architecture, not buildings",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -19,7 +19,6 @@
|
|
|
19
19
|
"default": "./dist/draw/index.js"
|
|
20
20
|
},
|
|
21
21
|
"./examples/*": "./examples/*",
|
|
22
|
-
"./spec/*": "./spec/*",
|
|
23
22
|
"./syntax": "./editors/vscode/syntaxes/koyu.tmLanguage.json",
|
|
24
23
|
"./package.json": "./package.json",
|
|
25
24
|
"./node": {
|
|
@@ -34,7 +33,6 @@
|
|
|
34
33
|
"files": [
|
|
35
34
|
"dist",
|
|
36
35
|
"src",
|
|
37
|
-
"spec",
|
|
38
36
|
"examples",
|
|
39
37
|
"editors",
|
|
40
38
|
"NOTICE"
|
|
@@ -48,9 +46,11 @@
|
|
|
48
46
|
"prepare": "npm run build",
|
|
49
47
|
"test": "node --import tsx --test test/*.test.ts",
|
|
50
48
|
"typecheck": "tsc --noEmit",
|
|
51
|
-
"check:examples": "for f in examples/two-rooms.muro examples/office.muro examples/mansion.muro examples/house.muro examples/house/main.muro examples/tower/main.muro examples/basement/main.muro examples/complex/main.muro examples/twin/main.muro examples/steps/*.muro; do tsx src/cli.ts check $f || exit 1; done",
|
|
49
|
+
"check:examples": "for f in examples/two-rooms.muro examples/office.muro examples/mansion.muro examples/house.muro examples/house/main.muro examples/tower/main.muro examples/basement/main.muro examples/complex/main.muro examples/twin/main.muro examples/steps/*.muro skills/koyu-design/examples/flat-1ldk.muro skills/koyu-design/examples/office/main.muro; do tsx src/cli.ts check $f || exit 1; done",
|
|
52
50
|
"gate:examples": "node --import tsx scripts/gate.mjs",
|
|
53
|
-
"plan:examples": "tsx src/cli.ts plan examples/two-rooms.muro -o out/two-rooms.svg"
|
|
51
|
+
"plan:examples": "tsx src/cli.ts plan examples/two-rooms.muro -o out/two-rooms.svg",
|
|
52
|
+
"conformance": "node --import tsx --test test/conformance.test.ts",
|
|
53
|
+
"gate:docs": "npm --prefix website run gate:canonical && npm --prefix website run check:navigation"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
56
|
"@types/node": "^22.0.0",
|
package/src/cli.ts
CHANGED
|
@@ -32,6 +32,8 @@ import {
|
|
|
32
32
|
zoneAreaM2,
|
|
33
33
|
type Model,
|
|
34
34
|
srcRef,
|
|
35
|
+
isOutside,
|
|
36
|
+
isVoid
|
|
35
37
|
} from "./core/model.js";
|
|
36
38
|
import { parseFile } from "./parse-file.js";
|
|
37
39
|
import { svgPlan } from "./draw/plan.js";
|
|
@@ -201,14 +203,14 @@ function main(argv: string[]): number {
|
|
|
201
203
|
(warnings.length ? ` (${qty(warnings.length, "warning", "warnings")})` : ""),
|
|
202
204
|
);
|
|
203
205
|
// **緑の意味を、緑を出す場所で言う。**構造整合が成り立っただけであって、
|
|
204
|
-
// 建築として妥当かはここでは何も言っていない (
|
|
206
|
+
// 建築として妥当かはここでは何も言っていない (docs/reference/scope.md)
|
|
205
207
|
console.log(" Structural consistency only — architectural validity is what koyu validate says, separately");
|
|
206
208
|
return strict && warnings.length > 0 ? 1 : 0;
|
|
207
209
|
}
|
|
208
210
|
return 1;
|
|
209
211
|
}
|
|
210
212
|
case "validate": {
|
|
211
|
-
// 建築的な判定 (
|
|
213
|
+
// 建築的な判定 (docs/reference/scope.md)。**check の保証ではない** — 型もコードの綴りも別で、
|
|
212
214
|
// 終了コードだけが同じ流儀 (0=違反なし / 1=違反あり)
|
|
213
215
|
const findings = validate(model);
|
|
214
216
|
if (rest.includes("--json")) {
|
|
@@ -230,7 +232,7 @@ function main(argv: string[]): number {
|
|
|
230
232
|
return violations > 0 ? 1 : 0;
|
|
231
233
|
}
|
|
232
234
|
case "layers": {
|
|
233
|
-
// 合成の規則1と6 (
|
|
235
|
+
// 合成の規則1と6 (docs/reference/muro/import.md) — 強度順序を見せ、最終値の出所を言う。
|
|
234
236
|
// **暗黙の解決はどこにも無い**ことを、目で確かめられるようにするための面である
|
|
235
237
|
if (model.layers.length === 0) {
|
|
236
238
|
console.log("No layers (parsing a single file involves no composition)");
|
|
@@ -323,29 +325,32 @@ function main(argv: string[]): number {
|
|
|
323
325
|
console.log(`${l.name}`);
|
|
324
326
|
let sub = 0;
|
|
325
327
|
for (const s of onLevel) {
|
|
326
|
-
if (s
|
|
328
|
+
if (isVoid(s)) {
|
|
327
329
|
console.log(` ${s.path}\t${displayName(s)}\tvoid (not counted as floor area)`);
|
|
328
330
|
continue;
|
|
329
331
|
}
|
|
330
332
|
const a = areaM2(s)!;
|
|
331
|
-
if (s
|
|
333
|
+
if (isOutside(s)) {
|
|
332
334
|
outdoorTotal += a;
|
|
333
|
-
console.log(` ${s.path}\t${displayName(s)}\t${s.type}\t${a.toFixed(2)} m2 (outdoor, not counted)`);
|
|
335
|
+
console.log(` ${s.path}\t${displayName(s)}\t${s.type ?? "(untyped)"}\t${a.toFixed(2)} m2 (outdoor, not counted)`);
|
|
334
336
|
continue;
|
|
335
337
|
}
|
|
336
338
|
if (isSemiOutdoor(model, s)) {
|
|
337
339
|
semiTotal += a;
|
|
338
340
|
console.log(
|
|
339
|
-
` ${s.path}\t${displayName(s)}\t${s.type}\t${a.toFixed(2)} m2 (semi-outdoor, reported separately)`,
|
|
341
|
+
` ${s.path}\t${displayName(s)}\t${s.type ?? "(untyped)"}\t${a.toFixed(2)} m2 (semi-outdoor, reported separately)`,
|
|
340
342
|
);
|
|
341
343
|
continue;
|
|
342
344
|
}
|
|
343
345
|
sub += a;
|
|
344
346
|
total += a;
|
|
345
|
-
|
|
347
|
+
// 型は任意なので、書かれなかった行にも小計の座が要る。**既定の語は捏造しない** —
|
|
348
|
+
// "(untyped)" は集計の見出しであって、その空間の型ではない (mcp の "(unspecified)" と同じ構え)
|
|
349
|
+
const label = s.type ?? "(untyped)";
|
|
350
|
+
byType.set(label, (byType.get(label) ?? 0) + a);
|
|
346
351
|
const use = effectiveUse(model, s);
|
|
347
352
|
if (use) byUse.set(use, (byUse.get(use) ?? 0) + a);
|
|
348
|
-
console.log(` ${s.path}\t${displayName(s)}\t${
|
|
353
|
+
console.log(` ${s.path}\t${displayName(s)}\t${label}\t${a.toFixed(2)} m2`);
|
|
349
354
|
}
|
|
350
355
|
console.log(` Subtotal ${sub.toFixed(2)} m2`);
|
|
351
356
|
}
|
|
@@ -377,7 +382,7 @@ function main(argv: string[]): number {
|
|
|
377
382
|
}
|
|
378
383
|
case "light": {
|
|
379
384
|
// 採光は**判定**である — core が返すのは床面積と有効窓面積という数だけで、
|
|
380
|
-
// 1/7 の合否は検証の面 (validate) が言う (
|
|
385
|
+
// 1/7 の合否は検証の面 (validate) が言う (docs/reference/scope.md)
|
|
381
386
|
const inputs = daylightInputs(model);
|
|
382
387
|
if (inputs.length === 0) {
|
|
383
388
|
console.log("Nothing is in daylight scope (write daylight:1 on the rooms to be judged)");
|