@milehimikey/em 1.4.0 → 1.6.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/.claude/skills/event-modeling/SKILL.md +121 -30
- package/.claude/skills/event-modeling/reference/conform.md +36 -7
- package/.claude/skills/event-modeling/reference/em-dsl.md +210 -48
- package/.claude/skills/event-modeling/reference/extract.md +24 -7
- package/.claude/skills/event-modeling/reference/methodology.md +129 -32
- package/.claude/skills/event-modeling/templates/conformance-report.md +9 -7
- package/.claude/skills/event-modeling/templates/model-readme.md +9 -0
- package/.claude/skills/event-modeling/templates/slice.md +20 -1
- package/.claude/skills/event-modeling/templates/state.md +8 -0
- package/README.md +1 -0
- package/dist/catalog/build.d.ts +33 -0
- package/dist/catalog/build.js +117 -0
- package/dist/catalog/build.js.map +1 -0
- package/dist/catalog/classify.d.ts +14 -0
- package/dist/catalog/classify.js +44 -0
- package/dist/catalog/classify.js.map +1 -0
- package/dist/catalog/pages.d.ts +45 -0
- package/dist/catalog/pages.js +174 -0
- package/dist/catalog/pages.js.map +1 -0
- package/dist/catalog/sliceDoc.d.ts +10 -0
- package/dist/catalog/sliceDoc.js +20 -0
- package/dist/catalog/sliceDoc.js.map +1 -0
- package/dist/cli/catalog-inputs.d.ts +16 -0
- package/dist/cli/catalog-inputs.js +18 -0
- package/dist/cli/catalog-inputs.js.map +1 -0
- package/dist/cli/glossary-inputs.d.ts +15 -0
- package/dist/cli/glossary-inputs.js +17 -0
- package/dist/cli/glossary-inputs.js.map +1 -0
- package/dist/cli/render-inputs.d.ts +27 -0
- package/dist/cli/render-inputs.js +41 -0
- package/dist/cli/render-inputs.js.map +1 -0
- package/dist/cli.js +188 -10
- package/dist/cli.js.map +1 -1
- package/dist/emit/diffJson.d.ts +1 -1
- package/dist/emit/diffJson.js +8 -1
- package/dist/emit/diffJson.js.map +1 -1
- package/dist/emit/dot.d.ts +7 -0
- package/dist/emit/dot.js +10 -4
- package/dist/emit/dot.js.map +1 -1
- package/dist/emit/glossaryJson.d.ts +13 -0
- package/dist/emit/glossaryJson.js +36 -0
- package/dist/emit/glossaryJson.js.map +1 -0
- package/dist/emit/json.d.ts +16 -2
- package/dist/emit/json.js +57 -6
- package/dist/emit/json.js.map +1 -1
- package/dist/emit/theme.d.ts +3 -0
- package/dist/emit/theme.js +19 -0
- package/dist/emit/theme.js.map +1 -1
- package/dist/model/diff.d.ts +36 -1
- package/dist/model/diff.js +198 -35
- package/dist/model/diff.js.map +1 -1
- package/dist/model/edges.d.ts +12 -1
- package/dist/model/edges.js +26 -24
- package/dist/model/edges.js.map +1 -1
- package/dist/model/glossary.d.ts +68 -0
- package/dist/model/glossary.js +138 -0
- package/dist/model/glossary.js.map +1 -0
- package/dist/model/model.d.ts +35 -0
- package/dist/model/model.js +41 -0
- package/dist/model/model.js.map +1 -1
- package/dist/model/validate.js +252 -1
- package/dist/model/validate.js.map +1 -1
- package/dist/parser/ast.d.ts +20 -0
- package/dist/parser/parser.js +158 -29
- package/dist/parser/parser.js.map +1 -1
- package/dist/render/drawEdges.d.ts +3 -1
- package/dist/render/drawEdges.js +119 -7
- package/dist/render/drawEdges.js.map +1 -1
- package/dist/render/drawNotes.d.ts +7 -3
- package/dist/render/drawNotes.js +75 -28
- package/dist/render/drawNotes.js.map +1 -1
- package/dist/render/render.d.ts +20 -1
- package/dist/render/render.js +57 -17
- package/dist/render/render.js.map +1 -1
- package/dist/render/serve.js +155 -0
- package/dist/render/serve.js.map +1 -1
- package/dist/render/sliceDiagram.d.ts +11 -0
- package/dist/render/sliceDiagram.js +198 -0
- package/dist/render/sliceDiagram.js.map +1 -0
- package/dist/render/sliceOverlay.d.ts +21 -0
- package/dist/render/sliceOverlay.js +111 -0
- package/dist/render/sliceOverlay.js.map +1 -0
- package/dist/render/sliceStatus.d.ts +5 -0
- package/dist/render/sliceStatus.js +26 -0
- package/dist/render/sliceStatus.js.map +1 -0
- package/dist/render/statusOverlay.d.ts +16 -0
- package/dist/render/statusOverlay.js +110 -0
- package/dist/render/statusOverlay.js.map +1 -0
- package/dist/render/svgGeometry.d.ts +43 -0
- package/dist/render/svgGeometry.js +69 -3
- package/dist/render/svgGeometry.js.map +1 -1
- package/dist/render/watch.d.ts +1 -1
- package/dist/render/watch.js +5 -2
- package/dist/render/watch.js.map +1 -1
- package/package.json +3 -2
package/dist/model/diff.js
CHANGED
|
@@ -14,6 +14,7 @@ function emptyCounts() {
|
|
|
14
14
|
return {
|
|
15
15
|
slicesAdded: 0,
|
|
16
16
|
slicesRemoved: 0,
|
|
17
|
+
sourceChanges: 0,
|
|
17
18
|
elementsAdded: 0,
|
|
18
19
|
elementsRemoved: 0,
|
|
19
20
|
elementsMoved: 0,
|
|
@@ -23,16 +24,35 @@ function emptyCounts() {
|
|
|
23
24
|
issuesOpened: 0,
|
|
24
25
|
issuesResolved: 0,
|
|
25
26
|
issuesChanged: 0,
|
|
27
|
+
eventsMarkedPublic: 0,
|
|
28
|
+
eventsUnmarkedPublic: 0,
|
|
26
29
|
arrowsAdded: 0,
|
|
27
30
|
arrowsRemoved: 0,
|
|
31
|
+
acceptedDivergences: 0,
|
|
32
|
+
typesAdded: 0,
|
|
33
|
+
typesRemoved: 0,
|
|
34
|
+
typeFieldChanges: 0,
|
|
28
35
|
};
|
|
29
36
|
}
|
|
37
|
+
/** Push `acceptedDivergence` onto an entry and tally it, when the canonical element carries one. */
|
|
38
|
+
function annotate(entry, counts, divergence) {
|
|
39
|
+
entry.acceptedDivergence = divergence ?? null;
|
|
40
|
+
if (divergence)
|
|
41
|
+
counts.acceptedDivergences++;
|
|
42
|
+
return entry;
|
|
43
|
+
}
|
|
30
44
|
const arrowKey = (from, to) => `${normalizeName(from)}->${normalizeName(to)}`;
|
|
31
45
|
export function diffModels(oldModel, newModel) {
|
|
32
46
|
const oldRefs = computeRefs(oldModel);
|
|
33
47
|
const newRefs = computeRefs(newModel);
|
|
34
48
|
const oldSliceKeySet = new Set(oldRefs.sliceKeys);
|
|
35
49
|
const newSliceKeySet = new Set(newRefs.sliceKeys);
|
|
50
|
+
// Slice key -> old Slice, for diffing `source` on slices that survive
|
|
51
|
+
// (i.e. aren't themselves added/removed) between the two models.
|
|
52
|
+
const oldSliceByKey = new Map();
|
|
53
|
+
oldModel.slices.forEach((slice, i) => {
|
|
54
|
+
oldSliceByKey.set(oldRefs.sliceKeys[i], slice);
|
|
55
|
+
});
|
|
36
56
|
// Whole-model ref indexes (not just surviving slices) — move detection and
|
|
37
57
|
// matched-pair diffing both need to see every element on both sides.
|
|
38
58
|
const oldElByRef = new Map();
|
|
@@ -89,7 +109,7 @@ export function diffModels(oldModel, newModel) {
|
|
|
89
109
|
const originRemoved = !newSliceKeySet.has(origin.sliceKey);
|
|
90
110
|
movedOldRefs.add(origin.ref);
|
|
91
111
|
if (!(targetIsNew && originRemoved)) {
|
|
92
|
-
movedNewRefs.set(ref, { fromSlice: origin.sliceName });
|
|
112
|
+
movedNewRefs.set(ref, { fromSlice: origin.sliceName, fromSliceKey: origin.sliceKey });
|
|
93
113
|
}
|
|
94
114
|
}
|
|
95
115
|
}
|
|
@@ -102,14 +122,17 @@ export function diffModels(oldModel, newModel) {
|
|
|
102
122
|
const sliceKey = newRefs.sliceKeys[i];
|
|
103
123
|
const sliceIsNew = !oldSliceKeySet.has(sliceKey);
|
|
104
124
|
if (sliceIsNew) {
|
|
105
|
-
changes.push({ type: "slice-added", name: slice.name });
|
|
125
|
+
changes.push({ type: "slice-added", name: slice.name, sliceKey });
|
|
106
126
|
counts.slicesAdded++;
|
|
107
127
|
}
|
|
128
|
+
else {
|
|
129
|
+
pushSliceChanges(changes, counts, oldSliceByKey.get(sliceKey), slice, sliceKey);
|
|
130
|
+
}
|
|
108
131
|
for (const el of slice.elements) {
|
|
109
132
|
const ref = newRefs.refById.get(el.id);
|
|
110
133
|
const oldEntry = oldElByRef.get(ref);
|
|
111
134
|
if (oldEntry) {
|
|
112
|
-
pushElementChanges(changes, counts, oldEntry.el, el, slice.name);
|
|
135
|
+
pushElementChanges(changes, counts, oldEntry.el, el, slice.name, sliceKey, ref);
|
|
113
136
|
continue;
|
|
114
137
|
}
|
|
115
138
|
const moved = movedNewRefs.get(ref);
|
|
@@ -118,8 +141,11 @@ export function diffModels(oldModel, newModel) {
|
|
|
118
141
|
type: "element-moved",
|
|
119
142
|
kind: el.kind,
|
|
120
143
|
name: el.name,
|
|
144
|
+
ref,
|
|
121
145
|
fromSlice: moved.fromSlice,
|
|
146
|
+
fromSliceKey: moved.fromSliceKey,
|
|
122
147
|
toSlice: slice.name,
|
|
148
|
+
toSliceKey: sliceKey,
|
|
123
149
|
});
|
|
124
150
|
counts.elementsMoved++;
|
|
125
151
|
}
|
|
@@ -127,7 +153,7 @@ export function diffModels(oldModel, newModel) {
|
|
|
127
153
|
// A genuinely new element in a slice that already existed. (A new
|
|
128
154
|
// element inside a brand-new slice is implied by "+ slice" above —
|
|
129
155
|
// element add/remove reporting is scoped to surviving slices.)
|
|
130
|
-
changes.push({ type: "element-added", kind: el.kind, name: el.name, sliceName: slice.name });
|
|
156
|
+
changes.push({ type: "element-added", kind: el.kind, name: el.name, ref, sliceName: slice.name, sliceKey });
|
|
131
157
|
counts.elementsAdded++;
|
|
132
158
|
}
|
|
133
159
|
}
|
|
@@ -144,7 +170,7 @@ export function diffModels(oldModel, newModel) {
|
|
|
144
170
|
const sliceKey = oldRefs.sliceKeys[i];
|
|
145
171
|
const sliceIsRemoved = !newSliceKeySet.has(sliceKey);
|
|
146
172
|
if (sliceIsRemoved) {
|
|
147
|
-
removals.push({ type: "slice-removed", name: slice.name });
|
|
173
|
+
removals.push({ type: "slice-removed", name: slice.name, sliceKey });
|
|
148
174
|
counts.slicesRemoved++;
|
|
149
175
|
}
|
|
150
176
|
for (const el of slice.elements) {
|
|
@@ -154,7 +180,7 @@ export function diffModels(oldModel, newModel) {
|
|
|
154
180
|
if (movedOldRefs.has(ref))
|
|
155
181
|
continue; // reported as "moved:" already
|
|
156
182
|
if (!sliceIsRemoved) {
|
|
157
|
-
removals.push({ type: "element-removed", kind: el.kind, name: el.name, sliceName: slice.name });
|
|
183
|
+
removals.push(annotate({ type: "element-removed", kind: el.kind, name: el.name, ref, sliceName: slice.name, sliceKey }, counts, el.divergence));
|
|
158
184
|
counts.elementsRemoved++;
|
|
159
185
|
}
|
|
160
186
|
}
|
|
@@ -166,50 +192,139 @@ export function diffModels(oldModel, newModel) {
|
|
|
166
192
|
counts.arrowsRemoved++;
|
|
167
193
|
}
|
|
168
194
|
}
|
|
195
|
+
// --- declared types (MIL-64): identity is export ref, same as elements — no slice
|
|
196
|
+
// scoping and no move detection (types aren't slice-scoped, so there's nothing to move
|
|
197
|
+
// between). A rename reads as remove+add, same convention as elements.
|
|
198
|
+
const oldTypeByRef = new Map();
|
|
199
|
+
oldModel.types.forEach((t, i) => oldTypeByRef.set(oldRefs.refByTypeId.get(t.id) ?? String(i), t));
|
|
200
|
+
const newTypeByRef = new Map();
|
|
201
|
+
newModel.types.forEach((t, i) => newTypeByRef.set(newRefs.refByTypeId.get(t.id) ?? String(i), t));
|
|
202
|
+
for (const t of newModel.types) {
|
|
203
|
+
const ref = newRefs.refByTypeId.get(t.id);
|
|
204
|
+
const oldType = oldTypeByRef.get(ref);
|
|
205
|
+
if (oldType) {
|
|
206
|
+
pushTypeFieldChanges(changes, counts, oldType, t, ref);
|
|
207
|
+
}
|
|
208
|
+
else {
|
|
209
|
+
changes.push({ type: "type-added", name: t.name, ref });
|
|
210
|
+
counts.typesAdded++;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
for (const t of oldModel.types) {
|
|
214
|
+
const ref = oldRefs.refByTypeId.get(t.id);
|
|
215
|
+
if (newTypeByRef.has(ref))
|
|
216
|
+
continue; // matched pair, already diffed above
|
|
217
|
+
removals.push({ type: "type-removed", name: t.name, ref });
|
|
218
|
+
counts.typesRemoved++;
|
|
219
|
+
}
|
|
169
220
|
return { changes, removals, counts };
|
|
170
221
|
}
|
|
222
|
+
/** Diff a surviving slice's `source` clause (added/removed/changed), same lifecycle shape as note. */
|
|
223
|
+
function pushSliceChanges(changes, counts, oldSlice, newSlice, sliceKey) {
|
|
224
|
+
if (oldSlice.source === newSlice.source)
|
|
225
|
+
return;
|
|
226
|
+
if (!oldSlice.source && newSlice.source) {
|
|
227
|
+
changes.push({ type: "source-added", sliceName: newSlice.name, sliceKey, newSource: newSlice.source });
|
|
228
|
+
}
|
|
229
|
+
else if (oldSlice.source && !newSlice.source) {
|
|
230
|
+
changes.push({ type: "source-removed", sliceName: newSlice.name, sliceKey, oldSource: oldSlice.source });
|
|
231
|
+
}
|
|
232
|
+
else {
|
|
233
|
+
changes.push({
|
|
234
|
+
type: "source-changed",
|
|
235
|
+
sliceName: newSlice.name,
|
|
236
|
+
sliceKey,
|
|
237
|
+
oldSource: oldSlice.source,
|
|
238
|
+
newSource: newSlice.source,
|
|
239
|
+
});
|
|
240
|
+
}
|
|
241
|
+
counts.sourceChanges++;
|
|
242
|
+
}
|
|
243
|
+
/** Diff a declared type's own fields for a type present on both sides (same ref) — a fields-
|
|
244
|
+
* only subset of `pushElementChanges()` below, since a `type` declaration has no slice, from,
|
|
245
|
+
* note, issue, public, or divergence dimension to diff. */
|
|
246
|
+
function pushTypeFieldChanges(changes, counts, oldType, newType, ref) {
|
|
247
|
+
const oldFields = new Map(oldType.fields.map((f) => [normalizeName(f.name), f]));
|
|
248
|
+
const newFields = new Map(newType.fields.map((f) => [normalizeName(f.name), f]));
|
|
249
|
+
for (const [key, f] of newFields) {
|
|
250
|
+
if (!oldFields.has(key)) {
|
|
251
|
+
changes.push({ type: "type-field-added", name: newType.name, ref, field: f.name, fieldType: f.type ?? null });
|
|
252
|
+
counts.typeFieldChanges++;
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
for (const [key, f] of oldFields) {
|
|
256
|
+
if (!newFields.has(key)) {
|
|
257
|
+
changes.push({ type: "type-field-removed", name: newType.name, ref, field: f.name, fieldType: f.type ?? null });
|
|
258
|
+
counts.typeFieldChanges++;
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
for (const [key, newF] of newFields) {
|
|
262
|
+
const oldF = oldFields.get(key);
|
|
263
|
+
if (oldF && (oldF.type ?? null) !== (newF.type ?? null)) {
|
|
264
|
+
changes.push({
|
|
265
|
+
type: "type-field-changed",
|
|
266
|
+
name: newType.name,
|
|
267
|
+
ref,
|
|
268
|
+
field: newF.name,
|
|
269
|
+
oldType: oldF.type ?? null,
|
|
270
|
+
newType: newF.type ?? null,
|
|
271
|
+
});
|
|
272
|
+
counts.typeFieldChanges++;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
}
|
|
171
276
|
/** Diff field/from/note/issue changes for an element present on both sides (same ref). */
|
|
172
|
-
function pushElementChanges(changes, counts, oldEl, newEl, sliceName) {
|
|
277
|
+
function pushElementChanges(changes, counts, oldEl, newEl, sliceName, sliceKey, ref) {
|
|
173
278
|
const oldFields = new Map((oldEl.fields ?? []).map((f) => [normalizeName(f.name), f]));
|
|
174
279
|
const newFields = new Map((newEl.fields ?? []).map((f) => [normalizeName(f.name), f]));
|
|
280
|
+
// Every entry below reports on `oldEl`/`newEl` — the same matched-pair element on both
|
|
281
|
+
// sides — so any of them may carry the canonical (`oldEl`) side's accepted-divergence
|
|
282
|
+
// annotation, cited via `annotate()` alongside the finding, not in place of it.
|
|
283
|
+
const div = oldEl.divergence;
|
|
175
284
|
for (const [key, f] of newFields) {
|
|
176
285
|
if (!oldFields.has(key)) {
|
|
177
|
-
changes.push({
|
|
286
|
+
changes.push(annotate({
|
|
178
287
|
type: "field-added",
|
|
179
288
|
kind: newEl.kind,
|
|
180
289
|
name: newEl.name,
|
|
290
|
+
ref,
|
|
181
291
|
sliceName,
|
|
292
|
+
sliceKey,
|
|
182
293
|
field: f.name,
|
|
183
294
|
fieldType: f.type ?? null,
|
|
184
|
-
});
|
|
295
|
+
}, counts, div));
|
|
185
296
|
counts.fieldChanges++;
|
|
186
297
|
}
|
|
187
298
|
}
|
|
188
299
|
for (const [key, f] of oldFields) {
|
|
189
300
|
if (!newFields.has(key)) {
|
|
190
|
-
changes.push({
|
|
301
|
+
changes.push(annotate({
|
|
191
302
|
type: "field-removed",
|
|
192
303
|
kind: newEl.kind,
|
|
193
304
|
name: newEl.name,
|
|
305
|
+
ref,
|
|
194
306
|
sliceName,
|
|
307
|
+
sliceKey,
|
|
195
308
|
field: f.name,
|
|
196
309
|
fieldType: f.type ?? null,
|
|
197
|
-
});
|
|
310
|
+
}, counts, div));
|
|
198
311
|
counts.fieldChanges++;
|
|
199
312
|
}
|
|
200
313
|
}
|
|
201
314
|
for (const [key, newF] of newFields) {
|
|
202
315
|
const oldF = oldFields.get(key);
|
|
203
316
|
if (oldF && (oldF.type ?? null) !== (newF.type ?? null)) {
|
|
204
|
-
changes.push({
|
|
317
|
+
changes.push(annotate({
|
|
205
318
|
type: "field-changed",
|
|
206
319
|
kind: newEl.kind,
|
|
207
320
|
name: newEl.name,
|
|
321
|
+
ref,
|
|
208
322
|
sliceName,
|
|
323
|
+
sliceKey,
|
|
209
324
|
field: newF.name,
|
|
210
325
|
oldType: oldF.type ?? null,
|
|
211
326
|
newType: newF.type ?? null,
|
|
212
|
-
});
|
|
327
|
+
}, counts, div));
|
|
213
328
|
counts.fieldChanges++;
|
|
214
329
|
}
|
|
215
330
|
}
|
|
@@ -219,32 +334,34 @@ function pushElementChanges(changes, counts, oldEl, newEl, sliceName) {
|
|
|
219
334
|
const newFromSet = new Set(newFrom.map(normalizeName));
|
|
220
335
|
for (const n of newFrom) {
|
|
221
336
|
if (!oldFromSet.has(normalizeName(n))) {
|
|
222
|
-
changes.push({ type: "from-added", kind: newEl.kind, name: newEl.name, sliceName, source: n });
|
|
337
|
+
changes.push(annotate({ type: "from-added", kind: newEl.kind, name: newEl.name, ref, sliceName, sliceKey, source: n }, counts, div));
|
|
223
338
|
counts.fromChanges++;
|
|
224
339
|
}
|
|
225
340
|
}
|
|
226
341
|
for (const n of oldFrom) {
|
|
227
342
|
if (!newFromSet.has(normalizeName(n))) {
|
|
228
|
-
changes.push({ type: "from-removed", kind: newEl.kind, name: newEl.name, sliceName, source: n });
|
|
343
|
+
changes.push(annotate({ type: "from-removed", kind: newEl.kind, name: newEl.name, ref, sliceName, sliceKey, source: n }, counts, div));
|
|
229
344
|
counts.fromChanges++;
|
|
230
345
|
}
|
|
231
346
|
}
|
|
232
347
|
if (oldEl.note !== newEl.note) {
|
|
233
348
|
if (!oldEl.note && newEl.note) {
|
|
234
|
-
changes.push({ type: "note-added", kind: newEl.kind, name: newEl.name, sliceName, newNote: newEl.note });
|
|
349
|
+
changes.push(annotate({ type: "note-added", kind: newEl.kind, name: newEl.name, ref, sliceName, sliceKey, newNote: newEl.note }, counts, div));
|
|
235
350
|
}
|
|
236
351
|
else if (oldEl.note && !newEl.note) {
|
|
237
|
-
changes.push({ type: "note-removed", kind: newEl.kind, name: newEl.name, sliceName, oldNote: oldEl.note });
|
|
352
|
+
changes.push(annotate({ type: "note-removed", kind: newEl.kind, name: newEl.name, ref, sliceName, sliceKey, oldNote: oldEl.note }, counts, div));
|
|
238
353
|
}
|
|
239
354
|
else {
|
|
240
|
-
changes.push({
|
|
355
|
+
changes.push(annotate({
|
|
241
356
|
type: "note-changed",
|
|
242
357
|
kind: newEl.kind,
|
|
243
358
|
name: newEl.name,
|
|
359
|
+
ref,
|
|
244
360
|
sliceName,
|
|
361
|
+
sliceKey,
|
|
245
362
|
oldNote: oldEl.note,
|
|
246
363
|
newNote: newEl.note,
|
|
247
|
-
});
|
|
364
|
+
}, counts, div));
|
|
248
365
|
}
|
|
249
366
|
counts.noteChanges++;
|
|
250
367
|
}
|
|
@@ -253,25 +370,40 @@ function pushElementChanges(changes, counts, oldEl, newEl, sliceName) {
|
|
|
253
370
|
// not lumped in as a generic "removed".
|
|
254
371
|
if (oldEl.issue !== newEl.issue) {
|
|
255
372
|
if (!oldEl.issue && newEl.issue) {
|
|
256
|
-
changes.push({ type: "issue-opened", kind: newEl.kind, name: newEl.name, sliceName, newText: newEl.issue });
|
|
373
|
+
changes.push(annotate({ type: "issue-opened", kind: newEl.kind, name: newEl.name, ref, sliceName, sliceKey, newText: newEl.issue }, counts, div));
|
|
257
374
|
counts.issuesOpened++;
|
|
258
375
|
}
|
|
259
376
|
else if (oldEl.issue && !newEl.issue) {
|
|
260
|
-
changes.push({ type: "issue-resolved", kind: newEl.kind, name: newEl.name, sliceName, oldText: oldEl.issue });
|
|
377
|
+
changes.push(annotate({ type: "issue-resolved", kind: newEl.kind, name: newEl.name, ref, sliceName, sliceKey, oldText: oldEl.issue }, counts, div));
|
|
261
378
|
counts.issuesResolved++;
|
|
262
379
|
}
|
|
263
380
|
else {
|
|
264
|
-
changes.push({
|
|
381
|
+
changes.push(annotate({
|
|
265
382
|
type: "issue-changed",
|
|
266
383
|
kind: newEl.kind,
|
|
267
384
|
name: newEl.name,
|
|
385
|
+
ref,
|
|
268
386
|
sliceName,
|
|
387
|
+
sliceKey,
|
|
269
388
|
oldText: oldEl.issue,
|
|
270
389
|
newText: newEl.issue,
|
|
271
|
-
});
|
|
390
|
+
}, counts, div));
|
|
272
391
|
counts.issuesChanged++;
|
|
273
392
|
}
|
|
274
393
|
}
|
|
394
|
+
// Integration-surface promotion/demotion: only ever set for `event` elements
|
|
395
|
+
// (parse-gated), but checked the same generic way as the other lifecycle
|
|
396
|
+
// fields above — no kind special-casing needed.
|
|
397
|
+
if (oldEl.public !== newEl.public) {
|
|
398
|
+
if (newEl.public) {
|
|
399
|
+
changes.push({ type: "event-marked-public", kind: newEl.kind, name: newEl.name, ref, sliceName, sliceKey });
|
|
400
|
+
counts.eventsMarkedPublic++;
|
|
401
|
+
}
|
|
402
|
+
else {
|
|
403
|
+
changes.push({ type: "event-unmarked-public", kind: newEl.kind, name: newEl.name, ref, sliceName, sliceKey });
|
|
404
|
+
counts.eventsUnmarkedPublic++;
|
|
405
|
+
}
|
|
406
|
+
}
|
|
275
407
|
}
|
|
276
408
|
export function hasChanges(diff) {
|
|
277
409
|
return diff.changes.length > 0 || diff.removals.length > 0;
|
|
@@ -285,6 +417,7 @@ function formatSummary(c) {
|
|
|
285
417
|
};
|
|
286
418
|
push(c.slicesAdded, "slice added", "slices added");
|
|
287
419
|
push(c.slicesRemoved, "slice removed", "slices removed");
|
|
420
|
+
push(c.sourceChanges, "source change", "source changes");
|
|
288
421
|
push(c.elementsAdded, "element added", "elements added");
|
|
289
422
|
push(c.elementsRemoved, "element removed", "elements removed");
|
|
290
423
|
push(c.elementsMoved, "element moved", "elements moved");
|
|
@@ -294,51 +427,81 @@ function formatSummary(c) {
|
|
|
294
427
|
push(c.issuesOpened, "issue opened", "issues opened");
|
|
295
428
|
push(c.issuesResolved, "issue resolved", "issues resolved");
|
|
296
429
|
push(c.issuesChanged, "issue text change", "issue text changes");
|
|
430
|
+
push(c.eventsMarkedPublic, "event marked public", "events marked public");
|
|
431
|
+
push(c.eventsUnmarkedPublic, "event unmarked public", "events unmarked public");
|
|
297
432
|
push(c.arrowsAdded, "arrow added", "arrows added");
|
|
298
433
|
push(c.arrowsRemoved, "arrow removed", "arrows removed");
|
|
434
|
+
push(c.typesAdded, "type added", "types added");
|
|
435
|
+
push(c.typesRemoved, "type removed", "types removed");
|
|
436
|
+
push(c.typeFieldChanges, "type field change", "type field changes");
|
|
437
|
+
push(c.acceptedDivergences, "accepted divergence", "accepted divergences");
|
|
299
438
|
return parts.length === 0 ? "no structural changes" : parts.join(", ");
|
|
300
439
|
}
|
|
301
440
|
function typeLabel(t) {
|
|
302
441
|
return t ?? "(untyped)";
|
|
303
442
|
}
|
|
443
|
+
/** Appended to a formatted line when the entry cites a canonical `divergence` annotation. */
|
|
444
|
+
function divergenceSuffix(e) {
|
|
445
|
+
return e.acceptedDivergence ? ` [accepted divergence: "${e.acceptedDivergence}"]` : "";
|
|
446
|
+
}
|
|
304
447
|
function formatEntry(e) {
|
|
305
448
|
switch (e.type) {
|
|
306
449
|
case "slice-added":
|
|
307
450
|
return `+ slice "${e.name}"`;
|
|
308
451
|
case "slice-removed":
|
|
309
452
|
return `- slice "${e.name}"`;
|
|
453
|
+
case "source-added":
|
|
454
|
+
return `~ source added on slice "${e.sliceName}": "${e.newSource}"`;
|
|
455
|
+
case "source-removed":
|
|
456
|
+
return `~ source removed from slice "${e.sliceName}": "${e.oldSource}"`;
|
|
457
|
+
case "source-changed":
|
|
458
|
+
return `~ source changed on slice "${e.sliceName}": "${e.oldSource}" -> "${e.newSource}"`;
|
|
310
459
|
case "element-added":
|
|
311
460
|
return `+ ${e.kind} "${e.name}" (slice "${e.sliceName}")`;
|
|
312
461
|
case "element-removed":
|
|
313
|
-
return `- ${e.kind} "${e.name}" (slice "${e.sliceName}")`;
|
|
462
|
+
return `- ${e.kind} "${e.name}" (slice "${e.sliceName}")${divergenceSuffix(e)}`;
|
|
314
463
|
case "element-moved":
|
|
315
464
|
return `moved: ${e.kind} "${e.name}" (slice "${e.fromSlice}" -> slice "${e.toSlice}")`;
|
|
316
465
|
case "field-added":
|
|
317
|
-
return `~ field "${e.field}"${e.fieldType ? `: ${e.fieldType}` : ""} added to ${e.kind} "${e.name}" (slice "${e.sliceName}")`;
|
|
466
|
+
return `~ field "${e.field}"${e.fieldType ? `: ${e.fieldType}` : ""} added to ${e.kind} "${e.name}" (slice "${e.sliceName}")${divergenceSuffix(e)}`;
|
|
318
467
|
case "field-removed":
|
|
319
|
-
return `~ field "${e.field}"${e.fieldType ? `: ${e.fieldType}` : ""} removed from ${e.kind} "${e.name}" (slice "${e.sliceName}")`;
|
|
468
|
+
return `~ field "${e.field}"${e.fieldType ? `: ${e.fieldType}` : ""} removed from ${e.kind} "${e.name}" (slice "${e.sliceName}")${divergenceSuffix(e)}`;
|
|
320
469
|
case "field-changed":
|
|
321
|
-
return `~ field "${e.field}" type changed on ${e.kind} "${e.name}" (slice "${e.sliceName}"): ${typeLabel(e.oldType)} -> ${typeLabel(e.newType)}`;
|
|
470
|
+
return `~ field "${e.field}" type changed on ${e.kind} "${e.name}" (slice "${e.sliceName}"): ${typeLabel(e.oldType)} -> ${typeLabel(e.newType)}${divergenceSuffix(e)}`;
|
|
322
471
|
case "from-added":
|
|
323
|
-
return `~ from "${e.source}" added on ${e.kind} "${e.name}" (slice "${e.sliceName}")`;
|
|
472
|
+
return `~ from "${e.source}" added on ${e.kind} "${e.name}" (slice "${e.sliceName}")${divergenceSuffix(e)}`;
|
|
324
473
|
case "from-removed":
|
|
325
|
-
return `~ from "${e.source}" removed from ${e.kind} "${e.name}" (slice "${e.sliceName}")`;
|
|
474
|
+
return `~ from "${e.source}" removed from ${e.kind} "${e.name}" (slice "${e.sliceName}")${divergenceSuffix(e)}`;
|
|
326
475
|
case "note-added":
|
|
327
|
-
return `~ note added on ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.newNote}"`;
|
|
476
|
+
return `~ note added on ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.newNote}"${divergenceSuffix(e)}`;
|
|
328
477
|
case "note-removed":
|
|
329
|
-
return `~ note removed from ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.oldNote}"`;
|
|
478
|
+
return `~ note removed from ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.oldNote}"${divergenceSuffix(e)}`;
|
|
330
479
|
case "note-changed":
|
|
331
|
-
return `~ note changed on ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.oldNote}" -> "${e.newNote}"`;
|
|
480
|
+
return `~ note changed on ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.oldNote}" -> "${e.newNote}"${divergenceSuffix(e)}`;
|
|
332
481
|
case "issue-opened":
|
|
333
|
-
return `issue opened: ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.newText}"`;
|
|
482
|
+
return `issue opened: ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.newText}"${divergenceSuffix(e)}`;
|
|
334
483
|
case "issue-resolved":
|
|
335
|
-
return `issue resolved: ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.oldText}"`;
|
|
484
|
+
return `issue resolved: ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.oldText}"${divergenceSuffix(e)}`;
|
|
336
485
|
case "issue-changed":
|
|
337
|
-
return `issue text changed: ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.oldText}" -> "${e.newText}"`;
|
|
486
|
+
return `issue text changed: ${e.kind} "${e.name}" (slice "${e.sliceName}"): "${e.oldText}" -> "${e.newText}"${divergenceSuffix(e)}`;
|
|
487
|
+
case "event-marked-public":
|
|
488
|
+
return `event marked public: ${e.kind} "${e.name}" (slice "${e.sliceName}")`;
|
|
489
|
+
case "event-unmarked-public":
|
|
490
|
+
return `event unmarked public: ${e.kind} "${e.name}" (slice "${e.sliceName}")`;
|
|
338
491
|
case "arrow-added":
|
|
339
492
|
return `+ arrow "${e.from}" -> "${e.to}"`;
|
|
340
493
|
case "arrow-removed":
|
|
341
494
|
return `- arrow "${e.from}" -> "${e.to}"`;
|
|
495
|
+
case "type-added":
|
|
496
|
+
return `+ type "${e.name}"`;
|
|
497
|
+
case "type-removed":
|
|
498
|
+
return `- type "${e.name}"`;
|
|
499
|
+
case "type-field-added":
|
|
500
|
+
return `~ field "${e.field}"${e.fieldType ? `: ${e.fieldType}` : ""} added to type "${e.name}"`;
|
|
501
|
+
case "type-field-removed":
|
|
502
|
+
return `~ field "${e.field}"${e.fieldType ? `: ${e.fieldType}` : ""} removed from type "${e.name}"`;
|
|
503
|
+
case "type-field-changed":
|
|
504
|
+
return `~ field "${e.field}" type changed on type "${e.name}": ${typeLabel(e.oldType)} -> ${typeLabel(e.newType)}`;
|
|
342
505
|
}
|
|
343
506
|
}
|
|
344
507
|
/** Full `em diff` report: rollup line + blank + one line per change, or just "no structural changes". */
|
package/dist/model/diff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/model/diff.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/model/diff.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,2EAA2E;AAC3E,4EAA4E;AAC5E,0EAA0E;AAC1E,0EAA0E;AAC1E,yEAAyE;AACzE,uEAAuE;AACvE,2EAA2E;AAC3E,4EAA4E;AAC5E,oCAAoC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAA6C,aAAa,EAAE,MAAM,YAAY,CAAC;AAoHtF,SAAS,WAAW;IAClB,OAAO;QACL,WAAW,EAAE,CAAC;QACd,aAAa,EAAE,CAAC;QAChB,aAAa,EAAE,CAAC;QAChB,aAAa,EAAE,CAAC;QAChB,eAAe,EAAE,CAAC;QAClB,aAAa,EAAE,CAAC;QAChB,YAAY,EAAE,CAAC;QACf,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,CAAC;QACd,YAAY,EAAE,CAAC;QACf,cAAc,EAAE,CAAC;QACjB,aAAa,EAAE,CAAC;QAChB,kBAAkB,EAAE,CAAC;QACrB,oBAAoB,EAAE,CAAC;QACvB,WAAW,EAAE,CAAC;QACd,aAAa,EAAE,CAAC;QAChB,mBAAmB,EAAE,CAAC;QACtB,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,CAAC;QACf,gBAAgB,EAAE,CAAC;KACpB,CAAC;AACJ,CAAC;AAED,oGAAoG;AACpG,SAAS,QAAQ,CAAC,KAAkB,EAAE,MAAkB,EAAE,UAA8B;IACtF,KAAK,CAAC,kBAAkB,GAAG,UAAU,IAAI,IAAI,CAAC;IAC9C,IAAI,UAAU;QAAE,MAAM,CAAC,mBAAmB,EAAE,CAAC;IAC7C,OAAO,KAAK,CAAC;AACf,CAAC;AAQD,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAU,EAAU,EAAE,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC;AAEtG,MAAM,UAAU,UAAU,CAAC,QAAyB,EAAE,QAAyB;IAC7E,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IAEtC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAElD,sEAAsE;IACtE,iEAAiE;IACjE,MAAM,aAAa,GAAG,IAAI,GAAG,EAAiB,CAAC;IAC/C,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACnC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,2EAA2E;IAC3E,qEAAqE;IACrE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC/C,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtC,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACvF,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC/C,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtC,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACvF,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,sEAAsE;IACtE,0EAA0E;IAC1E,0EAA0E;IAC1E,0EAA0E;IAC1E,MAAM,YAAY,GAAG,IAAI,GAAG,EAA0C,CAAC;IACvE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC;QACtC,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QAClC,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAChE,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,MAAM;YAAE,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;;YACtC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IACD,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAuD,CAAC;IACpF,oFAAoF;IACpF,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACnC,MAAM,WAAW,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAE,CAAC;YACxC,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS;YAClC,MAAM,GAAG,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACpD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAG,CAAC;gBAC/B,uEAAuE;gBACvE,wEAAwE;gBACxE,yEAAyE;gBACzE,yEAAyE;gBACzE,0EAA0E;gBAC1E,wEAAwE;gBACxE,0EAA0E;gBAC1E,0EAA0E;gBAC1E,0EAA0E;gBAC1E,MAAM,aAAa,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC3D,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC7B,IAAI,CAAC,CAAC,WAAW,IAAI,aAAa,CAAC,EAAE,CAAC;oBACpC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACxF,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAkB,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAkB,EAAE,CAAC;IACnC,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;IAE7B,wDAAwD;IACxD,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YAClE,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACnF,CAAC;QACD,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,QAAQ,EAAE,CAAC;gBACb,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAChF,SAAS;YACX,CAAC;YACD,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,eAAe;oBACrB,IAAI,EAAE,EAAE,CAAC,IAAI;oBACb,IAAI,EAAE,EAAE,CAAC,IAAI;oBACb,GAAG;oBACH,SAAS,EAAE,KAAK,CAAC,SAAS;oBAC1B,YAAY,EAAE,KAAK,CAAC,YAAY;oBAChC,OAAO,EAAE,KAAK,CAAC,IAAI;oBACnB,UAAU,EAAE,QAAQ;iBACrB,CAAC,CAAC;gBACH,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,CAAC;iBAAM,IAAI,CAAC,UAAU,EAAE,CAAC;gBACvB,kEAAkE;gBAClE,mEAAmE;gBACnE,+DAA+D;gBAC/D,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC5G,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YACpE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9D,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAED,+CAA+C;IAC/C,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,cAAc,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,cAAc,EAAE,CAAC;YACnB,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YACrE,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,CAAC;QACD,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAE,CAAC;YACxC,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS,CAAC,qCAAqC;YACxE,IAAI,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS,CAAC,+BAA+B;YACpE,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,QAAQ,CAAC,IAAI,CACX,QAAQ,CACN,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,EAC/F,MAAM,EACN,EAAE,CAAC,UAAU,CACd,CACF,CAAC;gBACF,MAAM,CAAC,eAAe,EAAE,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YACpE,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACjE,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAED,mFAAmF;IACnF,uFAAuF;IACvF,uEAAuE;IACvE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAoB,CAAC;IACjD,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClG,MAAM,YAAY,GAAG,IAAI,GAAG,EAAoB,CAAC;IACjD,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAElG,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;QAC3C,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,OAAO,EAAE,CAAC;YACZ,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;YACxD,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;QAC3C,IAAI,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS,CAAC,qCAAqC;QAC1E,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AACvC,CAAC;AAED,sGAAsG;AACtG,SAAS,gBAAgB,CACvB,OAAsB,EACtB,MAAkB,EAClB,QAAe,EACf,QAAe,EACf,QAAgB;IAEhB,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;QAAE,OAAO;IAChD,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IACzG,CAAC;SAAM,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3G,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,gBAAgB;YACtB,SAAS,EAAE,QAAQ,CAAC,IAAI;YACxB,QAAQ;YACR,SAAS,EAAE,QAAQ,CAAC,MAAM;YAC1B,SAAS,EAAE,QAAQ,CAAC,MAAM;SAC3B,CAAC,CAAC;IACL,CAAC;IACD,MAAM,CAAC,aAAa,EAAE,CAAC;AACzB,CAAC;AAED;;4DAE4D;AAC5D,SAAS,oBAAoB,CAC3B,OAAsB,EACtB,MAAkB,EAClB,OAAiB,EACjB,OAAiB,EACjB,GAAW;IAEX,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACjF,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjF,KAAK,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;YAC9G,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;YAChH,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,SAAS,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;YACxD,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,GAAG;gBACH,KAAK,EAAE,IAAI,CAAC,IAAI;gBAChB,OAAO,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;gBAC1B,OAAO,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;aAC3B,CAAC,CAAC;YACH,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;AACH,CAAC;AAED,0FAA0F;AAC1F,SAAS,kBAAkB,CACzB,OAAsB,EACtB,MAAkB,EAClB,KAAc,EACd,KAAc,EACd,SAAiB,EACjB,QAAgB,EAChB,GAAW;IAEX,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACvF,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvF,uFAAuF;IACvF,sFAAsF;IACtF,gFAAgF;IAChF,MAAM,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC;IAE7B,KAAK,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,CACV,QAAQ,CACN;gBACE,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,GAAG;gBACH,SAAS;gBACT,QAAQ;gBACR,KAAK,EAAE,CAAC,CAAC,IAAI;gBACb,SAAS,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;aAC1B,EACD,MAAM,EACN,GAAG,CACJ,CACF,CAAC;YACF,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,CACV,QAAQ,CACN;gBACE,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,GAAG;gBACH,SAAS;gBACT,QAAQ;gBACR,KAAK,EAAE,CAAC,CAAC,IAAI;gBACb,SAAS,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;aAC1B,EACD,MAAM,EACN,GAAG,CACJ,CACF,CAAC;YACF,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,SAAS,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;YACxD,OAAO,CAAC,IAAI,CACV,QAAQ,CACN;gBACE,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,GAAG;gBACH,SAAS;gBACT,QAAQ;gBACR,KAAK,EAAE,IAAI,CAAC,IAAI;gBAChB,OAAO,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;gBAC1B,OAAO,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;aAC3B,EACD,MAAM,EACN,GAAG,CACJ,CACF,CAAC;YACF,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;IACjC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;IACjC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IACvD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,OAAO,CAAC,IAAI,CACV,QAAQ,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,CACvH,CAAC;YACF,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,OAAO,CAAC,IAAI,CACV,QAAQ,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,CACzH,CAAC;YACF,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CACV,QAAQ,CACN,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,EACzG,MAAM,EACN,GAAG,CACJ,CACF,CAAC;QACJ,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACrC,OAAO,CAAC,IAAI,CACV,QAAQ,CACN,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,EAC3G,MAAM,EACN,GAAG,CACJ,CACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CACV,QAAQ,CACN;gBACE,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,GAAG;gBACH,SAAS;gBACT,QAAQ;gBACR,OAAO,EAAE,KAAK,CAAC,IAAI;gBACnB,OAAO,EAAE,KAAK,CAAC,IAAI;aACpB,EACD,MAAM,EACN,GAAG,CACJ,CACF,CAAC;QACJ,CAAC;QACD,MAAM,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;IAED,sEAAsE;IACtE,0EAA0E;IAC1E,wCAAwC;IACxC,IAAI,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CACV,QAAQ,CACN,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,EAC5G,MAAM,EACN,GAAG,CACJ,CACF,CAAC;YACF,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;aAAM,IAAI,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACvC,OAAO,CAAC,IAAI,CACV,QAAQ,CACN,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,EAC9G,MAAM,EACN,GAAG,CACJ,CACF,CAAC;YACF,MAAM,CAAC,cAAc,EAAE,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CACV,QAAQ,CACN;gBACE,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,GAAG;gBACH,SAAS;gBACT,QAAQ;gBACR,OAAO,EAAE,KAAK,CAAC,KAAK;gBACpB,OAAO,EAAE,KAAK,CAAC,KAAK;aACrB,EACD,MAAM,EACN,GAAG,CACJ,CACF,CAAC;YACF,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,yEAAyE;IACzE,gDAAgD;IAChD,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5G,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC9G,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAe;IACxC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;AAC7D,CAAC;AAED,kGAAkG;AAClG,SAAS,aAAa,CAAC,CAAa;IAClC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,QAAgB,EAAE,MAAc,EAAE,EAAE;QAC3D,IAAI,CAAC,GAAG,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC;IACF,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;IACzD,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;IACzD,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;IACzD,IAAI,CAAC,CAAC,CAAC,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC/D,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;IACzD,IAAI,CAAC,CAAC,CAAC,YAAY,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;IACtD,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,CAAC,CAAC,CAAC,YAAY,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;IACtD,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAC5D,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;IACjE,IAAI,CAAC,CAAC,CAAC,kBAAkB,EAAE,qBAAqB,EAAE,sBAAsB,CAAC,CAAC;IAC1E,IAAI,CAAC,CAAC,CAAC,oBAAoB,EAAE,uBAAuB,EAAE,wBAAwB,CAAC,CAAC;IAChF,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;IACzD,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IAChD,IAAI,CAAC,CAAC,CAAC,YAAY,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;IACtD,IAAI,CAAC,CAAC,CAAC,gBAAgB,EAAE,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;IACpE,IAAI,CAAC,CAAC,CAAC,mBAAmB,EAAE,qBAAqB,EAAE,sBAAsB,CAAC,CAAC;IAC3E,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,SAAS,CAAC,CAA4B;IAC7C,OAAO,CAAC,IAAI,WAAW,CAAC;AAC1B,CAAC;AAED,6FAA6F;AAC7F,SAAS,gBAAgB,CAAC,CAAc;IACtC,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,kBAAkB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AACzF,CAAC;AAED,SAAS,WAAW,CAAC,CAAc;IACjC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;QACf,KAAK,aAAa;YAChB,OAAO,YAAY,CAAC,CAAC,IAAI,GAAG,CAAC;QAC/B,KAAK,eAAe;YAClB,OAAO,YAAY,CAAC,CAAC,IAAI,GAAG,CAAC;QAC/B,KAAK,cAAc;YACjB,OAAO,4BAA4B,CAAC,CAAC,SAAS,OAAO,CAAC,CAAC,SAAS,GAAG,CAAC;QACtE,KAAK,gBAAgB;YACnB,OAAO,gCAAgC,CAAC,CAAC,SAAS,OAAO,CAAC,CAAC,SAAS,GAAG,CAAC;QAC1E,KAAK,gBAAgB;YACnB,OAAO,8BAA8B,CAAC,CAAC,SAAS,OAAO,CAAC,CAAC,SAAS,SAAS,CAAC,CAAC,SAAS,GAAG,CAAC;QAC5F,KAAK,eAAe;YAClB,OAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,IAAI,CAAC;QAC5D,KAAK,iBAAiB;YACpB,OAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,KAAK,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QAClF,KAAK,eAAe;YAClB,OAAO,UAAU,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,eAAe,CAAC,CAAC,OAAO,IAAI,CAAC;QACzF,KAAK,aAAa;YAChB,OAAO,YAAY,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,KAAK,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QACtJ,KAAK,eAAe;YAClB,OAAO,YAAY,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,KAAK,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1J,KAAK,eAAe;YAClB,OAAO,YAAY,CAAC,CAAC,KAAK,qBAAqB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,OAAO,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QACzK,KAAK,YAAY;YACf,OAAO,WAAW,CAAC,CAAC,MAAM,cAAc,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,KAAK,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9G,KAAK,cAAc;YACjB,OAAO,WAAW,CAAC,CAAC,MAAM,kBAAkB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,KAAK,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QAClH,KAAK,YAAY;YACf,OAAO,mBAAmB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QAChH,KAAK,cAAc;YACjB,OAAO,uBAAuB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QACpH,KAAK,cAAc;YACjB,OAAO,qBAAqB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,OAAO,SAAS,CAAC,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QACpI,KAAK,cAAc;YACjB,OAAO,iBAAiB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9G,KAAK,gBAAgB;YACnB,OAAO,mBAAmB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QAChH,KAAK,eAAe;YAClB,OAAO,uBAAuB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,OAAO,SAAS,CAAC,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QACtI,KAAK,qBAAqB;YACxB,OAAO,wBAAwB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,IAAI,CAAC;QAC/E,KAAK,uBAAuB;YAC1B,OAAO,0BAA0B,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,SAAS,IAAI,CAAC;QACjF,KAAK,aAAa;YAChB,OAAO,YAAY,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC;QAC5C,KAAK,eAAe;YAClB,OAAO,YAAY,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC;QAC5C,KAAK,YAAY;YACf,OAAO,WAAW,CAAC,CAAC,IAAI,GAAG,CAAC;QAC9B,KAAK,cAAc;YACjB,OAAO,WAAW,CAAC,CAAC,IAAI,GAAG,CAAC;QAC9B,KAAK,kBAAkB;YACrB,OAAO,YAAY,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC,IAAI,GAAG,CAAC;QAClG,KAAK,oBAAoB;YACvB,OAAO,YAAY,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,IAAI,GAAG,CAAC;QACtG,KAAK,oBAAoB;YACvB,OAAO,YAAY,CAAC,CAAC,KAAK,2BAA2B,CAAC,CAAC,IAAI,MAAM,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACvH,CAAC;AACH,CAAC;AAED,yGAAyG;AACzG,MAAM,UAAU,eAAe,CAAC,IAAe;IAC7C,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IACpF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,uBAAuB,CAAC;IACvD,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC/D,CAAC"}
|
package/dist/model/edges.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { NormalizedModel } from "./model.js";
|
|
1
|
+
import { Element, NormalizedModel } from "./model.js";
|
|
2
2
|
export interface SemanticEdge {
|
|
3
3
|
from: string;
|
|
4
4
|
to: string;
|
|
@@ -6,3 +6,14 @@ export interface SemanticEdge {
|
|
|
6
6
|
}
|
|
7
7
|
/** Infer pattern arrows from each slice plus cross-slice `from` sources. */
|
|
8
8
|
export declare function semanticEdges(model: NormalizedModel): SemanticEdge[];
|
|
9
|
+
/**
|
|
10
|
+
* Resolve one `from "Name"` reference to the Element it points at — the same rule
|
|
11
|
+
* for every caller that needs to follow a cross-slice reference (semanticEdges here,
|
|
12
|
+
* and src/render/sliceDiagram.ts's single-slice pattern renderer, which needs the
|
|
13
|
+
* full source Element — not just its id — to draw it as a local context box).
|
|
14
|
+
* A `view`'s sources are events (or, failing that, whatever the bucket's first
|
|
15
|
+
* entry is); anything else (in practice unused today — only `view` populates
|
|
16
|
+
* `from`) resolves to the nearest view at-or-before its own slice, since a
|
|
17
|
+
* reaction reads whatever read-model state exists at that point in the timeline.
|
|
18
|
+
*/
|
|
19
|
+
export declare function resolveFromSource(model: NormalizedModel, el: Element, name: string): Element | undefined;
|
package/dist/model/edges.js
CHANGED
|
@@ -58,34 +58,18 @@ export function semanticEdges(model) {
|
|
|
58
58
|
// automation from read model(s) -> view -> automation
|
|
59
59
|
for (const el of model.elements) {
|
|
60
60
|
for (const name of el.from ?? []) {
|
|
61
|
-
const
|
|
62
|
-
if (!bucket)
|
|
63
|
-
continue;
|
|
64
|
-
const src = el.kind === "view"
|
|
65
|
-
? bucket.find((x) => x.kind === "event") ?? bucket[0]
|
|
66
|
-
: nearestViewAtOrBefore(bucket, el.sliceIndex) ??
|
|
67
|
-
bucket.find((x) => x.kind === "view") ??
|
|
68
|
-
bucket[0];
|
|
61
|
+
const src = resolveFromSource(model, el, name);
|
|
69
62
|
if (src)
|
|
70
63
|
add(src.id, el.id, src.kind);
|
|
71
64
|
}
|
|
72
65
|
}
|
|
73
|
-
//
|
|
74
|
-
//
|
|
75
|
-
//
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
const list = instancesByLogical.get(el.logicalId) ?? [];
|
|
81
|
-
list.push(el);
|
|
82
|
-
instancesByLogical.set(el.logicalId, list);
|
|
83
|
-
}
|
|
84
|
-
for (const list of instancesByLogical.values()) {
|
|
85
|
-
const ordered = [...list].sort((a, b) => a.sliceIndex - b.sliceIndex);
|
|
86
|
-
for (let i = 1; i < ordered.length; i++)
|
|
87
|
-
add(ordered[i - 1].id, ordered[i].id, "view");
|
|
88
|
-
}
|
|
66
|
+
// Note: instances of the same logical read model (`view X again`) are deliberately NOT
|
|
67
|
+
// connected to one another. Repeating a view is an ergonomic device for showing it at
|
|
68
|
+
// successive points on the timeline; continuity is implied by the shared name, and the
|
|
69
|
+
// inbound event arrows are what show how the view changes over time. A view->view arrow
|
|
70
|
+
// would be a modelling error — and, since commands and read models share the API lane,
|
|
71
|
+
// it also renders as a flat line through any command box between the two instances,
|
|
72
|
+
// reading as an illegal command->read-model connection.
|
|
89
73
|
// Explicit arrows from the DSL.
|
|
90
74
|
for (const a of model.arrows) {
|
|
91
75
|
if (a.fromId && a.toId)
|
|
@@ -93,6 +77,24 @@ export function semanticEdges(model) {
|
|
|
93
77
|
}
|
|
94
78
|
return edges;
|
|
95
79
|
}
|
|
80
|
+
/**
|
|
81
|
+
* Resolve one `from "Name"` reference to the Element it points at — the same rule
|
|
82
|
+
* for every caller that needs to follow a cross-slice reference (semanticEdges here,
|
|
83
|
+
* and src/render/sliceDiagram.ts's single-slice pattern renderer, which needs the
|
|
84
|
+
* full source Element — not just its id — to draw it as a local context box).
|
|
85
|
+
* A `view`'s sources are events (or, failing that, whatever the bucket's first
|
|
86
|
+
* entry is); anything else (in practice unused today — only `view` populates
|
|
87
|
+
* `from`) resolves to the nearest view at-or-before its own slice, since a
|
|
88
|
+
* reaction reads whatever read-model state exists at that point in the timeline.
|
|
89
|
+
*/
|
|
90
|
+
export function resolveFromSource(model, el, name) {
|
|
91
|
+
const bucket = model.byName.get(normalizeName(name));
|
|
92
|
+
if (!bucket)
|
|
93
|
+
return undefined;
|
|
94
|
+
return el.kind === "view"
|
|
95
|
+
? bucket.find((x) => x.kind === "event") ?? bucket[0]
|
|
96
|
+
: nearestViewAtOrBefore(bucket, el.sliceIndex) ?? bucket.find((x) => x.kind === "view") ?? bucket[0];
|
|
97
|
+
}
|
|
96
98
|
/** Latest view instance declared at-or-before the given slice (reactions read what exists). */
|
|
97
99
|
function nearestViewAtOrBefore(bucket, sliceIndex) {
|
|
98
100
|
return bucket
|