@kensnzk/koyu 0.5.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.ja.md +43 -11
- package/README.md +51 -11
- package/dist/check.d.ts +34 -0
- package/dist/check.d.ts.map +1 -0
- package/dist/check.js +500 -0
- package/dist/check.js.map +1 -0
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +319 -0
- package/dist/cli.js.map +1 -0
- package/dist/diff.d.ts +90 -0
- package/dist/diff.d.ts.map +1 -0
- package/dist/diff.js +522 -0
- package/dist/diff.js.map +1 -0
- package/dist/graph.d.ts +81 -0
- package/dist/graph.d.ts.map +1 -0
- package/dist/graph.js +328 -0
- package/dist/graph.js.map +1 -0
- package/dist/index.d.ts +9 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +10 -0
- package/dist/index.js.map +1 -0
- package/dist/light.d.ts +15 -0
- package/dist/light.d.ts.map +1 -0
- package/dist/light.js +55 -0
- package/dist/light.js.map +1 -0
- package/dist/mcp.d.ts +3 -0
- package/dist/mcp.d.ts.map +1 -0
- package/dist/mcp.js +354 -0
- package/dist/mcp.js.map +1 -0
- package/dist/model.d.ts +264 -0
- package/dist/model.d.ts.map +1 -0
- package/dist/model.js +361 -0
- package/dist/model.js.map +1 -0
- package/dist/parse-file.d.ts +9 -0
- package/dist/parse-file.d.ts.map +1 -0
- package/dist/parse-file.js +22 -0
- package/dist/parse-file.js.map +1 -0
- package/dist/parse.d.ts +16 -0
- package/dist/parse.d.ts.map +1 -0
- package/dist/parse.js +922 -0
- package/dist/parse.js.map +1 -0
- package/dist/plan.d.ts +8 -0
- package/dist/plan.d.ts.map +1 -0
- package/dist/plan.js +267 -0
- package/dist/plan.js.map +1 -0
- package/dist/site.d.ts +24 -0
- package/dist/site.d.ts.map +1 -0
- package/dist/site.js +53 -0
- package/dist/site.js.map +1 -0
- package/examples/comparison/README.md +16 -1
- package/examples/comparison/gen-ifc4.ts +1 -1
- package/examples/comparison/gen-ifcx.ts +2 -2
- package/examples/comparison/two-rooms.ifcx +1 -1
- package/examples/house/L1.muro +16 -0
- package/examples/house/L2.muro +19 -0
- package/examples/house/assets.muro +9 -0
- package/examples/house/main.muro +27 -0
- package/examples/house/site.muro +31 -0
- package/examples/house.muro +1 -1
- package/examples/mansion.muro +1 -1
- package/examples/office.muro +1 -1
- package/examples/steps/01-one-room.muro +4 -0
- package/examples/steps/02-two-rooms.muro +5 -0
- package/examples/steps/03-door.muro +9 -0
- package/examples/steps/04-exterior.muro +15 -0
- package/examples/steps/05-two-storeys.muro +27 -0
- package/examples/steps/06-finished.muro +30 -0
- package/examples/steps/README.md +25 -0
- package/examples/tower/L1.muro +80 -0
- package/examples/tower/L11.muro +47 -0
- package/examples/tower/L2.muro +69 -0
- package/examples/tower/L3.muro +28 -0
- package/examples/tower/assets.muro +13 -0
- package/examples/tower/main.muro +37 -0
- package/examples/tower/site-geometry.muro +7 -0
- package/examples/tower/site.muro +33 -0
- package/examples/tower/typical.muro +124 -0
- package/examples/two-rooms.canonical.json +5 -2
- package/examples/two-rooms.muro +6 -5
- package/package.json +28 -2
- package/src/check.ts +352 -63
- package/src/cli.ts +76 -11
- package/src/diff.ts +608 -0
- package/src/graph.ts +90 -10
- package/src/index.ts +14 -2
- package/src/mcp.ts +390 -0
- package/src/model.ts +260 -55
- package/src/parse-file.ts +28 -0
- package/src/parse.ts +562 -44
- package/src/plan.ts +33 -4
- package/src/site.ts +13 -5
- package/.github/workflows/ci.yml +0 -16
- package/.zenodo.json +0 -20
- package/CITATION.cff +0 -26
- package/docs/decisions/0001-notation-v0.md +0 -29
- package/docs/decisions/0002-height-and-offsets.md +0 -27
- package/docs/decisions/0003-uncounted-divisions.md +0 -36
- package/docs/decisions/0004-typical-floors.md +0 -21
- package/docs/decisions/0005-zones-and-unions.md +0 -23
- package/docs/decisions/0006-voids-and-light.md +0 -31
- package/docs/decisions/0007-semi-outdoor-air.md +0 -27
- package/docs/decisions/0008-vocabulary-and-level-attr.md +0 -23
- package/docs/decisions/0009-site-and-exterior.md +0 -29
- package/docs/ifc-coverage.md +0 -82
- package/docs/ifcx-notes.md +0 -25
- package/docs/img/house-L1.svg +0 -80
- package/docs/img/house-L2.svg +0 -53
- package/docs/img/mansion-L1.svg +0 -113
- package/docs/img/mansion-L10.svg +0 -111
- package/docs/img/mansion-L5.svg +0 -160
- package/docs/img/office-L1.svg +0 -116
- package/docs/img/office-L2.svg +0 -109
- package/docs/img/two-rooms.svg +0 -39
- package/docs/log/2026-07-22.md +0 -13
- package/docs/log/2026-07-23.md +0 -51
- package/docs/roadmap.md +0 -55
- package/docs/writing-architecture.md +0 -119
- package/spec/notation-v0.md +0 -164
- package/spec/vocabulary.md +0 -62
- package/test/core.test.ts +0 -171
- package/test/design2.test.ts +0 -97
- package/test/house.test.ts +0 -74
- package/test/mansion.test.ts +0 -99
- package/test/office.test.ts +0 -71
- package/test/uncounted.test.ts +0 -120
- package/test/vertical.test.ts +0 -75
- package/tsconfig.json +0 -13
package/dist/model.js
ADDED
|
@@ -0,0 +1,361 @@
|
|
|
1
|
+
// koyu v0 — データモデル
|
|
2
|
+
// 一次要素は空間。壁は二つの空間の「境界」という関係であり、物ではない。
|
|
3
|
+
// 形はここには無い。形は生成物である。(docs/writing-architecture.md)
|
|
4
|
+
/** このツールが受理する言語版 (ADR-0017)。旧版は意味保存の場合のみ受理される (checkが検査する) */
|
|
5
|
+
export const SUPPORTED_LANGUAGE_VERSIONS = ["0.1", "0.2", "0.3"];
|
|
6
|
+
/** 版宣言を省略したときの解釈 — 常に最新版の意味論 (省略はツール版を跨いで意味安定ではない) */
|
|
7
|
+
export const DEFAULT_LANGUAGE_VERSION = "0.3";
|
|
8
|
+
/** エラー・警告の位置表記 — 合成時はどのレイヤーのことかを言葉にする (ADR-0010) */
|
|
9
|
+
export function srcRef(line, file) {
|
|
10
|
+
return `${file ? `${file}:` : ""}${line}行目`;
|
|
11
|
+
}
|
|
12
|
+
/** 多角形の面積 ㎡ (シューレース公式)。頂点は順不同 (時計/反時計どちらでも) */
|
|
13
|
+
export function polygonAreaM2(points) {
|
|
14
|
+
let sum = 0;
|
|
15
|
+
for (let i = 0; i < points.length; i++) {
|
|
16
|
+
const a = points[i];
|
|
17
|
+
const b = points[(i + 1) % points.length];
|
|
18
|
+
sum += a.x * b.y - b.x * a.y;
|
|
19
|
+
}
|
|
20
|
+
return Math.abs(sum) / 2 / 1e6;
|
|
21
|
+
}
|
|
22
|
+
/** 線分同士が内部で交差するか (端点・境界上の接触は交差としない、許容誤差eps mm)。交点を返す */
|
|
23
|
+
function properCrossing(a1, a2, b1, b2, eps = 1) {
|
|
24
|
+
const d = (a2.x - a1.x) * (b2.y - b1.y) - (a2.y - a1.y) * (b2.x - b1.x);
|
|
25
|
+
if (d === 0)
|
|
26
|
+
return undefined; // 平行・共線 (共線の重なりは接触扱い — 境界上は内側)
|
|
27
|
+
const t = ((b1.x - a1.x) * (b2.y - b1.y) - (b1.y - a1.y) * (b2.x - b1.x)) / d;
|
|
28
|
+
const u = ((b1.x - a1.x) * (a2.y - a1.y) - (b1.y - a1.y) * (a2.x - a1.x)) / d;
|
|
29
|
+
const la = Math.hypot(a2.x - a1.x, a2.y - a1.y);
|
|
30
|
+
const lb = Math.hypot(b2.x - b1.x, b2.y - b1.y);
|
|
31
|
+
if (la === 0 || lb === 0)
|
|
32
|
+
return undefined;
|
|
33
|
+
const ea = eps / la;
|
|
34
|
+
const eb = eps / lb;
|
|
35
|
+
if (t <= ea || t >= 1 - ea || u <= eb || u >= 1 - eb)
|
|
36
|
+
return undefined; // 端点付近は接触
|
|
37
|
+
return { x: a1.x + t * (a2.x - a1.x), y: a1.y + t * (a2.y - a1.y) };
|
|
38
|
+
}
|
|
39
|
+
/** 多角形の自己交差点 (隣接しない辺同士の内部交差)。なければundefined */
|
|
40
|
+
export function polygonSelfIntersection(poly, eps = 1) {
|
|
41
|
+
const n = poly.length;
|
|
42
|
+
for (let i = 0; i < n; i++) {
|
|
43
|
+
for (let j = i + 2; j < n; j++) {
|
|
44
|
+
if (i === 0 && j === n - 1)
|
|
45
|
+
continue; // 先頭と末尾の辺は隣接
|
|
46
|
+
const x = properCrossing(poly[i], poly[(i + 1) % n], poly[j], poly[(j + 1) % n], eps);
|
|
47
|
+
if (x)
|
|
48
|
+
return x;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return undefined;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* 矩形が多角形からはみ出す点 (完全に内側ならundefined)。凹多角形にも正しい:
|
|
55
|
+
* 四隅の内包に加え、多角形の頂点の矩形内への入り込みと、辺同士の内部交差を検査する
|
|
56
|
+
*/
|
|
57
|
+
export function rectEscapesPolygon(r, poly, eps = 1) {
|
|
58
|
+
const corners = [
|
|
59
|
+
{ x: r.x1, y: r.y1 },
|
|
60
|
+
{ x: r.x2, y: r.y1 },
|
|
61
|
+
{ x: r.x2, y: r.y2 },
|
|
62
|
+
{ x: r.x1, y: r.y2 },
|
|
63
|
+
];
|
|
64
|
+
for (const c of corners)
|
|
65
|
+
if (!pointInPolygon(c, poly, eps))
|
|
66
|
+
return c;
|
|
67
|
+
for (const p of poly) {
|
|
68
|
+
if (p.x > r.x1 + eps && p.x < r.x2 - eps && p.y > r.y1 + eps && p.y < r.y2 - eps)
|
|
69
|
+
return p;
|
|
70
|
+
}
|
|
71
|
+
const edges = [
|
|
72
|
+
[corners[0], corners[1]],
|
|
73
|
+
[corners[1], corners[2]],
|
|
74
|
+
[corners[2], corners[3]],
|
|
75
|
+
[corners[3], corners[0]],
|
|
76
|
+
];
|
|
77
|
+
for (let i = 0; i < poly.length; i++) {
|
|
78
|
+
const a = poly[i];
|
|
79
|
+
const b = poly[(i + 1) % poly.length];
|
|
80
|
+
for (const [p, q] of edges) {
|
|
81
|
+
const x = properCrossing(a, b, p, q, eps);
|
|
82
|
+
if (x)
|
|
83
|
+
return x;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return undefined;
|
|
87
|
+
}
|
|
88
|
+
/** 点が多角形の内側にあるか (境界上は内側扱い、許容誤差eps mm) */
|
|
89
|
+
export function pointInPolygon(p, poly, eps = 1) {
|
|
90
|
+
// 境界上の判定 (線分との距離 ≤ eps)
|
|
91
|
+
for (let i = 0; i < poly.length; i++) {
|
|
92
|
+
const a = poly[i];
|
|
93
|
+
const b = poly[(i + 1) % poly.length];
|
|
94
|
+
const dx = b.x - a.x;
|
|
95
|
+
const dy = b.y - a.y;
|
|
96
|
+
const len2 = dx * dx + dy * dy;
|
|
97
|
+
const t = len2 === 0 ? 0 : Math.max(0, Math.min(1, ((p.x - a.x) * dx + (p.y - a.y) * dy) / len2));
|
|
98
|
+
const qx = a.x + t * dx;
|
|
99
|
+
const qy = a.y + t * dy;
|
|
100
|
+
if ((p.x - qx) ** 2 + (p.y - qy) ** 2 <= eps * eps)
|
|
101
|
+
return true;
|
|
102
|
+
}
|
|
103
|
+
// レイキャスト
|
|
104
|
+
let inside = false;
|
|
105
|
+
for (let i = 0, j = poly.length - 1; i < poly.length; j = i++) {
|
|
106
|
+
const a = poly[i];
|
|
107
|
+
const b = poly[j];
|
|
108
|
+
if (a.y > p.y !== b.y > p.y && p.x < ((b.x - a.x) * (p.y - a.y)) / (b.y - a.y) + a.x) {
|
|
109
|
+
inside = !inside;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
return inside;
|
|
113
|
+
}
|
|
114
|
+
export class SourceError extends Error {
|
|
115
|
+
line;
|
|
116
|
+
raw;
|
|
117
|
+
file;
|
|
118
|
+
constructor(line,
|
|
119
|
+
/** 位置情報を除いた本文 (合成時のファイル付与に使う) */
|
|
120
|
+
raw,
|
|
121
|
+
/** 出所ファイル (合成時) */
|
|
122
|
+
file) {
|
|
123
|
+
super(`${file ? `${file}:` : ""}${line}行目: ${raw}`);
|
|
124
|
+
this.line = line;
|
|
125
|
+
this.raw = raw;
|
|
126
|
+
this.file = file;
|
|
127
|
+
this.name = "SourceError";
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
/** 面積 (壁芯) m²。複数矩形は合計 (重なりはcheckが禁じる) */
|
|
131
|
+
export function areaM2(s) {
|
|
132
|
+
if (s.rects.length === 0)
|
|
133
|
+
return undefined;
|
|
134
|
+
const a = s.rects.reduce((sum, r) => sum + (r.x2 - r.x1) * (r.y2 - r.y1), 0) / 1e6;
|
|
135
|
+
return Math.round(a * 100) / 100;
|
|
136
|
+
}
|
|
137
|
+
/**
|
|
138
|
+
* 半屋外か — 宣言ではなく導出。外部 (type:exterior) に対して
|
|
139
|
+
* open または air:1 (手すり等、遮蔽しない物) の境界で接する空間は半屋外である (ADR-0007)
|
|
140
|
+
*/
|
|
141
|
+
export function isSemiOutdoor(model, s) {
|
|
142
|
+
if (s.rects.length === 0)
|
|
143
|
+
return false;
|
|
144
|
+
for (const b of model.boundaries) {
|
|
145
|
+
if (b.kind !== "open" && !b.air)
|
|
146
|
+
continue;
|
|
147
|
+
const other = b.a === s.path ? b.b : b.b === s.path ? b.a : undefined;
|
|
148
|
+
if (!other)
|
|
149
|
+
continue;
|
|
150
|
+
if (model.spaces.get(other)?.type === "exterior")
|
|
151
|
+
return true;
|
|
152
|
+
}
|
|
153
|
+
return false;
|
|
154
|
+
}
|
|
155
|
+
/**
|
|
156
|
+
* 上に (どのレベルであれ) 空間が重なっているか — 庇下・バルコニー下の導出。
|
|
157
|
+
* 採光の半屋外係数 (庇下0.7 / 上が開いていれば1.0) などが読む (ADR-0009)
|
|
158
|
+
*/
|
|
159
|
+
export function isCoveredAbove(model, s) {
|
|
160
|
+
if (s.rects.length === 0 || !s.level)
|
|
161
|
+
return false;
|
|
162
|
+
const z = model.levels[s.level]?.z;
|
|
163
|
+
if (z === undefined)
|
|
164
|
+
return false;
|
|
165
|
+
for (const o of model.spaces.values()) {
|
|
166
|
+
if (o === s || o.rects.length === 0 || !o.level)
|
|
167
|
+
continue;
|
|
168
|
+
const oz = model.levels[o.level]?.z;
|
|
169
|
+
if (oz === undefined || oz <= z)
|
|
170
|
+
continue;
|
|
171
|
+
for (const ra of s.rects) {
|
|
172
|
+
for (const rb of o.rects) {
|
|
173
|
+
const x = Math.min(ra.x2, rb.x2) - Math.max(ra.x1, rb.x1);
|
|
174
|
+
const y = Math.min(ra.y2, rb.y2) - Math.max(ra.y1, rb.y1);
|
|
175
|
+
if (x > 0.5 && y > 0.5)
|
|
176
|
+
return true;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
return false;
|
|
181
|
+
}
|
|
182
|
+
/** 矩形集合の合併面積 m² (水平投影 — 建築面積の導出に使う)。座標圧縮による厳密計算 */
|
|
183
|
+
export function unionAreaM2(rects) {
|
|
184
|
+
if (rects.length === 0)
|
|
185
|
+
return 0;
|
|
186
|
+
const xs = [...new Set(rects.flatMap((r) => [r.x1, r.x2]))].sort((a, b) => a - b);
|
|
187
|
+
const ys = [...new Set(rects.flatMap((r) => [r.y1, r.y2]))].sort((a, b) => a - b);
|
|
188
|
+
let area = 0;
|
|
189
|
+
for (let i = 0; i + 1 < xs.length; i++) {
|
|
190
|
+
for (let j = 0; j + 1 < ys.length; j++) {
|
|
191
|
+
const cx = (xs[i] + xs[i + 1]) / 2;
|
|
192
|
+
const cy = (ys[j] + ys[j + 1]) / 2;
|
|
193
|
+
if (rects.some((r) => cx > r.x1 && cx < r.x2 && cy > r.y1 && cy < r.y2)) {
|
|
194
|
+
area += (xs[i + 1] - xs[i]) * (ys[j + 1] - ys[j]);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
return Math.round((area / 1e6) * 100) / 100;
|
|
199
|
+
}
|
|
200
|
+
/** ゾーンの面積 = パス接頭辞で束ねた空間の合計 (吹抜けと半屋外は数えない — 専有面積の言葉) */
|
|
201
|
+
export function zoneAreaM2(model, zonePath) {
|
|
202
|
+
let sum = 0;
|
|
203
|
+
for (const s of model.spaces.values()) {
|
|
204
|
+
if (!s.path.startsWith(zonePath + "/"))
|
|
205
|
+
continue;
|
|
206
|
+
if (s.type === "void")
|
|
207
|
+
continue;
|
|
208
|
+
if (isSemiOutdoor(model, s))
|
|
209
|
+
continue;
|
|
210
|
+
sum += areaM2(s) ?? 0;
|
|
211
|
+
}
|
|
212
|
+
return Math.round(sum * 100) / 100;
|
|
213
|
+
}
|
|
214
|
+
/** 実効use属性 — 自分に無ければ、最も深いゾーン祖先から継承する */
|
|
215
|
+
export function effectiveUse(model, s) {
|
|
216
|
+
const own = s.attrs["use"];
|
|
217
|
+
if (typeof own === "string")
|
|
218
|
+
return own;
|
|
219
|
+
let best;
|
|
220
|
+
let bestLen = -1;
|
|
221
|
+
for (const z of model.zones.values()) {
|
|
222
|
+
if (s.path.startsWith(z.path + "/") && z.path.length > bestLen) {
|
|
223
|
+
const u = z.attrs["use"];
|
|
224
|
+
if (typeof u === "string") {
|
|
225
|
+
best = u;
|
|
226
|
+
bestLen = z.path.length;
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
return best;
|
|
231
|
+
}
|
|
232
|
+
/** 空間の有効天井高 mm (space自身のh属性 → レベルのh の順) */
|
|
233
|
+
export function heff(model, s) {
|
|
234
|
+
const own = s.attrs["h"];
|
|
235
|
+
if (typeof own === "number")
|
|
236
|
+
return own;
|
|
237
|
+
return s.level ? model.levels[s.level]?.h : undefined;
|
|
238
|
+
}
|
|
239
|
+
/** レベルをzの昇順で返す */
|
|
240
|
+
export function levelsSorted(model) {
|
|
241
|
+
return Object.values(model.levels).sort((a, b) => a.z - b.z);
|
|
242
|
+
}
|
|
243
|
+
export function displayName(s) {
|
|
244
|
+
const n = s.attrs["name"];
|
|
245
|
+
return typeof n === "string" ? n : (s.path.split("/").pop() ?? s.path);
|
|
246
|
+
}
|
|
247
|
+
/** 正準JSONの空間エントリ (書かれた表記・正準順)。semantic diff (ADR-0018) が比較基底として共有する */
|
|
248
|
+
export function canonicalSpaceEntry(s) {
|
|
249
|
+
return {
|
|
250
|
+
type: s.type,
|
|
251
|
+
// 明示の level: (パス先頭セグメントと異なる所属 — メゾネット等) は書かれた構成として保存する。
|
|
252
|
+
// これが無いとJSONだけでは所属レベル (垂直検査・集計・既定境界の前提) を復元できない
|
|
253
|
+
...(s.level !== undefined && s.path.split("/")[1] !== s.level ? { level: s.level } : {}),
|
|
254
|
+
...(s.grids.length === 1
|
|
255
|
+
? { at: [s.grids[0].xa, s.grids[0].ya, s.grids[0].xb, s.grids[0].yb] }
|
|
256
|
+
: s.grids.length > 1
|
|
257
|
+
? { at: sortBySerial(s.grids.map((g) => [g.xa, g.ya, g.xb, g.yb])) }
|
|
258
|
+
: {}),
|
|
259
|
+
...(Object.keys(s.attrs).length ? { attrs: sortObj(s.attrs) } : {}),
|
|
260
|
+
...(s.areas.length
|
|
261
|
+
? {
|
|
262
|
+
areas: sortBySerial(s.areas.map((a) => ({
|
|
263
|
+
at: [a.grid.xa, a.grid.ya, a.grid.xb, a.grid.yb],
|
|
264
|
+
...(Object.keys(a.attrs).length ? { attrs: sortObj(a.attrs) } : {}),
|
|
265
|
+
}))),
|
|
266
|
+
}
|
|
267
|
+
: {}),
|
|
268
|
+
};
|
|
269
|
+
}
|
|
270
|
+
/** 正準JSONの開口エントリ (atRef??at 等の正準表記) — toCanonicalとsemantic diffが共有 */
|
|
271
|
+
export function canonicalOpeningEntry(o) {
|
|
272
|
+
return {
|
|
273
|
+
kind: o.kind,
|
|
274
|
+
...(o.ref ? { ref: o.ref } : {}),
|
|
275
|
+
w: o.w,
|
|
276
|
+
...(o.h !== undefined ? { h: o.h } : {}),
|
|
277
|
+
at: o.atRef ?? o.at,
|
|
278
|
+
...(o.edge ? { edge: o.edge } : {}),
|
|
279
|
+
...(o.hinge ? { hinge: o.hinge } : {}),
|
|
280
|
+
...(o.swing ? { swing: o.swing } : {}),
|
|
281
|
+
...(Object.keys(o.attrs).length ? { attrs: sortObj(o.attrs) } : {}),
|
|
282
|
+
};
|
|
283
|
+
}
|
|
284
|
+
/** 正準JSONのsegエントリ — toCanonicalとsemantic diffが共有 */
|
|
285
|
+
export function canonicalSegEntry(g) {
|
|
286
|
+
return {
|
|
287
|
+
w: g.w,
|
|
288
|
+
at: g.atRef ?? g.at,
|
|
289
|
+
...(g.edge ? { edge: g.edge } : {}),
|
|
290
|
+
...(Object.keys(g.attrs).length ? { attrs: sortObj(g.attrs) } : {}),
|
|
291
|
+
};
|
|
292
|
+
}
|
|
293
|
+
/** 正準JSONの境界エントリ。a/bの向きは書かれた表記 (aキー) として保存する — edge/swingはa側から読む */
|
|
294
|
+
export function canonicalBoundaryEntry(b) {
|
|
295
|
+
return {
|
|
296
|
+
between: [b.a, b.b].sort(),
|
|
297
|
+
a: b.a,
|
|
298
|
+
kind: b.kind,
|
|
299
|
+
...(b.t !== undefined ? { t: b.t } : {}),
|
|
300
|
+
...(b.air ? { air: true } : {}),
|
|
301
|
+
...(b.edge ? { edge: b.edge } : {}),
|
|
302
|
+
...(Object.keys(b.attrs).length ? { attrs: sortObj(b.attrs) } : {}),
|
|
303
|
+
...(b.openings.length ? { openings: sortBySerial(b.openings.map(canonicalOpeningEntry)) } : {}),
|
|
304
|
+
...(b.segs.length ? { segs: sortBySerial(b.segs.map(canonicalSegEntry)) } : {}),
|
|
305
|
+
};
|
|
306
|
+
}
|
|
307
|
+
/** 正準JSON — 機械形式。差分とレイヤー合成の土台 (キーは安定順) */
|
|
308
|
+
export function toCanonical(model) {
|
|
309
|
+
const spaces = {};
|
|
310
|
+
for (const p of [...model.spaces.keys()].sort()) {
|
|
311
|
+
spaces[p] = canonicalSpaceEntry(model.spaces.get(p));
|
|
312
|
+
}
|
|
313
|
+
// 境界: 宣言順は意味を持たないため、並びは内容の正準順 (betweenの辞書順、同一betweenは直列化順)。
|
|
314
|
+
// 既定境界 (derived — ADR-0014) は出さない: 正準JSONは書かれた構成のみで、意味は導出後のModelが持つ
|
|
315
|
+
const boundaries = sortBySerial([...model.boundaries].filter((b) => !b.derived).map(canonicalBoundaryEntry));
|
|
316
|
+
const zones = {};
|
|
317
|
+
for (const p of [...model.zones.keys()].sort()) {
|
|
318
|
+
const z = model.zones.get(p);
|
|
319
|
+
zones[p] = Object.keys(z.attrs).length ? { attrs: sortObj(z.attrs) } : {};
|
|
320
|
+
}
|
|
321
|
+
const assets = {};
|
|
322
|
+
for (const n of [...model.assets.keys()].sort()) {
|
|
323
|
+
const a = model.assets.get(n);
|
|
324
|
+
assets[n] = { kind: a.kind, ...(Object.keys(a.attrs).length ? { attrs: sortObj(a.attrs) } : {}) };
|
|
325
|
+
}
|
|
326
|
+
const polygons = {};
|
|
327
|
+
for (const p of [...model.polygons.keys()].sort()) {
|
|
328
|
+
polygons[p] = model.polygons.get(p).points.map((pt) => [pt.x, pt.y]);
|
|
329
|
+
}
|
|
330
|
+
const doc = {
|
|
331
|
+
koyu: model.version,
|
|
332
|
+
...(model.name ? { name: model.name } : {}),
|
|
333
|
+
unit: model.unit,
|
|
334
|
+
grid: { X: model.grid.X.coords, Y: model.grid.Y.coords },
|
|
335
|
+
levels: sortObj(Object.fromEntries(Object.entries(model.levels).map(([k, v]) => [
|
|
336
|
+
k,
|
|
337
|
+
{
|
|
338
|
+
z: v.z,
|
|
339
|
+
...(v.h !== undefined ? { h: v.h } : {}),
|
|
340
|
+
...(v.slab !== undefined ? { slab: v.slab } : {}),
|
|
341
|
+
},
|
|
342
|
+
]))),
|
|
343
|
+
...(Object.keys(assets).length ? { assets } : {}),
|
|
344
|
+
...(Object.keys(polygons).length ? { polygons } : {}),
|
|
345
|
+
...(Object.keys(zones).length ? { zones } : {}),
|
|
346
|
+
spaces,
|
|
347
|
+
boundaries,
|
|
348
|
+
};
|
|
349
|
+
return JSON.stringify(doc, null, 2) + "\n";
|
|
350
|
+
}
|
|
351
|
+
function sortObj(o) {
|
|
352
|
+
return Object.fromEntries(Object.entries(o).sort(([a], [b]) => (a < b ? -1 : 1)));
|
|
353
|
+
}
|
|
354
|
+
/** 宣言順に意味の無い集合を、直列化したJSONの辞書順に並べる — 正準順の土台 (diffも同じ順で比べる) */
|
|
355
|
+
export function sortBySerial(items) {
|
|
356
|
+
return items
|
|
357
|
+
.map((it) => [JSON.stringify(it), it])
|
|
358
|
+
.sort(([x], [y]) => (x < y ? -1 : x > y ? 1 : 0))
|
|
359
|
+
.map(([, it]) => it);
|
|
360
|
+
}
|
|
361
|
+
//# sourceMappingURL=model.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { Model } from "./model.js";
|
|
2
|
+
/** ファイルから読む。import は書かれたファイルからの相対で解決される */
|
|
3
|
+
export declare function parseFile(filePath: string): Model;
|
|
4
|
+
/**
|
|
5
|
+
* 差し替えつきのファイル合成 — 書き込み前の門番 (MCPのwrite_layer) が使う。
|
|
6
|
+
* overlay が文字列を返したパスは、ディスクの内容の代わりにそれが合成される
|
|
7
|
+
*/
|
|
8
|
+
export declare function parseFileWith(filePath: string, overlay?: (absPath: string) => string | undefined): Model;
|
|
9
|
+
//# sourceMappingURL=parse-file.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-file.d.ts","sourceRoot":"","sources":["../src/parse-file.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGxC,2CAA2C;AAC3C,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,CAEjD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,GAChD,KAAK,CAMP"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
// ファイルシステムからの合成 — node専用の入口 (ADR-0010)。
|
|
2
|
+
// パーサ本体 (parse.ts) は純粋で、fsはこの薄い層だけが知る。
|
|
3
|
+
// ブラウザ (ugatsu等) は parseFiles (仮想ファイル群) を使う。
|
|
4
|
+
import { readFileSync } from "node:fs";
|
|
5
|
+
import { dirname, resolve } from "node:path";
|
|
6
|
+
import { parseWith } from "./parse.js";
|
|
7
|
+
/** ファイルから読む。import は書かれたファイルからの相対で解決される */
|
|
8
|
+
export function parseFile(filePath) {
|
|
9
|
+
return parseFileWith(filePath);
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* 差し替えつきのファイル合成 — 書き込み前の門番 (MCPのwrite_layer) が使う。
|
|
13
|
+
* overlay が文字列を返したパスは、ディスクの内容の代わりにそれが合成される
|
|
14
|
+
*/
|
|
15
|
+
export function parseFileWith(filePath, overlay) {
|
|
16
|
+
return parseWith((from, ref) => {
|
|
17
|
+
const key = from === undefined ? resolve(ref) : resolve(dirname(from), ref);
|
|
18
|
+
const src = overlay?.(key) ?? readFileSync(key, "utf8");
|
|
19
|
+
return { key, src };
|
|
20
|
+
}, filePath);
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=parse-file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-file.js","sourceRoot":"","sources":["../src/parse-file.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,uCAAuC;AACvC,6CAA6C;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,2CAA2C;AAC3C,MAAM,UAAU,SAAS,CAAC,QAAgB;IACxC,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAC3B,QAAgB,EAChB,OAAiD;IAEjD,OAAO,SAAS,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAC7B,MAAM,GAAG,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QAC5E,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACxD,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IACtB,CAAC,EAAE,QAAQ,CAAC,CAAC;AACf,CAAC"}
|
package/dist/parse.d.ts
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { type Model } from "./model.js";
|
|
2
|
+
/** レイヤーの読み込み口 — import の解決。fs版は parse-file.ts が、仮想版は parseFiles が与える。
|
|
3
|
+
* fromKey が undefined のときは entry 自身の解決 */
|
|
4
|
+
export type LayerLoader = (fromKey: string | undefined, ref: string) => {
|
|
5
|
+
key: string;
|
|
6
|
+
src: string;
|
|
7
|
+
};
|
|
8
|
+
export declare function parse(source: string): Model;
|
|
9
|
+
/** ローダーを介した合成の入口。entry もローダーで読む (ADR-0010) */
|
|
10
|
+
export declare function parseWith(loader: LayerLoader, entry: string): Model;
|
|
11
|
+
/** 仮想ファイル群からの合成 — fsの無い環境 (ブラウザ等) 向け。
|
|
12
|
+
* キーはPOSIX風の相対パス (`L1.muro`, `floors/L1.muro`)。import はキー空間の中で解決される */
|
|
13
|
+
export declare function parseFiles(files: Record<string, string>, entry: string): Model;
|
|
14
|
+
/** 空白区切り。"..."内の空白は保持し、引用符外の # 以降はコメント */
|
|
15
|
+
export declare function tokenize(line: string, ln: number): string[];
|
|
16
|
+
//# sourceMappingURL=parse.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"AAKA,OAAO,EAOL,KAAK,KAAK,EAOX,MAAM,YAAY,CAAC;AAgDpB;2CAC2C;AAC3C,MAAM,MAAM,WAAW,GAAG,CACxB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,GAAG,EAAE,MAAM,KACR;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAElC,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAK3C;AAED,8CAA8C;AAC9C,wBAAgB,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,CAWnE;AAED;wEACwE;AACxE,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,CAQ9E;AAo1BD,0CAA0C;AAC1C,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,CAoB3D"}
|