@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/src/diff.ts
ADDED
|
@@ -0,0 +1,608 @@
|
|
|
1
|
+
// koyu — semantic diff (ADR-0018)
|
|
2
|
+
// 二つのModelを構成の言葉で比べる。行の入替・書き方の違いは差分ではない —
|
|
3
|
+
// 比較の基底は正準表現 (model.tsの正準エントリ) で、toCanonicalが同一なら差分は空。
|
|
4
|
+
// 空間の対応はuid (ADR-0015) を先に取り、uid一致・パス不一致を「改名」として報告する。
|
|
5
|
+
// 境界は実効集合 (deriveDefaultBoundaries適用後のModel.boundaries) で比べ、
|
|
6
|
+
// 素の宣言wallと既定壁 (derived) は同一視する (ADR-0014の帰結の吸収)。
|
|
7
|
+
|
|
8
|
+
import {
|
|
9
|
+
areaM2,
|
|
10
|
+
canonicalBoundaryEntry,
|
|
11
|
+
canonicalOpeningEntry,
|
|
12
|
+
canonicalSegEntry,
|
|
13
|
+
canonicalSpaceEntry,
|
|
14
|
+
polygonAreaM2,
|
|
15
|
+
type Attrs,
|
|
16
|
+
type AttrValue,
|
|
17
|
+
type Boundary,
|
|
18
|
+
type Edge,
|
|
19
|
+
type Model,
|
|
20
|
+
type Opening,
|
|
21
|
+
type Pt,
|
|
22
|
+
type Seg,
|
|
23
|
+
type Space,
|
|
24
|
+
} from "./model.js";
|
|
25
|
+
|
|
26
|
+
/** フィールドの変化。from/toの片方が無ければ、その側に無かった (追加/削除) */
|
|
27
|
+
export interface FieldChange {
|
|
28
|
+
field: string;
|
|
29
|
+
from?: string;
|
|
30
|
+
to?: string;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/** 変化した要素 — pathは新しい側 (b) の名 */
|
|
34
|
+
export interface ChangedItem {
|
|
35
|
+
path: string;
|
|
36
|
+
fields: FieldChange[];
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** uid一致・パス不一致 = 改名 (ADR-0015)。境界の対応はuidが継ぐため洪水にならない */
|
|
40
|
+
export interface RenamedItem {
|
|
41
|
+
from: string;
|
|
42
|
+
to: string;
|
|
43
|
+
uid: string;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** 通り座標の変化。名は位置 (X1=先頭) から読む — 座標の挿入は以降の名の付け替えとして現れる */
|
|
47
|
+
export interface GridChange {
|
|
48
|
+
axis: "X" | "Y";
|
|
49
|
+
name: string;
|
|
50
|
+
kind: "added" | "removed" | "moved";
|
|
51
|
+
from?: number;
|
|
52
|
+
to?: number;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export interface SpaceItem {
|
|
56
|
+
path: string;
|
|
57
|
+
type: string;
|
|
58
|
+
areaM2?: number;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export interface BoundaryItem {
|
|
62
|
+
between: [string, string];
|
|
63
|
+
edge?: Edge;
|
|
64
|
+
kind: string;
|
|
65
|
+
t?: number;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
export interface BoundaryChange {
|
|
69
|
+
between: [string, string];
|
|
70
|
+
edge?: Edge;
|
|
71
|
+
fields: FieldChange[];
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
export interface ModelDiff {
|
|
75
|
+
version?: { from: string; to: string };
|
|
76
|
+
name?: { from?: string; to?: string };
|
|
77
|
+
grid: GridChange[];
|
|
78
|
+
levels: { added: string[]; removed: string[]; changed: ChangedItem[] };
|
|
79
|
+
assets: { added: string[]; removed: string[]; changed: ChangedItem[] };
|
|
80
|
+
polygons: { added: string[]; removed: string[]; changed: ChangedItem[] };
|
|
81
|
+
zones: { added: string[]; removed: string[]; renamed: RenamedItem[]; changed: ChangedItem[] };
|
|
82
|
+
spaces: { added: SpaceItem[]; removed: SpaceItem[]; renamed: RenamedItem[]; changed: ChangedItem[] };
|
|
83
|
+
boundaries: { added: BoundaryItem[]; removed: BoundaryItem[]; changed: BoundaryChange[] };
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
// ---- 対応付け ----
|
|
87
|
+
|
|
88
|
+
interface Pair<T> {
|
|
89
|
+
a: T;
|
|
90
|
+
b: T;
|
|
91
|
+
/** 境界のキーに使う安定トークン — uid対ならuid、パス対ならb側のパス */
|
|
92
|
+
token: string;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
interface Matching<T> {
|
|
96
|
+
pairs: Pair<T>[];
|
|
97
|
+
removed: T[];
|
|
98
|
+
added: T[];
|
|
99
|
+
renamed: RenamedItem[];
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
/**
|
|
103
|
+
* 2パスの対応付け: ①uid一致 (String()比較・両側消費)、②残りをパス一致。残りは追加/削除。
|
|
104
|
+
* uidが片側で重複しているモデル (UID03エラー) では当該uidはパス照合へフォールバックする —
|
|
105
|
+
* checkエラーのモデルでもdiffは落ちない
|
|
106
|
+
*/
|
|
107
|
+
function matchByUidThenPath<T extends { path: string; attrs: Attrs }>(as: T[], bs: T[]): Matching<T> {
|
|
108
|
+
const uniqueUids = (xs: T[]): Map<string, T> => {
|
|
109
|
+
const byUid = new Map<string, T[]>();
|
|
110
|
+
for (const x of xs) {
|
|
111
|
+
const v = x.attrs["uid"];
|
|
112
|
+
if (v === undefined) continue;
|
|
113
|
+
const k = String(v);
|
|
114
|
+
const arr = byUid.get(k) ?? [];
|
|
115
|
+
arr.push(x);
|
|
116
|
+
byUid.set(k, arr);
|
|
117
|
+
}
|
|
118
|
+
return new Map([...byUid].filter(([, arr]) => arr.length === 1).map(([k, arr]) => [k, arr[0]!]));
|
|
119
|
+
};
|
|
120
|
+
const ua = uniqueUids(as);
|
|
121
|
+
const ub = uniqueUids(bs);
|
|
122
|
+
const pairs: Pair<T>[] = [];
|
|
123
|
+
const renamed: RenamedItem[] = [];
|
|
124
|
+
const consumedA = new Set<T>();
|
|
125
|
+
const consumedB = new Set<T>();
|
|
126
|
+
for (const [uid, xa] of ua) {
|
|
127
|
+
const xb = ub.get(uid);
|
|
128
|
+
if (!xb) continue;
|
|
129
|
+
// uidはパスと衝突しない名前空間に置く (uidに"/"始まりのトークンを書かれても混ざらない)
|
|
130
|
+
pairs.push({ a: xa, b: xb, token: `\u0000uid:${uid}` });
|
|
131
|
+
consumedA.add(xa);
|
|
132
|
+
consumedB.add(xb);
|
|
133
|
+
if (xa.path !== xb.path) renamed.push({ from: xa.path, to: xb.path, uid });
|
|
134
|
+
}
|
|
135
|
+
const restB = new Map(bs.filter((x) => !consumedB.has(x)).map((x) => [x.path, x]));
|
|
136
|
+
const removed: T[] = [];
|
|
137
|
+
for (const xa of as) {
|
|
138
|
+
if (consumedA.has(xa)) continue;
|
|
139
|
+
const xb = restB.get(xa.path);
|
|
140
|
+
if (xb) {
|
|
141
|
+
pairs.push({ a: xa, b: xb, token: xb.path });
|
|
142
|
+
restB.delete(xa.path);
|
|
143
|
+
} else {
|
|
144
|
+
removed.push(xa);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
return { pairs, removed, added: [...restB.values()], renamed };
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
// ---- フィールド差分 ----
|
|
151
|
+
|
|
152
|
+
const str = (v: AttrValue | undefined): string | undefined => (v === undefined ? undefined : String(v));
|
|
153
|
+
|
|
154
|
+
function fieldChange(field: string, from?: string, to?: string): FieldChange {
|
|
155
|
+
return { field, ...(from !== undefined ? { from } : {}), ...(to !== undefined ? { to } : {}) };
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
/** 属性の差分 — キー和集合の辞書順。値はStringで比べる (parseの数値化は両側で対称) */
|
|
159
|
+
function attrFields(a: Attrs, b: Attrs, prefix = ""): FieldChange[] {
|
|
160
|
+
const out: FieldChange[] = [];
|
|
161
|
+
for (const k of [...new Set([...Object.keys(a), ...Object.keys(b)])].sort()) {
|
|
162
|
+
if (a[k] === b[k]) continue;
|
|
163
|
+
out.push(fieldChange(`${prefix}${k}`, str(a[k]), str(b[k])));
|
|
164
|
+
}
|
|
165
|
+
return out;
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
/** 領域 (グリッド参照) の人間可読表記 */
|
|
169
|
+
function fmtGrids(s: Space): string {
|
|
170
|
+
if (s.grids.length === 0) return "—";
|
|
171
|
+
return s.grids.map((g) => `${g.xa}..${g.xb} ${g.ya}..${g.yb}`).join(" + ");
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
const fmtArea = (v: number | undefined): string | undefined => (v === undefined ? undefined : `${v.toFixed(2)}㎡`);
|
|
175
|
+
|
|
176
|
+
function spaceFields(sa: Space, sb: Space): FieldChange[] {
|
|
177
|
+
const fields: FieldChange[] = [];
|
|
178
|
+
if (sa.type !== sb.type) fields.push(fieldChange("type", sa.type, sb.type));
|
|
179
|
+
if (sa.level !== sb.level) fields.push(fieldChange("level", sa.level ?? "—", sb.level ?? "—"));
|
|
180
|
+
const ea = canonicalSpaceEntry(sa);
|
|
181
|
+
const eb = canonicalSpaceEntry(sb);
|
|
182
|
+
if (JSON.stringify(ea["at"] ?? null) !== JSON.stringify(eb["at"] ?? null)) {
|
|
183
|
+
fields.push(fieldChange("領域", fmtGrids(sa), fmtGrids(sb)));
|
|
184
|
+
}
|
|
185
|
+
// 面積は導出値の差分として別掲する — 領域が同じでもグリッド座標の移動で変わる (原因はgrid差分が先頭で言う)
|
|
186
|
+
const arA = areaM2(sa);
|
|
187
|
+
const arB = areaM2(sb);
|
|
188
|
+
if (arA !== arB) fields.push(fieldChange("面積", fmtArea(arA), fmtArea(arB)));
|
|
189
|
+
fields.push(...attrFields(sa.attrs, sb.attrs));
|
|
190
|
+
// 数えない分節 (area) — 正準順の直列で多重集合として比べる
|
|
191
|
+
fields.push(
|
|
192
|
+
...multisetFields(
|
|
193
|
+
(ea["areas"] as unknown[] | undefined) ?? [],
|
|
194
|
+
(eb["areas"] as unknown[] | undefined) ?? [],
|
|
195
|
+
() => "area",
|
|
196
|
+
(e) => JSON.stringify(e),
|
|
197
|
+
),
|
|
198
|
+
);
|
|
199
|
+
return fields;
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
/** 直列化の多重集合差分 — 一致は相殺し、残りを追加/削除のFieldChangeにする */
|
|
203
|
+
function multisetFields(
|
|
204
|
+
as: unknown[],
|
|
205
|
+
bs: unknown[],
|
|
206
|
+
label: (e: unknown) => string,
|
|
207
|
+
describe: (e: unknown) => string,
|
|
208
|
+
): FieldChange[] {
|
|
209
|
+
const count = new Map<string, number>();
|
|
210
|
+
for (const e of as) {
|
|
211
|
+
const k = JSON.stringify(e);
|
|
212
|
+
count.set(k, (count.get(k) ?? 0) + 1);
|
|
213
|
+
}
|
|
214
|
+
const out: FieldChange[] = [];
|
|
215
|
+
for (const e of bs) {
|
|
216
|
+
const k = JSON.stringify(e);
|
|
217
|
+
const c = count.get(k) ?? 0;
|
|
218
|
+
if (c > 0) count.set(k, c - 1);
|
|
219
|
+
else out.push(fieldChange(label(e), undefined, describe(e)));
|
|
220
|
+
}
|
|
221
|
+
for (const e of as) {
|
|
222
|
+
const k = JSON.stringify(e);
|
|
223
|
+
const c = count.get(k) ?? 0;
|
|
224
|
+
if (c > 0) {
|
|
225
|
+
count.set(k, c - 1);
|
|
226
|
+
out.push(fieldChange(label(e), describe(e), undefined));
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
return out;
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
// ---- 境界 ----
|
|
233
|
+
|
|
234
|
+
/** aの向きが意味を持つか — edge/開口 (swing/hinge)/segはa側の矩形から読まれる */
|
|
235
|
+
function orientationMatters(b: Boundary): boolean {
|
|
236
|
+
return b.edge !== undefined || b.openings.length > 0 || b.segs.length > 0;
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
/**
|
|
240
|
+
* 比較用の直列 — 正準エントリのa/betweenを安定トークンに置き換える。
|
|
241
|
+
* derivedフラグはエントリに出ない: 素の宣言wallと既定壁は同一の直列になる (ADR-0014の同一視)。
|
|
242
|
+
* 向き (a) は意味を持つときだけ比べる
|
|
243
|
+
*/
|
|
244
|
+
function comparable(b: Boundary, tok: (p: string) => string): string {
|
|
245
|
+
const e = canonicalBoundaryEntry(b);
|
|
246
|
+
e["between"] = [tok(b.a), tok(b.b)].sort();
|
|
247
|
+
if (orientationMatters(b)) e["a"] = tok(b.a);
|
|
248
|
+
else delete e["a"];
|
|
249
|
+
return JSON.stringify(e);
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
/** 開口の対のキー: (kind, edge??"", atRef??at)。対はw/h/hinge/swing/ref/attrsのフィールド差分 */
|
|
253
|
+
const openingKey = (o: Opening): string => `${o.kind}#${o.edge ?? ""}#${String(o.atRef ?? o.at)}`;
|
|
254
|
+
const openingLabel = (o: Opening): string =>
|
|
255
|
+
`${o.kind}${o.edge ? ` edge:${o.edge}` : ""} at:${String(o.atRef ?? o.at)}`;
|
|
256
|
+
|
|
257
|
+
function describeOpening(o: Opening): string {
|
|
258
|
+
const parts = [
|
|
259
|
+
...(o.ref ? [o.ref] : []),
|
|
260
|
+
`w:${o.w}`,
|
|
261
|
+
...(o.h !== undefined ? [`h:${o.h}`] : []),
|
|
262
|
+
...(o.hinge ? [`hinge:${o.hinge}`] : []),
|
|
263
|
+
...(o.swing ? [`swing:${o.swing}`] : []),
|
|
264
|
+
...Object.entries(o.attrs).map(([k, v]) => `${k}:${v}`),
|
|
265
|
+
];
|
|
266
|
+
return parts.join(" ");
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
/** segの対のキー: (edge??"", atRef??at, w)。対はattrsのフィールド差分 */
|
|
270
|
+
const segKey = (g: Seg): string => `${g.edge ?? ""}#${String(g.atRef ?? g.at)}#${g.w}`;
|
|
271
|
+
const segLabel = (g: Seg): string => `seg${g.edge ? ` edge:${g.edge}` : ""} at:${String(g.atRef ?? g.at)} w:${g.w}`;
|
|
272
|
+
|
|
273
|
+
interface Keyed<T> {
|
|
274
|
+
x: T;
|
|
275
|
+
key: string;
|
|
276
|
+
serial: string;
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
/**
|
|
280
|
+
* キーで束ね、直列一致を相殺し、残りを直列順に対にする — 開口・seg・境界に共通の2段構え。
|
|
281
|
+
* キー衝突 (同位置の開口・BND02重複の境界) でも落ちずに対→追加/削除へ順に流す
|
|
282
|
+
*/
|
|
283
|
+
function pairUp<T>(as: Keyed<T>[], bs: Keyed<T>[]) {
|
|
284
|
+
const group = (xs: Keyed<T>[]): Map<string, Keyed<T>[]> => {
|
|
285
|
+
const m = new Map<string, Keyed<T>[]>();
|
|
286
|
+
for (const e of xs) {
|
|
287
|
+
const arr = m.get(e.key) ?? [];
|
|
288
|
+
arr.push(e);
|
|
289
|
+
m.set(e.key, arr);
|
|
290
|
+
}
|
|
291
|
+
return m;
|
|
292
|
+
};
|
|
293
|
+
const ga = group(as);
|
|
294
|
+
const gb = group(bs);
|
|
295
|
+
const pairs: Array<[T, T]> = [];
|
|
296
|
+
const removed: T[] = [];
|
|
297
|
+
const added: T[] = [];
|
|
298
|
+
for (const k of [...new Set([...ga.keys(), ...gb.keys()])].sort()) {
|
|
299
|
+
const la = ga.get(k) ?? [];
|
|
300
|
+
const lb = gb.get(k) ?? [];
|
|
301
|
+
// 直列一致は相殺 (多重集合)
|
|
302
|
+
const used = new Set<number>();
|
|
303
|
+
const remA: Keyed<T>[] = [];
|
|
304
|
+
for (const ea of la) {
|
|
305
|
+
const i = lb.findIndex((eb, j) => !used.has(j) && ea.serial === eb.serial);
|
|
306
|
+
if (i >= 0) used.add(i);
|
|
307
|
+
else remA.push(ea);
|
|
308
|
+
}
|
|
309
|
+
const remB = lb.filter((_, j) => !used.has(j));
|
|
310
|
+
remA.sort((x, y) => (x.serial < y.serial ? -1 : 1));
|
|
311
|
+
remB.sort((x, y) => (x.serial < y.serial ? -1 : 1));
|
|
312
|
+
const n = Math.min(remA.length, remB.length);
|
|
313
|
+
for (let i = 0; i < n; i++) pairs.push([remA[i]!.x, remB[i]!.x]);
|
|
314
|
+
removed.push(...remA.slice(n).map((e) => e.x));
|
|
315
|
+
added.push(...remB.slice(n).map((e) => e.x));
|
|
316
|
+
}
|
|
317
|
+
return { pairs, removed, added };
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
const keyed = <T>(xs: T[], key: (x: T) => string, serial: (x: T) => string): Keyed<T>[] =>
|
|
321
|
+
xs.map((x) => ({ x, key: key(x), serial: serial(x) }));
|
|
322
|
+
|
|
323
|
+
function openingFields(oa: Opening, ob: Opening): FieldChange[] {
|
|
324
|
+
const label = openingLabel(ob);
|
|
325
|
+
const out: FieldChange[] = [];
|
|
326
|
+
const sub = (f: string, va: AttrValue | undefined, vb: AttrValue | undefined) => {
|
|
327
|
+
if (va !== vb) out.push(fieldChange(`${label} ${f}`, str(va), str(vb)));
|
|
328
|
+
};
|
|
329
|
+
sub("ref", oa.ref, ob.ref);
|
|
330
|
+
sub("w", oa.w, ob.w);
|
|
331
|
+
sub("h", oa.h, ob.h);
|
|
332
|
+
sub("hinge", oa.hinge, ob.hinge);
|
|
333
|
+
sub("swing", oa.swing, ob.swing);
|
|
334
|
+
out.push(...attrFields(oa.attrs, ob.attrs, `${label} `));
|
|
335
|
+
return out;
|
|
336
|
+
}
|
|
337
|
+
|
|
338
|
+
function boundaryFields(ba: Boundary, bb: Boundary, tokA: (p: string) => string, tokB: (p: string) => string): FieldChange[] {
|
|
339
|
+
const out: FieldChange[] = [];
|
|
340
|
+
if (ba.kind !== bb.kind) out.push(fieldChange("kind", ba.kind, bb.kind));
|
|
341
|
+
if (ba.t !== bb.t) out.push(fieldChange("t", str(ba.t), str(bb.t)));
|
|
342
|
+
if ((ba.air ?? false) !== (bb.air ?? false)) out.push(fieldChange("air", ba.air ? "1" : undefined, bb.air ? "1" : undefined));
|
|
343
|
+
if ((orientationMatters(ba) || orientationMatters(bb)) && tokA(ba.a) !== tokB(bb.a)) {
|
|
344
|
+
out.push(fieldChange("向き(a側)", ba.a, bb.a));
|
|
345
|
+
}
|
|
346
|
+
out.push(...attrFields(ba.attrs, bb.attrs));
|
|
347
|
+
// 開口 — (kind, edge, at) で対にし、対はフィールド差分、残りは追加/削除
|
|
348
|
+
const oSerial = (o: Opening): string => JSON.stringify(canonicalOpeningEntry(o));
|
|
349
|
+
const ops = pairUp(keyed(ba.openings, openingKey, oSerial), keyed(bb.openings, openingKey, oSerial));
|
|
350
|
+
for (const [oa, ob] of ops.pairs) out.push(...openingFields(oa, ob));
|
|
351
|
+
for (const o of ops.added) out.push(fieldChange(openingLabel(o), undefined, describeOpening(o)));
|
|
352
|
+
for (const o of ops.removed) out.push(fieldChange(openingLabel(o), describeOpening(o), undefined));
|
|
353
|
+
// seg — (edge, at, w) で対にし、対はattrsの差分
|
|
354
|
+
const gSerial = (g: Seg): string => JSON.stringify(canonicalSegEntry(g));
|
|
355
|
+
const sgs = pairUp(keyed(ba.segs, segKey, gSerial), keyed(bb.segs, segKey, gSerial));
|
|
356
|
+
for (const [ga, gb] of sgs.pairs) out.push(...attrFields(ga.attrs, gb.attrs, `${segLabel(gb)} `));
|
|
357
|
+
for (const g of sgs.added) {
|
|
358
|
+
out.push(fieldChange(segLabel(g), undefined, Object.entries(g.attrs).map(([k, v]) => `${k}:${v}`).join(" ")));
|
|
359
|
+
}
|
|
360
|
+
for (const g of sgs.removed) {
|
|
361
|
+
out.push(fieldChange(segLabel(g), Object.entries(g.attrs).map(([k, v]) => `${k}:${v}`).join(" "), undefined));
|
|
362
|
+
}
|
|
363
|
+
return out;
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
// ---- 多角形 ----
|
|
367
|
+
|
|
368
|
+
/** 巡回正規化 (回転・反転で最小の直列) — 始点の書き替え・逆回りは形の変化ではない */
|
|
369
|
+
function polygonNormal(points: Pt[]): string {
|
|
370
|
+
const arr = points.map((p) => [p.x, p.y]);
|
|
371
|
+
let best: string | undefined;
|
|
372
|
+
for (const seq of [arr, [...arr].reverse()]) {
|
|
373
|
+
for (let i = 0; i < seq.length; i++) {
|
|
374
|
+
const s = JSON.stringify([...seq.slice(i), ...seq.slice(0, i)]);
|
|
375
|
+
if (best === undefined || s < best) best = s;
|
|
376
|
+
}
|
|
377
|
+
}
|
|
378
|
+
return best ?? "[]";
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
// ---- 本体 ----
|
|
382
|
+
|
|
383
|
+
/** 二つのModelの意味差分。toCanonical(a)===toCanonical(b) なら空 (不変量) */
|
|
384
|
+
export function semanticDiff(a: Model, b: Model): ModelDiff {
|
|
385
|
+
const d: ModelDiff = {
|
|
386
|
+
grid: [],
|
|
387
|
+
levels: { added: [], removed: [], changed: [] },
|
|
388
|
+
assets: { added: [], removed: [], changed: [] },
|
|
389
|
+
polygons: { added: [], removed: [], changed: [] },
|
|
390
|
+
zones: { added: [], removed: [], renamed: [], changed: [] },
|
|
391
|
+
spaces: { added: [], removed: [], renamed: [], changed: [] },
|
|
392
|
+
boundaries: { added: [], removed: [], changed: [] },
|
|
393
|
+
};
|
|
394
|
+
if (a.version !== b.version) d.version = { from: a.version, to: b.version };
|
|
395
|
+
if (a.name !== b.name) {
|
|
396
|
+
d.name = { ...(a.name !== undefined ? { from: a.name } : {}), ...(b.name !== undefined ? { to: b.name } : {}) };
|
|
397
|
+
}
|
|
398
|
+
|
|
399
|
+
// グリッド — 出力の先頭に置く (空間の面積差分の原因説明になる)。名は位置 (X1=先頭) から読む
|
|
400
|
+
for (const axis of ["X", "Y"] as const) {
|
|
401
|
+
const ca = a.grid[axis].coords;
|
|
402
|
+
const cb = b.grid[axis].coords;
|
|
403
|
+
for (let i = 0; i < Math.max(ca.length, cb.length); i++) {
|
|
404
|
+
const name = `${axis}${i + 1}`;
|
|
405
|
+
const va = ca[i];
|
|
406
|
+
const vb = cb[i];
|
|
407
|
+
if (va === undefined && vb !== undefined) d.grid.push({ axis, name, kind: "added", to: vb });
|
|
408
|
+
else if (va !== undefined && vb === undefined) d.grid.push({ axis, name, kind: "removed", from: va });
|
|
409
|
+
else if (va !== undefined && vb !== undefined && va !== vb) {
|
|
410
|
+
d.grid.push({ axis, name, kind: "moved", from: va, to: vb });
|
|
411
|
+
}
|
|
412
|
+
}
|
|
413
|
+
}
|
|
414
|
+
|
|
415
|
+
// レベル — uidを持たないため改名は削除+追加になる (既知の限界 — ADR-0018)
|
|
416
|
+
const levelSort = levelOrder(a, b);
|
|
417
|
+
for (const name of [...new Set([...Object.keys(a.levels), ...Object.keys(b.levels)])].sort(
|
|
418
|
+
(p, q) => (levelSort.get(p) ?? 0) - (levelSort.get(q) ?? 0),
|
|
419
|
+
)) {
|
|
420
|
+
const la = a.levels[name];
|
|
421
|
+
const lb = b.levels[name];
|
|
422
|
+
if (!la && lb) d.levels.added.push(name);
|
|
423
|
+
else if (la && !lb) d.levels.removed.push(name);
|
|
424
|
+
else if (la && lb) {
|
|
425
|
+
const fields: FieldChange[] = [];
|
|
426
|
+
if (la.z !== lb.z) fields.push(fieldChange("z", str(la.z), str(lb.z)));
|
|
427
|
+
if (la.h !== lb.h) fields.push(fieldChange("h", str(la.h), str(lb.h)));
|
|
428
|
+
if (la.slab !== lb.slab) fields.push(fieldChange("slab", str(la.slab), str(lb.slab)));
|
|
429
|
+
if (fields.length) d.levels.changed.push({ path: name, fields });
|
|
430
|
+
}
|
|
431
|
+
}
|
|
432
|
+
|
|
433
|
+
// 建具アセット — 名がキー
|
|
434
|
+
for (const name of [...new Set([...a.assets.keys(), ...b.assets.keys()])].sort()) {
|
|
435
|
+
const aa = a.assets.get(name);
|
|
436
|
+
const ab = b.assets.get(name);
|
|
437
|
+
if (!aa && ab) d.assets.added.push(name);
|
|
438
|
+
else if (aa && !ab) d.assets.removed.push(name);
|
|
439
|
+
else if (aa && ab) {
|
|
440
|
+
const fields: FieldChange[] = [];
|
|
441
|
+
if (aa.kind !== ab.kind) fields.push(fieldChange("kind", aa.kind, ab.kind));
|
|
442
|
+
fields.push(...attrFields(aa.attrs, ab.attrs));
|
|
443
|
+
if (fields.length) d.assets.changed.push({ path: name, fields });
|
|
444
|
+
}
|
|
445
|
+
}
|
|
446
|
+
|
|
447
|
+
// 敷地形状 — パスがキー。巡回正規化 (回転・反転) で一致すれば差分なし
|
|
448
|
+
for (const path of [...new Set([...a.polygons.keys(), ...b.polygons.keys()])].sort()) {
|
|
449
|
+
const pa = a.polygons.get(path);
|
|
450
|
+
const pb = b.polygons.get(path);
|
|
451
|
+
if (!pa && pb) d.polygons.added.push(path);
|
|
452
|
+
else if (pa && !pb) d.polygons.removed.push(path);
|
|
453
|
+
else if (pa && pb && polygonNormal(pa.points) !== polygonNormal(pb.points)) {
|
|
454
|
+
d.polygons.changed.push({
|
|
455
|
+
path,
|
|
456
|
+
fields: [
|
|
457
|
+
fieldChange("頂点", String(pa.points.length), String(pb.points.length)),
|
|
458
|
+
fieldChange("面積", fmtArea(round2(polygonAreaM2(pa.points))), fmtArea(round2(polygonAreaM2(pb.points)))),
|
|
459
|
+
],
|
|
460
|
+
});
|
|
461
|
+
}
|
|
462
|
+
}
|
|
463
|
+
|
|
464
|
+
// ゾーン — 空間と同じ2パス対応 (uid→パス)
|
|
465
|
+
const zm = matchByUidThenPath([...a.zones.values()], [...b.zones.values()]);
|
|
466
|
+
d.zones.renamed = zm.renamed.sort((x, y) => (x.to < y.to ? -1 : 1));
|
|
467
|
+
d.zones.added = zm.added.map((z) => z.path).sort();
|
|
468
|
+
d.zones.removed = zm.removed.map((z) => z.path).sort();
|
|
469
|
+
for (const p of zm.pairs) {
|
|
470
|
+
const fields = attrFields(p.a.attrs, p.b.attrs);
|
|
471
|
+
if (fields.length) d.zones.changed.push({ path: p.b.path, fields });
|
|
472
|
+
}
|
|
473
|
+
d.zones.changed.sort((x, y) => (x.path < y.path ? -1 : 1));
|
|
474
|
+
|
|
475
|
+
// 空間 — 2パス対応。並びはパス順→レベル順 (スパン展開の行が隣接する)
|
|
476
|
+
const sm = matchByUidThenPath([...a.spaces.values()], [...b.spaces.values()]);
|
|
477
|
+
const key = (path: string): string => pathSortKey(path, levelSort);
|
|
478
|
+
d.spaces.renamed = sm.renamed.sort((x, y) => (key(x.to) < key(y.to) ? -1 : 1));
|
|
479
|
+
const spaceItem = (s: Space): SpaceItem => {
|
|
480
|
+
const ar = areaM2(s);
|
|
481
|
+
return { path: s.path, type: s.type, ...(ar !== undefined ? { areaM2: ar } : {}) };
|
|
482
|
+
};
|
|
483
|
+
d.spaces.added = sm.added.map(spaceItem).sort((x, y) => (key(x.path) < key(y.path) ? -1 : 1));
|
|
484
|
+
d.spaces.removed = sm.removed.map(spaceItem).sort((x, y) => (key(x.path) < key(y.path) ? -1 : 1));
|
|
485
|
+
for (const p of sm.pairs) {
|
|
486
|
+
const fields = spaceFields(p.a, p.b);
|
|
487
|
+
if (fields.length) d.spaces.changed.push({ path: p.b.path, fields });
|
|
488
|
+
}
|
|
489
|
+
d.spaces.changed.sort((x, y) => (key(x.path) < key(y.path) ? -1 : 1));
|
|
490
|
+
|
|
491
|
+
// 境界 — 実効集合。キーは (安定トークン2つの昇順, edge??"")。改名は対応対のトークンが吸収する
|
|
492
|
+
const tokMapA = new Map<string, string>();
|
|
493
|
+
const tokMapB = new Map<string, string>();
|
|
494
|
+
for (const p of sm.pairs) {
|
|
495
|
+
tokMapA.set(p.a.path, p.token);
|
|
496
|
+
tokMapB.set(p.b.path, p.token);
|
|
497
|
+
}
|
|
498
|
+
for (const s of sm.removed) tokMapA.set(s.path, s.path);
|
|
499
|
+
for (const s of sm.added) tokMapB.set(s.path, s.path);
|
|
500
|
+
const tokA = (p: string): string => tokMapA.get(p) ?? p; // 未定義の空間参照 (REF01) はパスのまま
|
|
501
|
+
const tokB = (p: string): string => tokMapB.get(p) ?? p;
|
|
502
|
+
const bKey = (tok: (p: string) => string) => (x: Boundary): string =>
|
|
503
|
+
`${[tok(x.a), tok(x.b)].sort().join("\u0000")}#${x.edge ?? ""}`;
|
|
504
|
+
const bm = pairUp(
|
|
505
|
+
keyed(a.boundaries, bKey(tokA), (x) => comparable(x, tokA)),
|
|
506
|
+
keyed(b.boundaries, bKey(tokB), (x) => comparable(x, tokB)),
|
|
507
|
+
);
|
|
508
|
+
const bItem = (x: Boundary): BoundaryItem => ({
|
|
509
|
+
between: [x.a, x.b].sort() as [string, string],
|
|
510
|
+
...(x.edge ? { edge: x.edge } : {}),
|
|
511
|
+
kind: x.kind,
|
|
512
|
+
...(x.t !== undefined ? { t: x.t } : {}),
|
|
513
|
+
});
|
|
514
|
+
const bSort = (x: { between: [string, string] }, y: { between: [string, string] }): number => {
|
|
515
|
+
const kx = `${key(x.between[0])} | ${key(x.between[1])}`;
|
|
516
|
+
const ky = `${key(y.between[0])} | ${key(y.between[1])}`;
|
|
517
|
+
return kx < ky ? -1 : 1;
|
|
518
|
+
};
|
|
519
|
+
for (const [ba, bb] of bm.pairs) {
|
|
520
|
+
const fields = boundaryFields(ba, bb, tokA, tokB);
|
|
521
|
+
if (fields.length) {
|
|
522
|
+
d.boundaries.changed.push({
|
|
523
|
+
between: [bb.a, bb.b].sort() as [string, string],
|
|
524
|
+
...(bb.edge ? { edge: bb.edge } : {}),
|
|
525
|
+
fields,
|
|
526
|
+
});
|
|
527
|
+
}
|
|
528
|
+
}
|
|
529
|
+
d.boundaries.added = bm.added.map(bItem).sort(bSort);
|
|
530
|
+
d.boundaries.removed = bm.removed.map(bItem).sort(bSort);
|
|
531
|
+
d.boundaries.changed.sort(bSort);
|
|
532
|
+
return d;
|
|
533
|
+
}
|
|
534
|
+
|
|
535
|
+
const round2 = (v: number): number => Math.round(v * 100) / 100;
|
|
536
|
+
|
|
537
|
+
/** レベル名→z順の序数 (両モデルの和集合)。パスの並べ替えに使う */
|
|
538
|
+
function levelOrder(a: Model, b: Model): Map<string, number> {
|
|
539
|
+
const merged = new Map<string, number>();
|
|
540
|
+
for (const l of [...Object.values(a.levels), ...Object.values(b.levels)]) {
|
|
541
|
+
if (!merged.has(l.name)) merged.set(l.name, l.z);
|
|
542
|
+
}
|
|
543
|
+
return new Map([...merged].sort((x, y) => x[1] - y[1]).map(([name], i) => [name, i]));
|
|
544
|
+
}
|
|
545
|
+
|
|
546
|
+
/**
|
|
547
|
+
* パス順→レベル順のキー: 先頭セグメントがレベルなら (残りのパス, レベル序数) で並べる —
|
|
548
|
+
* スパン展開の同名空間 (/L4/A/ldk … /L10/A/ldk) が隣接して階順に並ぶ
|
|
549
|
+
*/
|
|
550
|
+
function pathSortKey(path: string, levels: Map<string, number>): string {
|
|
551
|
+
const segs = path.split("/");
|
|
552
|
+
const lv = segs[1] !== undefined ? levels.get(segs[1]) : undefined;
|
|
553
|
+
if (lv === undefined) return `${path}\u0000`;
|
|
554
|
+
return `/${segs.slice(2).join("/")}\u0000${String(lv).padStart(4, "0")}`;
|
|
555
|
+
}
|
|
556
|
+
|
|
557
|
+
// ---- 人間可読出力 ----
|
|
558
|
+
|
|
559
|
+
/** フィールドの変化を「field from → to」に組む (片側欠落は +/−) */
|
|
560
|
+
function fmtField(f: FieldChange): string {
|
|
561
|
+
if (f.from === undefined) return `+ ${f.field}${f.to !== undefined && f.to !== "" ? ` ${f.to}` : ""}`;
|
|
562
|
+
if (f.to === undefined) return `− ${f.field}${f.from !== "" ? ` (${f.from})` : ""}`;
|
|
563
|
+
return `${f.field} ${f.from} → ${f.to}`;
|
|
564
|
+
}
|
|
565
|
+
|
|
566
|
+
const fmtFields = (fields: FieldChange[]): string => fields.map(fmtField).join(" / ");
|
|
567
|
+
|
|
568
|
+
const betweenLabel = (x: { between: [string, string]; edge?: Edge }): string =>
|
|
569
|
+
`${x.between[0]} | ${x.between[1]}${x.edge ? ` edge:${x.edge}` : ""}`;
|
|
570
|
+
|
|
571
|
+
/** 日本語の差分行 (空なら差分なし)。並びはsemanticDiffが決めた正準順のまま */
|
|
572
|
+
export function renderDiff(d: ModelDiff): string[] {
|
|
573
|
+
const out: string[] = [];
|
|
574
|
+
for (const g of d.grid) {
|
|
575
|
+
if (g.kind === "moved") out.push(`± grid ${g.axis} ${g.name} ${g.from} → ${g.to}`);
|
|
576
|
+
else if (g.kind === "added") out.push(`+ grid ${g.axis} ${g.name} ${g.to}`);
|
|
577
|
+
else out.push(`− grid ${g.axis} ${g.name} ${g.from}`);
|
|
578
|
+
}
|
|
579
|
+
if (d.version) out.push(`± koyu ${d.version.from} → ${d.version.to}`);
|
|
580
|
+
if (d.name) out.push(`± name ${d.name.from ?? "—"} → ${d.name.to ?? "—"}`);
|
|
581
|
+
for (const n of d.levels.added) out.push(`+ level ${n}`);
|
|
582
|
+
for (const n of d.levels.removed) out.push(`− level ${n}`);
|
|
583
|
+
for (const c of d.levels.changed) out.push(`± level ${c.path}: ${fmtFields(c.fields)}`);
|
|
584
|
+
for (const n of d.assets.added) out.push(`+ asset ${n}`);
|
|
585
|
+
for (const n of d.assets.removed) out.push(`− asset ${n}`);
|
|
586
|
+
for (const c of d.assets.changed) out.push(`± asset ${c.path}: ${fmtFields(c.fields)}`);
|
|
587
|
+
for (const p of d.polygons.added) out.push(`+ polygon ${p}`);
|
|
588
|
+
for (const p of d.polygons.removed) out.push(`− polygon ${p}`);
|
|
589
|
+
for (const c of d.polygons.changed) out.push(`± polygon ${c.path}: ${fmtFields(c.fields)}`);
|
|
590
|
+
for (const r of d.zones.renamed) out.push(`改名 ゾーン ${r.from} → ${r.to} (uid:${r.uid})`);
|
|
591
|
+
for (const p of d.zones.added) out.push(`+ ゾーン ${p}`);
|
|
592
|
+
for (const p of d.zones.removed) out.push(`− ゾーン ${p}`);
|
|
593
|
+
for (const c of d.zones.changed) out.push(`± ゾーン ${c.path}: ${fmtFields(c.fields)}`);
|
|
594
|
+
for (const r of d.spaces.renamed) out.push(`改名 ${r.from} → ${r.to} (uid:${r.uid})`);
|
|
595
|
+
for (const s of d.spaces.added) {
|
|
596
|
+
out.push(`+ 空間 ${s.path} (${s.type}${s.areaM2 !== undefined ? ` ${s.areaM2.toFixed(2)}㎡` : ""})`);
|
|
597
|
+
}
|
|
598
|
+
for (const s of d.spaces.removed) {
|
|
599
|
+
out.push(`− 空間 ${s.path} (${s.type}${s.areaM2 !== undefined ? ` ${s.areaM2.toFixed(2)}㎡` : ""})`);
|
|
600
|
+
}
|
|
601
|
+
for (const c of d.spaces.changed) out.push(`± ${c.path}: ${fmtFields(c.fields)}`);
|
|
602
|
+
for (const x of d.boundaries.added) {
|
|
603
|
+
out.push(`+ 境界 ${betweenLabel(x)} (${x.kind}${x.t !== undefined ? ` t:${x.t}` : ""})`);
|
|
604
|
+
}
|
|
605
|
+
for (const x of d.boundaries.removed) out.push(`− 境界 ${betweenLabel(x)}`);
|
|
606
|
+
for (const c of d.boundaries.changed) out.push(`± 境界 ${betweenLabel(c)}: ${fmtFields(c.fields)}`);
|
|
607
|
+
return out;
|
|
608
|
+
}
|