@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/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,22 +7,22 @@
|
|
|
7
7
|
# 敷地 = zone site:1 (宣言面積と導出面積を site コマンドが突き合わせる)。
|
|
8
8
|
# L1の平面図はそのまま配置図兼用になる。
|
|
9
9
|
|
|
10
|
-
koyu
|
|
10
|
+
koyu 1.1
|
|
11
11
|
name 小さな戸建住宅
|
|
12
12
|
unit mm
|
|
13
13
|
|
|
14
14
|
grid X 0 3640 7280
|
|
15
15
|
grid Y 0 3640 7280
|
|
16
16
|
|
|
17
|
-
level L1 0 h:2400
|
|
17
|
+
level L1 0 h:2400 slab:400
|
|
18
18
|
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,20 +4,20 @@
|
|
|
4
4
|
# 外部に対し open または air:1 (手すり等、遮蔽しない物) の境界を持つ空間として導出される)。
|
|
5
5
|
# 基準階は一度だけ書く — /L2..L9/ のスパンが8フロアに展開される。
|
|
6
6
|
|
|
7
|
-
koyu
|
|
7
|
+
koyu 1.1
|
|
8
8
|
name 内廊下型集合住宅
|
|
9
9
|
unit mm
|
|
10
10
|
|
|
11
11
|
grid X 0 5800 11600 17400
|
|
12
12
|
grid Y 0 6000 7800 13800
|
|
13
13
|
|
|
14
|
-
level L1 0 h:2800
|
|
14
|
+
level L1 0 h:2800 slab:600
|
|
15
15
|
level L2 3800 h:2400 slab:1000 # 1Fは階高3800 (共用部の設備懐)
|
|
16
16
|
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,18 +2,18 @@
|
|
|
2
2
|
# 基本計画の解像度で書く。垂れ壁や建具詳細は表現しない — 省略ではなく抽象度の選択。
|
|
3
3
|
# 高さの一貫性は level の宣言 (z / h / slab) と check の不変量が担保する。
|
|
4
4
|
|
|
5
|
-
koyu
|
|
5
|
+
koyu 1.1
|
|
6
6
|
name 小さなオフィス
|
|
7
7
|
unit mm
|
|
8
8
|
|
|
9
9
|
grid X 0 6400 12800 19200
|
|
10
10
|
grid Y 0 6400 8000 12000
|
|
11
11
|
|
|
12
|
-
level L1 0 h:2700
|
|
12
|
+
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
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
grid X 0 3600 5400
|
|
2
2
|
grid Y 0 4000
|
|
3
|
-
level L1 0
|
|
3
|
+
level L1 0 h:2400 slab:150
|
|
4
4
|
|
|
5
5
|
space /L1/ldk ldk X1..X2 Y1..Y2 daylight:1
|
|
6
6
|
space /L1/hall hall X2..X3 Y1..Y2
|
|
7
|
-
space /out
|
|
7
|
+
space /out outside:1
|
|
8
8
|
|
|
9
9
|
boundary /L1/ldk /L1/hall t:120
|
|
10
10
|
door w:800 h:2000
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
grid X 0 3600 5400
|
|
2
2
|
grid Y 0 4000
|
|
3
|
-
level L1 0 h:2400
|
|
3
|
+
level L1 0 h:2400 slab:150
|
|
4
4
|
level L2 2800 h:2400 slab:400
|
|
5
5
|
|
|
6
6
|
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,16 +1,16 @@
|
|
|
1
|
-
koyu
|
|
1
|
+
koyu 1.1
|
|
2
2
|
name 小さな家
|
|
3
3
|
|
|
4
4
|
grid X 0 3600 5400
|
|
5
5
|
grid Y 0 4000
|
|
6
|
-
level L1 0 h:2400
|
|
6
|
+
level L1 0 h:2400 slab:150
|
|
7
7
|
level L2 2800 h:2400 slab:400
|
|
8
8
|
|
|
9
9
|
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
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
# koyu plan examples/twin/main.muro -l L8 A棟基準階とB棟ホテル階
|
|
30
30
|
# koyu axo examples/twin/main.muro -l L1,L2,L3,L4,L5
|
|
31
31
|
|
|
32
|
-
koyu
|
|
32
|
+
koyu 1.1
|
|
33
33
|
name 双塔複合建築 — 商業・事務所・ホテル・レジデンス
|
|
34
34
|
unit mm
|
|
35
35
|
|
|
@@ -48,7 +48,7 @@ level M1 28200 h:3200 slab:900
|
|
|
48
48
|
level L6..L20 32800 h:2800 slab:1400 pitch:4200
|
|
49
49
|
level M2 95800 h:2800 slab:1400
|
|
50
50
|
level L21..L34 100000 h:2800 slab:1400 pitch:4200
|
|
51
|
-
level R1 158800 slab:900
|
|
51
|
+
level R1 158800 h:3000 slab:900
|
|
52
52
|
|
|
53
53
|
import ./assets.muro
|
|
54
54
|
import ./site.muro
|
|
@@ -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,5 +1,6 @@
|
|
|
1
1
|
{
|
|
2
|
-
"
|
|
2
|
+
"format": "koyu-canonical/1.1",
|
|
3
|
+
"koyu": "1.1",
|
|
3
4
|
"name": "二室",
|
|
4
5
|
"unit": "mm",
|
|
5
6
|
"grid": {
|
|
@@ -16,7 +17,8 @@
|
|
|
16
17
|
"levels": {
|
|
17
18
|
"L1": {
|
|
18
19
|
"z": 0,
|
|
19
|
-
"h": 2400
|
|
20
|
+
"h": 2400,
|
|
21
|
+
"slab": 150
|
|
20
22
|
}
|
|
21
23
|
},
|
|
22
24
|
"spaces": {
|
|
@@ -47,9 +49,9 @@
|
|
|
47
49
|
}
|
|
48
50
|
},
|
|
49
51
|
"/out": {
|
|
50
|
-
"type": "exterior",
|
|
51
52
|
"attrs": {
|
|
52
|
-
"name": "外部"
|
|
53
|
+
"name": "外部",
|
|
54
|
+
"outside": 1
|
|
53
55
|
}
|
|
54
56
|
}
|
|
55
57
|
},
|
package/examples/two-rooms.muro
CHANGED
|
@@ -4,17 +4,17 @@
|
|
|
4
4
|
# 書いてあるのは、扉を吊るために宣言した境界と、外皮の境界だけ。
|
|
5
5
|
# 両室に daylight:1 を書いたので、窓が要る — `koyu light` が 1/7 を確かめる (ADR-0020)。
|
|
6
6
|
|
|
7
|
-
koyu
|
|
7
|
+
koyu 1.1
|
|
8
8
|
name 二室
|
|
9
9
|
unit mm
|
|
10
10
|
|
|
11
11
|
grid X 0 3600 7200
|
|
12
12
|
grid Y 0 4500
|
|
13
|
-
level L1 0 h:2400
|
|
13
|
+
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",
|
|
@@ -10,7 +10,16 @@
|
|
|
10
10
|
"types": "./dist/index.d.ts",
|
|
11
11
|
"default": "./dist/index.js"
|
|
12
12
|
},
|
|
13
|
+
"./validate": {
|
|
14
|
+
"types": "./dist/validate/index.d.ts",
|
|
15
|
+
"default": "./dist/validate/index.js"
|
|
16
|
+
},
|
|
17
|
+
"./draw": {
|
|
18
|
+
"types": "./dist/draw/index.d.ts",
|
|
19
|
+
"default": "./dist/draw/index.js"
|
|
20
|
+
},
|
|
13
21
|
"./examples/*": "./examples/*",
|
|
22
|
+
"./syntax": "./editors/vscode/syntaxes/koyu.tmLanguage.json",
|
|
14
23
|
"./package.json": "./package.json",
|
|
15
24
|
"./node": {
|
|
16
25
|
"types": "./dist/parse-file.d.ts",
|
|
@@ -25,17 +34,23 @@
|
|
|
25
34
|
"dist",
|
|
26
35
|
"src",
|
|
27
36
|
"examples",
|
|
37
|
+
"editors",
|
|
28
38
|
"NOTICE"
|
|
29
39
|
],
|
|
40
|
+
"engines": {
|
|
41
|
+
"node": ">=22"
|
|
42
|
+
},
|
|
30
43
|
"scripts": {
|
|
31
44
|
"koyu": "tsx src/cli.ts",
|
|
32
45
|
"build": "tsc -p tsconfig.build.json",
|
|
33
46
|
"prepare": "npm run build",
|
|
34
47
|
"test": "node --import tsx --test test/*.test.ts",
|
|
35
48
|
"typecheck": "tsc --noEmit",
|
|
36
|
-
"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",
|
|
37
50
|
"gate:examples": "node --import tsx scripts/gate.mjs",
|
|
38
|
-
"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"
|
|
39
54
|
},
|
|
40
55
|
"devDependencies": {
|
|
41
56
|
"@types/node": "^22.0.0",
|