@kensnzk/koyu 0.16.0 → 0.18.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/analysis/contracts.d.ts +217 -0
- package/dist/analysis/contracts.d.ts.map +1 -0
- package/dist/analysis/contracts.js +27 -0
- package/dist/analysis/contracts.js.map +1 -0
- package/dist/analysis/index.d.ts +5 -0
- package/dist/analysis/index.d.ts.map +1 -0
- package/dist/analysis/index.js +17 -0
- package/dist/analysis/index.js.map +1 -0
- package/dist/analysis/json.d.ts +21 -0
- package/dist/analysis/json.d.ts.map +1 -0
- package/dist/analysis/json.js +111 -0
- package/dist/analysis/json.js.map +1 -0
- package/dist/cli.js +106 -35
- 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 +9 -0
- package/dist/core/site.d.ts.map +1 -1
- package/dist/core/site.js +8 -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/diagnostics.d.ts +2 -0
- package/dist/diagnostics.d.ts.map +1 -0
- package/dist/diagnostics.js +3 -0
- package/dist/diagnostics.js.map +1 -0
- package/dist/diff.d.ts +2 -0
- package/dist/diff.d.ts.map +1 -0
- package/dist/diff.js +3 -0
- package/dist/diff.js.map +1 -0
- 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/form.d.ts +5 -0
- package/dist/form.d.ts.map +1 -0
- package/dist/form.js +4 -0
- package/dist/form.js.map +1 -0
- package/dist/graph.d.ts +2 -0
- package/dist/graph.d.ts.map +1 -0
- package/dist/graph.js +3 -0
- package/dist/graph.js.map +1 -0
- package/dist/index.d.ts +2 -14
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +36 -45
- package/dist/index.js.map +1 -1
- package/dist/mcp.js +81 -30
- package/dist/mcp.js.map +1 -1
- package/dist/model.d.ts +3 -0
- package/dist/model.d.ts.map +1 -0
- package/dist/model.js +3 -0
- package/dist/model.js.map +1 -0
- 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/assessment.d.ts +8 -0
- package/dist/validate/assessment.d.ts.map +1 -0
- package/dist/validate/assessment.js +1738 -0
- package/dist/validate/assessment.js.map +1 -0
- package/dist/validate/builtin/access.d.ts +55 -0
- package/dist/validate/builtin/access.d.ts.map +1 -0
- package/dist/validate/builtin/access.js +494 -0
- package/dist/validate/builtin/access.js.map +1 -0
- package/dist/validate/builtin/daylight.d.ts +44 -0
- package/dist/validate/builtin/daylight.d.ts.map +1 -0
- package/dist/validate/builtin/daylight.js +233 -0
- package/dist/validate/builtin/daylight.js.map +1 -0
- package/dist/validate/builtin/door-column-collisions.d.ts +47 -0
- package/dist/validate/builtin/door-column-collisions.d.ts.map +1 -0
- package/dist/validate/builtin/door-column-collisions.js +189 -0
- package/dist/validate/builtin/door-column-collisions.js.map +1 -0
- package/dist/validate/builtin/envelope.d.ts +30 -0
- package/dist/validate/builtin/envelope.d.ts.map +1 -0
- package/dist/validate/builtin/envelope.js +169 -0
- package/dist/validate/builtin/envelope.js.map +1 -0
- package/dist/validate/builtin/freeze.d.ts +3 -0
- package/dist/validate/builtin/freeze.d.ts.map +1 -0
- package/dist/validate/builtin/freeze.js +21 -0
- package/dist/validate/builtin/freeze.js.map +1 -0
- package/dist/validate/builtin/index.d.ts +38 -0
- package/dist/validate/builtin/index.d.ts.map +1 -0
- package/dist/validate/builtin/index.js +106 -0
- package/dist/validate/builtin/index.js.map +1 -0
- package/dist/validate/builtin/site.d.ts +62 -0
- package/dist/validate/builtin/site.d.ts.map +1 -0
- package/dist/validate/builtin/site.js +333 -0
- package/dist/validate/builtin/site.js.map +1 -0
- package/dist/validate/builtin/vertical-runs.d.ts +53 -0
- package/dist/validate/builtin/vertical-runs.d.ts.map +1 -0
- package/dist/validate/builtin/vertical-runs.js +290 -0
- package/dist/validate/builtin/vertical-runs.js.map +1 -0
- package/dist/validate/contracts.d.ts +188 -0
- package/dist/validate/contracts.d.ts.map +1 -0
- package/dist/validate/contracts.js +28 -0
- package/dist/validate/contracts.js.map +1 -0
- package/dist/validate/index.d.ts +2 -59
- package/dist/validate/index.d.ts.map +1 -1
- package/dist/validate/index.js +22 -70
- package/dist/validate/index.js.map +1 -1
- package/dist/vocabulary.d.ts +2 -0
- package/dist/vocabulary.d.ts.map +1 -0
- package/dist/vocabulary.js +3 -0
- package/dist/vocabulary.js.map +1 -0
- 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 +41 -9
- package/src/analysis/contracts.ts +234 -0
- package/src/analysis/index.ts +61 -0
- package/src/analysis/json.ts +117 -0
- package/src/cli.ts +116 -36
- 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 +19 -2
- package/src/core/tolerance.ts +2 -2
- package/src/core/vertical.ts +10 -3
- package/src/core/vocabulary.ts +18 -5
- package/src/diagnostics.ts +8 -0
- package/src/diff.ts +14 -0
- package/src/draw/index.ts +1 -1
- package/src/draw/plan.ts +5 -5
- package/src/form.ts +37 -0
- package/src/graph.ts +12 -0
- package/src/index.ts +40 -175
- package/src/mcp.ts +85 -35
- package/src/model.ts +43 -0
- package/src/parse-file.ts +17 -3
- package/src/validate/assessment.ts +1934 -0
- package/src/validate/builtin/access.ts +642 -0
- package/src/validate/builtin/daylight.ts +321 -0
- package/src/validate/builtin/door-column-collisions.ts +266 -0
- package/src/validate/builtin/envelope.ts +227 -0
- package/src/validate/builtin/freeze.ts +19 -0
- package/src/validate/builtin/index.ts +156 -0
- package/src/validate/builtin/site.ts +445 -0
- package/src/validate/builtin/vertical-runs.ts +390 -0
- package/src/validate/contracts.ts +240 -0
- package/src/validate/index.ts +45 -99
- package/src/vocabulary.ts +9 -0
- package/dist/validate/access.d.ts +0 -6
- package/dist/validate/access.d.ts.map +0 -1
- package/dist/validate/access.js +0 -238
- package/dist/validate/access.js.map +0 -1
- package/dist/validate/envelope.d.ts +0 -4
- package/dist/validate/envelope.d.ts.map +0 -1
- package/dist/validate/envelope.js +0 -55
- package/dist/validate/envelope.js.map +0 -1
- package/dist/validate/light.d.ts +0 -6
- package/dist/validate/light.d.ts.map +0 -1
- package/dist/validate/light.js +0 -28
- package/dist/validate/light.js.map +0 -1
- package/dist/validate/runs.d.ts +0 -16
- package/dist/validate/runs.d.ts.map +0 -1
- package/dist/validate/runs.js +0 -60
- package/dist/validate/runs.js.map +0 -1
- package/dist/validate/site.d.ts +0 -6
- package/dist/validate/site.d.ts.map +0 -1
- package/dist/validate/site.js +0 -63
- package/dist/validate/site.js.map +0 -1
- 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
- package/src/validate/access.ts +0 -279
- package/src/validate/envelope.ts +0 -59
- package/src/validate/light.ts +0 -43
- package/src/validate/runs.ts +0 -87
- package/src/validate/site.ts +0 -84
package/src/core/poly.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// koyu — 凸片の幾何 (ADR-0022 /
|
|
1
|
+
// koyu — 凸片の幾何 (ADR-0022 / docs/reference/form/index.md)
|
|
2
2
|
//
|
|
3
3
|
// 空間の形は**凸片の集合** (`Pt[][]`) である (ADR-0022)。矩形はその入口の綴りにすぎない。
|
|
4
4
|
// この層が存在しなかったあいだ、面積・被覆・切り分けの計算が model / graph / fabric /
|
|
@@ -110,9 +110,6 @@ export function splitByRect(pieces: Pt[][], w: Rect): { inside: Pt[][]; outside:
|
|
|
110
110
|
return { inside, outside };
|
|
111
111
|
}
|
|
112
112
|
|
|
113
|
-
/** 軸平行の窓の内側だけ */
|
|
114
|
-
export const clipToRect = (poly: Pt[], w: Rect): Pt[] => splitByRect([poly], w).inside[0] ?? [];
|
|
115
|
-
|
|
116
113
|
/**
|
|
117
114
|
* 凸片から凸片群を引く (差集合)。結果も凸片の集合。
|
|
118
115
|
*
|
|
@@ -168,10 +165,6 @@ export function unionArea(pieces: Pt[][]): number {
|
|
|
168
165
|
return total;
|
|
169
166
|
}
|
|
170
167
|
|
|
171
|
-
/** 凸片の集合から凸片群を引く */
|
|
172
|
-
export const subtractAll = (pieces: Pt[][], covers: Pt[][]): Pt[][] =>
|
|
173
|
-
pieces.flatMap((p) => subtract(p, covers));
|
|
174
|
-
|
|
175
168
|
// ---- 窓 (どの範囲で測り、どの範囲を切るか) ----
|
|
176
169
|
|
|
177
170
|
/**
|
package/src/core/site.ts
CHANGED
|
@@ -8,7 +8,6 @@ import { segmentLength, segmentsFor } from "./graph.js";
|
|
|
8
8
|
import {
|
|
9
9
|
areaM2,
|
|
10
10
|
isIndoor,
|
|
11
|
-
isSemiOutdoor,
|
|
12
11
|
polygonAreaM2,
|
|
13
12
|
regionOf,
|
|
14
13
|
unionAreaM2,
|
|
@@ -16,6 +15,7 @@ import {
|
|
|
16
15
|
type SitePolygon,
|
|
17
16
|
type Space,
|
|
18
17
|
type Zone,
|
|
18
|
+
isOutside
|
|
19
19
|
} from "./model.js";
|
|
20
20
|
|
|
21
21
|
export interface RoadFrontage {
|
|
@@ -38,6 +38,15 @@ export interface SiteReport {
|
|
|
38
38
|
footprint: number;
|
|
39
39
|
/** 延べ面積 m² (屋内床面積の合計) */
|
|
40
40
|
totalFloor: number;
|
|
41
|
+
/** 面積率の分母 — 宣言があれば宣言、無ければ導出 */
|
|
42
|
+
areaBasis: number;
|
|
43
|
+
/**
|
|
44
|
+
* 建蔽率 % (建築面積 ÷ 分母、小数第1位)。分母が 0 なら `undefined`。
|
|
45
|
+
* **数であって合否ではない** — 指定建蔽率と比べるのは規則の側の仕事である
|
|
46
|
+
*/
|
|
47
|
+
coveragePercent?: number;
|
|
48
|
+
/** 容積率 % (延べ面積 ÷ 分母、小数第1位)。分母が 0 なら `undefined` */
|
|
49
|
+
floorAreaRatioPercent?: number;
|
|
41
50
|
roads: RoadFrontage[];
|
|
42
51
|
}
|
|
43
52
|
|
|
@@ -67,7 +76,7 @@ export function siteReport(model: Model): SiteReport {
|
|
|
67
76
|
// 建物の外壁が道路に面していても、それは接道ではない
|
|
68
77
|
const roads: RoadFrontage[] = [];
|
|
69
78
|
for (const road of spaces) {
|
|
70
|
-
if (road
|
|
79
|
+
if (!isOutside(road) || typeof road.attrs["road"] !== "number") continue;
|
|
71
80
|
let frontage = 0;
|
|
72
81
|
for (const b of model.boundaries) {
|
|
73
82
|
const otherPath = b.a === road.path ? b.b : b.b === road.path ? b.a : undefined;
|
|
@@ -78,6 +87,11 @@ export function siteReport(model: Model): SiteReport {
|
|
|
78
87
|
roads.push({ road, width: road.attrs["road"], frontage: Math.round(frontage) });
|
|
79
88
|
}
|
|
80
89
|
|
|
90
|
+
// 面積率は一箇所でだけ丸める。CLI・MCP・規則が各々で割れば、いずれ片方だけがずれる
|
|
91
|
+
const areaBasis = typeof declared === "number" ? declared : derivedArea;
|
|
92
|
+
const percent = (part: number): number | undefined =>
|
|
93
|
+
areaBasis === 0 ? undefined : Math.round((part / areaBasis) * 1000) / 10;
|
|
94
|
+
|
|
81
95
|
return {
|
|
82
96
|
...(siteZone ? { siteZone } : {}),
|
|
83
97
|
...(polygon ? { polygon } : {}),
|
|
@@ -85,6 +99,9 @@ export function siteReport(model: Model): SiteReport {
|
|
|
85
99
|
derivedArea,
|
|
86
100
|
footprint,
|
|
87
101
|
totalFloor,
|
|
102
|
+
areaBasis,
|
|
103
|
+
...(percent(footprint) !== undefined ? { coveragePercent: percent(footprint) } : {}),
|
|
104
|
+
...(percent(totalFloor) !== undefined ? { floorAreaRatioPercent: percent(totalFloor) } : {}),
|
|
88
105
|
roads,
|
|
89
106
|
};
|
|
90
107
|
}
|
package/src/core/tolerance.ts
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
// あいだ、`poly.ts` の EPS と `graph.ts` の EPS は同じ 0.5 を別々に持ち、`vertical.ts` は
|
|
7
7
|
// 1 を四箇所に直値で書き、`drawnShare` は軸平行の判定に graph の EPS ではなく直値の 0.5 を
|
|
8
8
|
// 使っていた。どれも同じ値なので事故は起きていないが、**一つを動かしたときに何が動くのかを
|
|
9
|
-
// 誰も言えない**状態だった。許容値は導出の規則の一部であり (
|
|
9
|
+
// 誰も言えない**状態だった。許容値は導出の規則の一部であり (docs/reference/form/index.md)、
|
|
10
10
|
// 規則が消費者ごとに違えば同じ原本から違う建物が出る。
|
|
11
11
|
//
|
|
12
12
|
// 座標は mm の整数が基本である。だから長さの許容は 0.5mm — 「これより細かい差は同一」の線が、
|
|
@@ -41,7 +41,7 @@ export const PARALLEL_EPS = 1e-9;
|
|
|
41
41
|
export const POINT_EPS = 1;
|
|
42
42
|
|
|
43
43
|
/**
|
|
44
|
-
* 許容値の台帳。**
|
|
44
|
+
* 許容値の台帳。**docs/reference/form/index.md の表の唯一の出所である** —
|
|
45
45
|
* `test/derive.test.ts` が表とここの一致を縛る。
|
|
46
46
|
*/
|
|
47
47
|
export const TOLERANCES: Readonly<Record<string, number>> = {
|
package/src/core/vertical.ts
CHANGED
|
@@ -37,6 +37,13 @@ export const STEP_MARK = 400;
|
|
|
37
37
|
export const TREAD_SOLID = 200;
|
|
38
38
|
/** 斜路・エスカレーター床版の厚さ mm */
|
|
39
39
|
export const SLAB_T = 200;
|
|
40
|
+
/**
|
|
41
|
+
* The shortest visible run interval that still carries a direction arrow, in mm.
|
|
42
|
+
*
|
|
43
|
+
* Below this the arrow would be longer than what it points along. The comparison is strict, so an
|
|
44
|
+
* interval of exactly this length carries none.
|
|
45
|
+
*/
|
|
46
|
+
export const ARROW_SPAN_MIN = 900;
|
|
40
47
|
|
|
41
48
|
/** 走りと踊り場の一区間。局所座標は t (走り方向) と s (進行方向の左からの幅) */
|
|
42
49
|
export interface RunPart {
|
|
@@ -509,7 +516,7 @@ export interface Seg2 {
|
|
|
509
516
|
|
|
510
517
|
/**
|
|
511
518
|
* 進む向きを指す線分。**文字列は持たない** — "UP" と "DN" は言葉であって形ではない
|
|
512
|
-
* (
|
|
519
|
+
* (docs/reference/scope.md)。この面で人が上るかどうかを `up` が言い、注記は描画側が組む
|
|
513
520
|
*/
|
|
514
521
|
export interface RunArrow extends Seg2 {
|
|
515
522
|
/** この面でこの走りを進むと上るか */
|
|
@@ -518,7 +525,7 @@ export interface RunArrow extends Seg2 {
|
|
|
518
525
|
|
|
519
526
|
/**
|
|
520
527
|
* そのレベルで切った縦動線の作図。平面図とビュアーが共有する唯一の答え。
|
|
521
|
-
* **色も線種も注記文字列も持たない** (
|
|
528
|
+
* **色も線種も注記文字列も持たない** (docs/reference/scope.md / docs/reference/form/index.md)
|
|
522
529
|
*/
|
|
523
530
|
export interface RunDraw {
|
|
524
531
|
path: string;
|
|
@@ -695,7 +702,7 @@ function drawRun(
|
|
|
695
702
|
const isFirst = i === run.parts.findIndex((q) => q.kind === "flight");
|
|
696
703
|
const isLast = i === run.parts.map((q) => q.kind).lastIndexOf("flight");
|
|
697
704
|
const wantArrow = run.device === "escalator" ? true : dir === "up" ? isFirst : isLast;
|
|
698
|
-
if (wantArrow && hi - lo >
|
|
705
|
+
if (wantArrow && hi - lo > ARROW_SPAN_MIN) {
|
|
699
706
|
const c = (p.s0 + p.s1) / 2;
|
|
700
707
|
// **矢印は人の進む向きだけから決まる。**reversed が「t の減る向きに進む」、
|
|
701
708
|
// 昇り降りは進む先の高さで決まる。エスカレーターは機械の向きが固定なので
|
package/src/core/vocabulary.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
// koyu core — 属性の台帳 (
|
|
1
|
+
// koyu core — 属性の台帳 (docs/reference/muro/attributes.md の写しであり、実装の唯一の出所)
|
|
2
2
|
//
|
|
3
|
-
// # 属性の三層 (
|
|
3
|
+
// # 属性の三層 (docs/reference/scope.md)
|
|
4
4
|
//
|
|
5
|
-
// 構造 (structure)
|
|
5
|
+
// 構造 (structure) パス・区画・レベル・関係の相手・kind。**必ず見る**。
|
|
6
|
+
// 空間の**型は入らない** — 自由なラベルであり core は読まない (ADR-0051)
|
|
6
7
|
// parse が typed field へ持ち上げるので、check の時点では attrs に残らない
|
|
7
8
|
// 解釈 (interpreted) 台帳が値域を定義し、**見る**。h / at / daylight / road / style …
|
|
8
9
|
// 運搬 (carry) **見ない。**運ぶだけ。spec / fire / sound / floor / sill …
|
|
@@ -71,10 +72,22 @@ export const ATTR_LEDGER: Record<string, Record<string, AttrSpec>> = {
|
|
|
71
72
|
level: structure(), // 所属レベルの明示 (メゾネット)
|
|
72
73
|
w: structure(), // 帯 (band) の要素の寸法。帯の外には書けない
|
|
73
74
|
|
|
75
|
+
// 構成の事実 — **core が空間について読む語は、この二つだけである**
|
|
76
|
+
//
|
|
77
|
+
// かつては型の位置に `exterior` `void` と書いた。型の位置は開かれた語彙なので、
|
|
78
|
+
// `exteriorr` の一字が外部を屋内に変え、実測で延床が 16.20㎡ から 32.40㎡ へ倍増しながら
|
|
79
|
+
// check は緑だった。守りは二語の編集距離1だけを拒むヒューリスティックで、
|
|
80
|
+
// `void` の距離2には `road` と `wood` — 人が正当に書く語 — が入るので広げられなかった。
|
|
81
|
+
//
|
|
82
|
+
// 台帳へ移せば、綴りを守るのは ATT03 (未知のキー) と ATT02 (値域) になる。
|
|
83
|
+
// 開かれた語彙は殺さない — 型の位置は今や完全に自由で、core はそこを一切読まない。
|
|
84
|
+
outside: one(0, 1), // 1 = 建物の外部。延べ面積に算入せず、領域が無くてよく、接道の相手になる
|
|
85
|
+
void: one(0, 1), // 1 = 吹抜け。床が無いので延べ面積に算入せず、床も張られない
|
|
86
|
+
|
|
74
87
|
// 解釈 — core が読む
|
|
75
88
|
h: num(), // 天井高 mm。高さ不変量と矩計が読む
|
|
76
89
|
use: free(), // 集計軸。zone から継承
|
|
77
|
-
road: num(), //
|
|
90
|
+
road: num(), // outside:1 の幅員 mm。接道の導出
|
|
78
91
|
daylight: free(), // 採光の問いの対象 (ADR-0020)。値域は DAY01 が守るので台帳では重ねない
|
|
79
92
|
ceiling: one(0, 1), // 0 = 天井を張らない (ADR-0024)
|
|
80
93
|
uid: free(), // 永続同一性トークン (ADR-0015)。UID01-03 が守る
|
|
@@ -135,7 +148,7 @@ export const ATTR_LEDGER: Record<string, Record<string, AttrSpec>> = {
|
|
|
135
148
|
|
|
136
149
|
// 解釈
|
|
137
150
|
style: one("hinged", "sliding", "auto"), // 平面の建具表現が変わる
|
|
138
|
-
name: free(), // **境界の中で一意な名** — 開口の同一性の鍵 (
|
|
151
|
+
name: free(), // **境界の中で一意な名** — 開口の同一性の鍵 (docs/reference/scope.md)
|
|
139
152
|
|
|
140
153
|
// 運搬
|
|
141
154
|
sill: carry(), // 窓台高
|
package/src/diff.ts
ADDED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
// Public semantic-diff surface. Text rendering remains a presentation concern.
|
|
2
|
+
|
|
3
|
+
export {
|
|
4
|
+
semanticDiff,
|
|
5
|
+
type BoundaryChange,
|
|
6
|
+
type BoundaryItem,
|
|
7
|
+
type ChangedItem,
|
|
8
|
+
type ColumnItem,
|
|
9
|
+
type FieldChange,
|
|
10
|
+
type GridChange,
|
|
11
|
+
type ModelDiff,
|
|
12
|
+
type RenamedItem,
|
|
13
|
+
type SpaceItem,
|
|
14
|
+
} from "./core/diff.js";
|
package/src/draw/index.ts
CHANGED
package/src/draw/plan.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// **ここに形の規則は一つも無い。**壁の厚みも、開口の位置も、扉の吊元も、階段がどこで
|
|
4
4
|
// 切れるかも、`derive(model)` が返す `Form` に既に入っている (ADR-0040)。この頁が持つのは
|
|
5
5
|
// 色・線種・線幅・書体・記号・注記の言葉・縮尺・紙面の余白 — すべて**見た目**であり、
|
|
6
|
-
// 消費者ごとに違ってよいものである (
|
|
6
|
+
// 消費者ごとに違ってよいものである (docs/reference/scope.md)。
|
|
7
7
|
//
|
|
8
8
|
// 形と見た目の線引きはこうである。境界線分の座標・壁の厚み・開口で割られた区間・
|
|
9
9
|
// 扉の軌跡の中心と半径と掃き方向・切断面を跨ぐ位置は Form が持つ。1/4円を破線で描くか、
|
|
@@ -79,7 +79,7 @@ export function svgPlan(model: Model, opts: PlanOptions = {}): string {
|
|
|
79
79
|
// 空間の面 — 切断面が気積を切った姿。同色・輪郭なしなのでL字も切られた形も一体に見える。
|
|
80
80
|
// 半屋外は淡く塗り分け、屋外であることが図から読めるように
|
|
81
81
|
for (const s of rooms) {
|
|
82
|
-
const isVoid = s.
|
|
82
|
+
const isVoid = s.void;
|
|
83
83
|
for (const poly of s.outline) {
|
|
84
84
|
parts.push(fill(poly, isVoid ? PAPER : s.semiOutdoor ? "#f8f5ec" : ROOM));
|
|
85
85
|
if (isVoid) {
|
|
@@ -160,7 +160,7 @@ export function svgPlan(model: Model, opts: PlanOptions = {}): string {
|
|
|
160
160
|
for (const g of form.segs) {
|
|
161
161
|
if (g.level !== level) continue;
|
|
162
162
|
parts.push(fill(band(g.segment, g.cx, g.cy, g.w, g.t), "#77716a"));
|
|
163
|
-
// `g.boundary` は **Form の境界の添字 = 正準順の添字**である (
|
|
163
|
+
// `g.boundary` は **Form の境界の添字 = 正準順の添字**である (docs/reference/form/index.md)。
|
|
164
164
|
// 宣言順の配列を引くと、宣言順を入れ替えただけで注記が別の境界のものになる
|
|
165
165
|
const spec = ordered[g.boundary]?.segs[g.index]?.attrs["spec"];
|
|
166
166
|
if (typeof spec === "string") {
|
|
@@ -246,9 +246,9 @@ export function svgPlan(model: Model, opts: PlanOptions = {}): string {
|
|
|
246
246
|
const cx = sx((r.x1 + r.x2) / 2);
|
|
247
247
|
const cy = sy((r.y1 + r.y2) / 2);
|
|
248
248
|
const sub =
|
|
249
|
-
s.
|
|
249
|
+
s.void
|
|
250
250
|
? "void"
|
|
251
|
-
: `${esc(s.type)} · ${s.areaM2} m2${s.semiOutdoor ? " · semi-outdoor" : ""}`;
|
|
251
|
+
: `${s.type ? `${esc(s.type)} · ` : ""}${s.areaM2} m2${s.semiOutdoor ? " · semi-outdoor" : ""}`;
|
|
252
252
|
parts.push(
|
|
253
253
|
`<text x="${cx}" y="${cy - 4}" text-anchor="middle" font-size="14" fill="${INK}">${esc(displayName(space))}</text>`,
|
|
254
254
|
`<text x="${cx}" y="${cy + 13}" text-anchor="middle" font-size="10" fill="#8a8171">${sub}</text>`,
|
package/src/form.ts
ADDED
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
// Public Form surface. derive() is the only public operation that assembles shape.
|
|
2
|
+
|
|
3
|
+
export {
|
|
4
|
+
derive,
|
|
5
|
+
DERIVATION_CONSTANTS,
|
|
6
|
+
type DeriveOptions,
|
|
7
|
+
type Form,
|
|
8
|
+
type FormBoundary,
|
|
9
|
+
type FormColumn,
|
|
10
|
+
type FormInput,
|
|
11
|
+
type FormLevel,
|
|
12
|
+
type FormOpening,
|
|
13
|
+
type FormPanel,
|
|
14
|
+
type FormPlan,
|
|
15
|
+
type FormRun,
|
|
16
|
+
type FormSeg,
|
|
17
|
+
type FormSite,
|
|
18
|
+
type FormSpace,
|
|
19
|
+
type FormSwing,
|
|
20
|
+
type PlanClass,
|
|
21
|
+
type PlanEntity,
|
|
22
|
+
type PlanRole,
|
|
23
|
+
type PlanSubject,
|
|
24
|
+
} from "./core/derive.js";
|
|
25
|
+
|
|
26
|
+
export { TOLERANCES } from "./core/tolerance.js";
|
|
27
|
+
|
|
28
|
+
export type { Slab, SlabKind } from "./core/fabric.js";
|
|
29
|
+
|
|
30
|
+
export type {
|
|
31
|
+
RunDevice,
|
|
32
|
+
RunForm,
|
|
33
|
+
RunPart,
|
|
34
|
+
RunSolid,
|
|
35
|
+
Seg2,
|
|
36
|
+
VerticalRun,
|
|
37
|
+
} from "./core/vertical.js";
|
package/src/graph.ts
ADDED
package/src/index.ts
CHANGED
|
@@ -1,190 +1,55 @@
|
|
|
1
|
-
// koyu —
|
|
1
|
+
// koyu — the root surface (`@kensnzk/koyu`)
|
|
2
2
|
//
|
|
3
|
-
//
|
|
4
|
-
// export
|
|
5
|
-
//
|
|
3
|
+
// **Only the names written down here are promised.** `export *` is never used: the moment a
|
|
4
|
+
// module gains an export, a promise nobody declared would freeze into the surface. A surface
|
|
5
|
+
// that freezes has to be written out by hand (docs/reference/scope.md).
|
|
6
6
|
//
|
|
7
|
-
//
|
|
8
|
-
//
|
|
9
|
-
//
|
|
10
|
-
//
|
|
11
|
-
//
|
|
12
|
-
//
|
|
13
|
-
//
|
|
14
|
-
//
|
|
7
|
+
// **root is not a shorthand for every subpath.** What lives here is the minimum needed to begin
|
|
8
|
+
// the standard loop — read a `.muro`, confirm it is not self-contradictory, and take the
|
|
9
|
+
// canonical form — plus the types those signatures cannot be written without. Domain names
|
|
10
|
+
// (`model`, `graph`, `form`, `analysis`, `validate`, `draw`, `node`) are **not** re-exported
|
|
11
|
+
// from here. A caller who needs a domain names that domain, and the import line then says which
|
|
12
|
+
// contract is being relied on: the face that freezes, the face that computes from external
|
|
13
|
+
// conditions, the face that concludes, the presentation that may change freely, and the
|
|
14
|
+
// Node-specific adapter never get mixed together.
|
|
15
15
|
//
|
|
16
|
-
//
|
|
16
|
+
// root is browser-safe: nothing reachable from here pulls a Node builtin.
|
|
17
|
+
//
|
|
18
|
+
// The twelve entry points:
|
|
19
|
+
//
|
|
20
|
+
// @kensnzk/koyu this file — compose, check, canonicalise
|
|
21
|
+
// @kensnzk/koyu/model Model, and the questions the model answers alone
|
|
22
|
+
// @kensnzk/koyu/diagnostics structural-consistency diagnostics
|
|
23
|
+
// @kensnzk/koyu/graph adjacency, passability, routes, boundary segments
|
|
24
|
+
// @kensnzk/koyu/form the one derivation of shape
|
|
25
|
+
// @kensnzk/koyu/analysis facts made under an explicit context and profile
|
|
26
|
+
// @kensnzk/koyu/diff the semantic difference between two models
|
|
27
|
+
// @kensnzk/koyu/vocabulary the attribute ledger
|
|
28
|
+
// @kensnzk/koyu/validate the rule SPI, the runner, AssessmentReport
|
|
29
|
+
// @kensnzk/koyu/validate/builtin the rules, rule set and profile koyu ships
|
|
30
|
+
// @kensnzk/koyu/draw presentation of the Form
|
|
31
|
+
// @kensnzk/koyu/node filesystem and other Node-specific adapters
|
|
32
|
+
//
|
|
33
|
+
// This list and the table in docs/reference/api/index.md agree as sets — test/public-api.test.ts
|
|
34
|
+
// binds them.
|
|
17
35
|
|
|
18
|
-
// ---- 解析と合成 (
|
|
36
|
+
// ---- 解析と合成 (docs/reference/muro/import.md) ----
|
|
19
37
|
export { parse, parseFiles, parseWith, tokenize, type LayerLoader } from "./core/parse.js";
|
|
20
38
|
|
|
21
|
-
// ----
|
|
22
|
-
export type {
|
|
23
|
-
Area,
|
|
24
|
-
Asset,
|
|
25
|
-
Attrs,
|
|
26
|
-
AttrValue,
|
|
27
|
-
Boundary,
|
|
28
|
-
BoundaryKind,
|
|
29
|
-
Column,
|
|
30
|
-
ColumnDecl,
|
|
31
|
-
DrawnLine,
|
|
32
|
-
Edge,
|
|
33
|
-
GridAxis,
|
|
34
|
-
GridRef,
|
|
35
|
-
Level,
|
|
36
|
-
Model,
|
|
37
|
-
Opening,
|
|
38
|
-
Pt,
|
|
39
|
-
Rect,
|
|
40
|
-
Seg,
|
|
41
|
-
SitePolygon,
|
|
42
|
-
Space,
|
|
43
|
-
Zone,
|
|
44
|
-
} from "./core/model.js";
|
|
45
|
-
|
|
46
|
-
// ---- モデルへの問い・導出・機械形式 ----
|
|
47
|
-
// **合否は言わない** (spec/scope.md §4)。数と形を返すところまでが core である
|
|
48
|
-
export {
|
|
49
|
-
areaM2,
|
|
50
|
-
canonicalBoundaryOrder,
|
|
51
|
-
columnsFor,
|
|
52
|
-
DEFAULT_LANGUAGE_VERSION,
|
|
53
|
-
displayName,
|
|
54
|
-
effectiveUse,
|
|
55
|
-
heff,
|
|
56
|
-
isCoveredAbove,
|
|
57
|
-
isIndoor,
|
|
58
|
-
isSemiOutdoor,
|
|
59
|
-
levelsSorted,
|
|
60
|
-
newUids,
|
|
61
|
-
pointInPolygon,
|
|
62
|
-
polyBounds,
|
|
63
|
-
polygonAreaM2,
|
|
64
|
-
rectToPoly,
|
|
65
|
-
SourceError,
|
|
66
|
-
srcRef,
|
|
67
|
-
SUPPORTED_LANGUAGE_VERSIONS,
|
|
68
|
-
toCanonical,
|
|
69
|
-
unionAreaM2,
|
|
70
|
-
zoneAreaM2,
|
|
71
|
-
} from "./core/model.js";
|
|
72
|
-
|
|
73
|
-
// ---- 構造整合の診断 (ADR-0016) ----
|
|
39
|
+
// ---- 構造整合の確認 — **合否は言わない。**書かれたものが矛盾していないかまで ----
|
|
74
40
|
export {
|
|
75
41
|
check,
|
|
76
42
|
checkDiagnostics,
|
|
77
|
-
DIAGNOSTIC_CODES,
|
|
78
43
|
type CheckResult,
|
|
79
44
|
type Diagnostic,
|
|
80
45
|
type DiagnosticCode,
|
|
81
46
|
} from "./core/diagnose.js";
|
|
82
47
|
|
|
83
|
-
// ----
|
|
48
|
+
// ---- 機械形式と、版 ----
|
|
84
49
|
export {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
placeOpening,
|
|
92
|
-
segmentsFor,
|
|
93
|
-
type Band,
|
|
94
|
-
type BandCode,
|
|
95
|
-
type BandError,
|
|
96
|
-
type NeighborInfo,
|
|
97
|
-
type PlacedBand,
|
|
98
|
-
type Route,
|
|
99
|
-
type Segment,
|
|
100
|
-
} from "./core/graph.js";
|
|
101
|
-
|
|
102
|
-
// ---- 形の参照実装 (ADR-0040) — **これが形の唯一の入口である** ----
|
|
103
|
-
// Form は見た目を持たない (spec/scope.md §6)。規則は spec/derivation.md が持つ
|
|
104
|
-
// 実体の構成子 (thicken / bandLine / band / columnRect / runPrism) も core が唯一の実装を
|
|
105
|
-
// 持つ — 芯線と厚みから四辺形や角柱を起こす規則も導出の一部だからである
|
|
106
|
-
export {
|
|
107
|
-
band,
|
|
108
|
-
bandLine,
|
|
109
|
-
columnRect,
|
|
110
|
-
derive,
|
|
111
|
-
DERIVATION_CONSTANTS,
|
|
112
|
-
levelPitch,
|
|
113
|
-
runPrism,
|
|
114
|
-
thicken,
|
|
115
|
-
type DeriveOptions,
|
|
116
|
-
type Form,
|
|
117
|
-
type FormBoundary,
|
|
118
|
-
type FormColumn,
|
|
119
|
-
type FormInput,
|
|
120
|
-
type FormLevel,
|
|
121
|
-
type FormOpening,
|
|
122
|
-
type FormPanel,
|
|
123
|
-
type FormPlan,
|
|
124
|
-
type FormPrism,
|
|
125
|
-
type FormRun,
|
|
126
|
-
type FormSeg,
|
|
127
|
-
type FormSite,
|
|
128
|
-
type FormSpace,
|
|
129
|
-
type FormSwing,
|
|
130
|
-
type PlanClass,
|
|
131
|
-
type PlanEntity,
|
|
132
|
-
type PlanRole,
|
|
133
|
-
type PlanSubject,
|
|
134
|
-
} from "./core/derive.js";
|
|
135
|
-
export { TOLERANCES } from "./core/tolerance.js";
|
|
136
|
-
|
|
137
|
-
// ---- 床・天井・屋根 (ADR-0024) ----
|
|
138
|
-
export { slabs, type Slab, type SlabKind } from "./core/fabric.js";
|
|
139
|
-
|
|
140
|
-
// ---- 採光の入力 (ADR-0020) ----
|
|
141
|
-
export { daylightInputs, type DaylightInput } from "./core/light.js";
|
|
142
|
-
|
|
143
|
-
// ---- 縦動線 (ADR-0021) ----
|
|
144
|
-
export {
|
|
145
|
-
runDrawsForLevel,
|
|
146
|
-
runSolids,
|
|
147
|
-
slopeText,
|
|
148
|
-
verticalRuns,
|
|
149
|
-
type RunArrow,
|
|
150
|
-
type RunDevice,
|
|
151
|
-
type RunDraw,
|
|
152
|
-
type RunForm,
|
|
153
|
-
type RunPart,
|
|
154
|
-
type RunSolid,
|
|
155
|
-
type Seg2,
|
|
156
|
-
type VerticalRun,
|
|
157
|
-
} from "./core/vertical.js";
|
|
158
|
-
|
|
159
|
-
// ---- 敷地 (ADR-0009 / ADR-0011) ----
|
|
160
|
-
export { siteReport, type RoadFrontage, type SiteReport } from "./core/site.js";
|
|
161
|
-
|
|
162
|
-
// ---- 構成の言葉の差分 (ADR-0018) ----
|
|
163
|
-
export {
|
|
164
|
-
renderDiff,
|
|
165
|
-
semanticDiff,
|
|
166
|
-
type BoundaryChange,
|
|
167
|
-
type BoundaryItem,
|
|
168
|
-
type ChangedItem,
|
|
169
|
-
type ColumnItem,
|
|
170
|
-
type FieldChange,
|
|
171
|
-
type GridChange,
|
|
172
|
-
type ModelDiff,
|
|
173
|
-
type RenamedItem,
|
|
174
|
-
type SpaceItem,
|
|
175
|
-
} from "./core/diff.js";
|
|
176
|
-
|
|
177
|
-
// ---- 生成 — **凍らない** (spec/scope.md §8)。SVGの中身は約束の外にある ----
|
|
178
|
-
// 領域としては `@kensnzk/koyu/draw` にも分けてある
|
|
179
|
-
export { svgPlan, type PlanOptions } from "./draw/plan.js";
|
|
180
|
-
export { svgAxo, type AxoOptions } from "./draw/axo.js";
|
|
181
|
-
|
|
182
|
-
// ---- 検証 — **core ではない。**凍らない・増える・合否を言う (spec/scope.md §3) ----
|
|
183
|
-
// Finding は Diagnostic と別の型で、フィールド名から違う (rule/level と code/severity)。
|
|
184
|
-
// 領域としては `@kensnzk/koyu/validate` にも分けてある
|
|
185
|
-
export {
|
|
186
|
-
validate,
|
|
187
|
-
VALIDATION_RULES,
|
|
188
|
-
type Finding,
|
|
189
|
-
type ValidationRule,
|
|
190
|
-
} from "./validate/index.js";
|
|
50
|
+
DEFAULT_LANGUAGE_VERSION,
|
|
51
|
+
SourceError,
|
|
52
|
+
SUPPORTED_LANGUAGE_VERSIONS,
|
|
53
|
+
toCanonical,
|
|
54
|
+
type Model,
|
|
55
|
+
} from "./core/model.js";
|