@principal-ai/principal-view-core 0.26.22 → 0.26.24
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/dist/telemetry/coverage.d.ts.map +1 -1
- package/dist/telemetry/coverage.js +37 -6
- package/dist/telemetry/coverage.js.map +1 -1
- package/dist/utils/CanvasConverter.d.ts.map +1 -1
- package/dist/utils/CanvasConverter.js +12 -4
- package/dist/utils/CanvasConverter.js.map +1 -1
- package/package.json +1 -1
- package/src/telemetry/coverage.ts +39 -6
- package/src/utils/CanvasConverter.ts +13 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coverage.d.ts","sourceRoot":"","sources":["../../src/telemetry/coverage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAWrE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAE9B,wBAAwB,EAAE,MAAM,CAAC;IACjC,wBAAwB,EAAE,MAAM,CAAC;IACjC,kBAAkB,EAAE,MAAM,CAAC;IAG3B,YAAY,EAAE,mBAAmB,EAAE,CAAC;IAGpC,WAAW,EAAE,MAAM,EAAE,CAAC;IAGtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IAGzB,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAG1C,UAAU,EAAE,mBAAmB,CAAC;IAGhC,gBAAgB,EAAE,eAAe,EAAE,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,wBAAwB,EAAE,MAAM,CAAC;IACjC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;
|
|
1
|
+
{"version":3,"file":"coverage.d.ts","sourceRoot":"","sources":["../../src/telemetry/coverage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAWrE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAE9B,wBAAwB,EAAE,MAAM,CAAC;IACjC,wBAAwB,EAAE,MAAM,CAAC;IACjC,kBAAkB,EAAE,MAAM,CAAC;IAG3B,YAAY,EAAE,mBAAmB,EAAE,CAAC;IAGpC,WAAW,EAAE,MAAM,EAAE,CAAC;IAGtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IAGzB,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAG1C,UAAU,EAAE,mBAAmB,CAAC;IAGhC,gBAAgB,EAAE,eAAe,EAAE,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,wBAAwB,EAAE,MAAM,CAAC;IACjC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAsQD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GAC5C,OAAO,CAAC,eAAe,CAAC,CAoF1B"}
|
|
@@ -21,10 +21,16 @@ function getEventName(node) {
|
|
|
21
21
|
return (0, builder_1.getNodeEventName)(node) ?? null;
|
|
22
22
|
}
|
|
23
23
|
/**
|
|
24
|
-
* Extract instrumentation file paths from a canvas node
|
|
24
|
+
* Extract instrumentation file paths from a canvas node
|
|
25
|
+
* Supports both new format (node.otel.files) and legacy format (pv.otel.files)
|
|
25
26
|
*/
|
|
26
27
|
function getInstrumentationFiles(node) {
|
|
27
|
-
//
|
|
28
|
+
// Check new format first (otel-event nodes)
|
|
29
|
+
const otelNode = node;
|
|
30
|
+
if (otelNode.otel?.files) {
|
|
31
|
+
return otelNode.otel.files;
|
|
32
|
+
}
|
|
33
|
+
// Fallback to legacy format (pv.otel.files)
|
|
28
34
|
return node.pv?.otel?.files || [];
|
|
29
35
|
}
|
|
30
36
|
/**
|
|
@@ -41,10 +47,25 @@ async function fileContainsEvent(filePath, eventName, fileReader) {
|
|
|
41
47
|
}
|
|
42
48
|
/**
|
|
43
49
|
* Get the status of a node (returns undefined if not specified)
|
|
50
|
+
* Supports both new format (node.otel.status) and legacy format (pv.status)
|
|
44
51
|
*/
|
|
45
52
|
function getNodeStatus(node) {
|
|
53
|
+
// Check new format first (otel-event nodes)
|
|
54
|
+
const otelNode = node;
|
|
55
|
+
if (otelNode.otel?.status) {
|
|
56
|
+
return otelNode.otel.status;
|
|
57
|
+
}
|
|
58
|
+
// Fallback to legacy format (pv.status)
|
|
46
59
|
return node.pv?.status;
|
|
47
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* Get the scope from a node
|
|
63
|
+
* Only supports new format (node.otel.scope). Legacy format (pv.otel.scope) is rejected.
|
|
64
|
+
*/
|
|
65
|
+
function getNodeScope(node) {
|
|
66
|
+
const otelNode = node;
|
|
67
|
+
return otelNode.otel?.scope;
|
|
68
|
+
}
|
|
48
69
|
/**
|
|
49
70
|
* Build a map of file -> expected events from canvas nodes
|
|
50
71
|
* Only includes nodes with status='implemented'
|
|
@@ -146,14 +167,24 @@ function validateNodes(otelCanvases) {
|
|
|
146
167
|
error: `Node with status="${status}" must have pv.otel.files specified`,
|
|
147
168
|
});
|
|
148
169
|
}
|
|
149
|
-
//
|
|
150
|
-
const
|
|
151
|
-
if (
|
|
170
|
+
// Error if using deprecated pv.otel.scope
|
|
171
|
+
const legacyScope = node.pv?.otel?.scope;
|
|
172
|
+
if (legacyScope) {
|
|
173
|
+
errors.push({
|
|
174
|
+
nodeId: node.id,
|
|
175
|
+
canvasPath: canvas.path,
|
|
176
|
+
status,
|
|
177
|
+
error: `Node uses deprecated "pv.otel.scope" field. Use new format: convert to type: "otel-event" with top-level "otel.scope" field instead. Run: npx @principal-ai/principal-view-cli migrate-nodes`,
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
// Require scope for ALL event nodes (using new format)
|
|
181
|
+
const scope = getNodeScope(node);
|
|
182
|
+
if (!scope) {
|
|
152
183
|
errors.push({
|
|
153
184
|
nodeId: node.id,
|
|
154
185
|
canvasPath: canvas.path,
|
|
155
186
|
status,
|
|
156
|
-
error: `
|
|
187
|
+
error: `Event node must have otel.scope specified. Scope defines which instrumentation library emits this event (e.g., "terminal-activity", "auth"). Define scopes in library.yaml and document them in architecture.scopes.canvas.`,
|
|
157
188
|
});
|
|
158
189
|
}
|
|
159
190
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coverage.js","sourceRoot":"","sources":["../../src/telemetry/coverage.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAGH,kEAA+D;AAG/D,mDAAyD;AACzD,6EAI4C;AA8E5C;;;GAGG;AACH,SAAS,YAAY,CAAC,IAAwB;IAC5C,OAAO,IAAA,0BAAgB,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AACxC,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"coverage.js","sourceRoot":"","sources":["../../src/telemetry/coverage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CanvasConverter.d.ts","sourceRoot":"","sources":["../../src/utils/CanvasConverter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CanvasConverter.d.ts","sourceRoot":"","sources":["../../src/utils/CanvasConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -185,7 +185,11 @@ class CanvasConverter {
|
|
|
185
185
|
*/
|
|
186
186
|
static convertEdge(edge, canvas) {
|
|
187
187
|
const pv = edge.pv;
|
|
188
|
-
|
|
188
|
+
// Support both top-level edgeType (new) and pv.edgeType (deprecated)
|
|
189
|
+
const edgeType = edge.edgeType || pv?.edgeType;
|
|
190
|
+
// Support both top-level edgeTypes (new) and pv.edgeTypes (deprecated)
|
|
191
|
+
const edgeTypes = canvas.edgeTypes || canvas.pv?.edgeTypes;
|
|
192
|
+
const edgeTypeDef = edgeType ? edgeTypes?.[edgeType] : undefined;
|
|
189
193
|
const color = (0, canvas_1.resolveCanvasColor)(edge.color) || edgeTypeDef?.color;
|
|
190
194
|
const rfEdge = {
|
|
191
195
|
id: edge.id,
|
|
@@ -195,7 +199,7 @@ class CanvasConverter {
|
|
|
195
199
|
targetHandle: sideToHandle(edge.toSide),
|
|
196
200
|
label: edge.label,
|
|
197
201
|
data: {
|
|
198
|
-
edgeType:
|
|
202
|
+
edgeType: edgeType || 'default',
|
|
199
203
|
style: pv?.style || edgeTypeDef?.style || 'solid',
|
|
200
204
|
color,
|
|
201
205
|
width: pv?.width || edgeTypeDef?.width || 2,
|
|
@@ -353,9 +357,13 @@ class CanvasConverter {
|
|
|
353
357
|
}
|
|
354
358
|
// Convert edges
|
|
355
359
|
if (canvas.edges) {
|
|
360
|
+
// Support both top-level edgeTypes (new) and pv.edgeTypes (deprecated)
|
|
361
|
+
const edgeTypes = canvas.edgeTypes || canvas.pv?.edgeTypes;
|
|
356
362
|
for (const edge of canvas.edges) {
|
|
357
363
|
const pv = edge.pv;
|
|
358
|
-
|
|
364
|
+
// Support both top-level edgeType (new) and pv.edgeType (deprecated)
|
|
365
|
+
const edgeType = edge.edgeType || pv?.edgeType;
|
|
366
|
+
const edgeTypeDef = edgeType ? edgeTypes?.[edgeType] : undefined;
|
|
359
367
|
// Build data object, filtering out undefined values
|
|
360
368
|
const edgeData = {
|
|
361
369
|
style: pv?.style || edgeTypeDef?.style || 'solid',
|
|
@@ -379,7 +387,7 @@ class CanvasConverter {
|
|
|
379
387
|
edgeData.toSide = edge.toSide;
|
|
380
388
|
edges.push({
|
|
381
389
|
id: edge.id,
|
|
382
|
-
type:
|
|
390
|
+
type: edgeType || 'default',
|
|
383
391
|
from: edge.fromNode,
|
|
384
392
|
to: edge.toNode,
|
|
385
393
|
data: edgeData,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CanvasConverter.js","sourceRoot":"","sources":["../../src/utils/CanvasConverter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CanvasConverter.js","sourceRoot":"","sources":["../../src/utils/CanvasConverter.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAkBH,4CAAiE;AAkFjE;;GAEG;AACH,SAAS,YAAY,CAAC,IAAa;IACjC,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,oEAAoE;IACpE,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAS,sBAAsB,CAAC,KAAc;IAC5C,QAAQ,KAAK,EAAE;QACb,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC;QACf,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC;QACf;YACE,OAAO,SAAS,CAAC;KACpB;AACH,CAAC;AAED;;GAEG;AACH,MAAa,eAAe;IAC1B;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,MAAsB;QAI7C,MAAM,KAAK,GAAoB,EAAE,CAAC;QAClC,MAAM,KAAK,GAAoB,EAAE,CAAC;QAElC,gBAAgB;QAChB,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC/B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;aAC5C;SACF;QAED,gBAAgB;QAChB,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC/B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;aAC5C;SACF;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,WAAW,CAAC,IAAwB,EAAE,OAAuB;QAC1E,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QACnB,MAAM,KAAK,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE7C,8BAA8B;QAC9B,IAAI,QAAgB,CAAC;QACrB,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,MAAM;gBACT,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC;gBACpF,MAAM;YACR,KAAK,MAAM;gBACT,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC;gBAC9D,MAAM;YACR,KAAK,MAAM;gBACT,QAAQ,GAAG,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC;gBAC9B,MAAM;YACR,KAAK,OAAO;gBACV,QAAQ,GAAG,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC;gBACjC,MAAM;YACR,+CAA+C;YAC/C,KAAK,YAAY,CAAC;YAClB,KAAK,sBAAsB,CAAC;YAC5B,KAAK,YAAY,CAAC;YAClB,KAAK,eAAe,CAAC;YACrB,KAAK,eAAe;gBAClB,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;gBACtB,MAAM;SACT;QAED,kDAAkD;QAClD,2FAA2F;QAC3F,MAAM,UAAU,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QACpC,MAAM,IAAI,GAA0B;YAClC,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC;YAC9D,UAAU,EAAE,IAAI,CAAC,IAAI;YACrB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,IAAI,WAAW,CAAC;YAC5E,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI;YACvC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,IAAI,KAAK;YACvC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;QAEF,+CAA+C;QAC/C,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;YACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;SACvB;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;YAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;SACvB;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;YAC/B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;SACrB;QAED,4DAA4D;QAC5D,IACE,IAAI,CAAC,IAAI,KAAK,YAAY;YAC1B,IAAI,CAAC,IAAI,KAAK,sBAAsB;YACpC,IAAI,CAAC,IAAI,KAAK,YAAY;YAC1B,IAAI,CAAC,IAAI,KAAK,eAAe;YAC7B,IAAI,CAAC,IAAI,KAAK,eAAe,EAC7B;YACA,kDAAkD;YAClD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;YAC1B,IAAI,IAAI,CAAC,IAAI;gBAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACrC,IAAI,IAAI,CAAC,IAAI;gBAAE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;YACtC,IAAI,IAAI,CAAC,KAAK;gBAAE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACxC,IAAI,aAAa,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW;gBAAE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAEnF,yBAAyB;YACzB,IAAI,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;gBAC9B,IAAgC,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACnD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;oBAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;gBACrD,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU;oBAAE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;aAClE;YACD,IAAI,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;gBAChC,IAAgC,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;aACtD;YACD,IAAI,UAAU,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACtC,IAAgC,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;aAC5D;YACD,IAAI,YAAY,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE;gBAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;aACnC;YACD,IAAI,UAAU,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACtC,IAAgC,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;aAC5D;YACD,qEAAqE;YACrE,IAAI,eAAe,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE;gBAChD,IAAgC,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;aACtE;SACF;QAED,gEAAgE;QAChE,kDAAkD;QAClD,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE;YACrB,IAAI,EAAE,CAAC,MAAM;gBAAE,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;YACvC,IAAI,EAAE,CAAC,OAAO;gBAAE,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,6BAA6B;YACxE,IAAI,EAAE,CAAC,UAAU;gBAAE,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;YACnD,IAAI,EAAE,CAAC,MAAM;gBAAE,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;YACvC,IAAI,EAAE,CAAC,UAAU;gBAAE,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;SACpD;QAED,4CAA4C;QAC5C,IAAI,aAAa,GAAG,SAAS,CAAC;QAC9B,IAAI,UAAU,IAAI,IAAI,CAAC,KAAK,EAAE;YAC5B,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC;SAC5B;aAAM,IAAI,EAAE,EAAE,KAAK,EAAE;YACpB,aAAa,GAAG,EAAE,CAAC,KAAK,CAAC;SAC1B;QAED,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE;YAClC,IAAI;YACJ,KAAK,EAAE;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB;SACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,WAAW,CAAC,IAAwB,EAAE,MAAsB;QACzE,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QACnB,qEAAqE;QACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE,QAAQ,CAAC;QAC/C,uEAAuE;QACvE,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC;QAC3D,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACjE,MAAM,KAAK,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,KAAK,CAAC;QAEnE,MAAM,MAAM,GAAkB;YAC5B,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,MAAM,EAAE,IAAI,CAAC,QAAQ;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;YACzC,YAAY,EAAE,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;YACvC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE;gBACJ,QAAQ,EAAE,QAAQ,IAAI,SAAS;gBAC/B,KAAK,EAAE,EAAE,EAAE,KAAK,IAAI,WAAW,EAAE,KAAK,IAAI,OAAO;gBACjD,KAAK;gBACL,KAAK,EAAE,EAAE,EAAE,KAAK,IAAI,WAAW,EAAE,KAAK,IAAI,CAAC;gBAC3C,SAAS,EAAE,EAAE,EAAE,SAAS,IAAI,WAAW,EAAE,SAAS;gBAClD,0CAA0C;aAC3C;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,KAAK;gBACb,WAAW,EAAE,EAAE,EAAE,KAAK,IAAI,WAAW,EAAE,KAAK,IAAI,CAAC;gBACjD,eAAe,EAAE,sBAAsB,CAAC,EAAE,EAAE,KAAK,IAAI,WAAW,EAAE,KAAK,CAAC;aACzE;YACD,QAAQ,EAAE,EAAE,EAAE,KAAK,KAAK,UAAU,IAAI,WAAW,EAAE,KAAK,KAAK,UAAU;SACxE,CAAC;QAEF,+CAA+C;QAC/C,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,EAAE;YACzB,MAAM,CAAC,SAAS,GAAG;gBACjB,IAAI,EAAE,aAAa;gBACnB,KAAK;aACN,CAAC;SACH;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,MAAsB;QAIzC,MAAM,KAAK,GAAgB,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAgB,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,gBAAgB;QAChB,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC/B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;gBACnB,8CAA8C;gBAC9C,oDAAoD;gBACpD,IAAI,QAAgB,CAAC;gBACrB,IAAI,eAAmC,CAAC;gBACxC,QAAQ,IAAI,CAAC,IAAI,EAAE;oBACjB,KAAK,MAAM,CAAC,CAAC;wBACX,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;wBAC3C,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC;wBACpE,0DAA0D;wBAC1D,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;wBAChE,MAAM;qBACP;oBACD,KAAK,MAAM;wBACT,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC;wBAC9D,MAAM;oBACR,KAAK,MAAM;wBACT,QAAQ,GAAG,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC;wBAC9B,MAAM;oBACR,KAAK,OAAO;wBACV,QAAQ,GAAG,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC;wBACjC,MAAM;oBACR,+CAA+C;oBAC/C,KAAK,YAAY,CAAC;oBAClB,KAAK,sBAAsB,CAAC;oBAC5B,KAAK,YAAY,CAAC;oBAClB,KAAK,eAAe,CAAC;oBACrB,KAAK,eAAe;wBAClB,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;wBACtB,MAAM;oBACR;wBACE,wCAAwC;wBACxC,QAAQ,GAAI,IAAuB,CAAC,EAAE,CAAC;wBACvC,MAAM;iBACT;gBAED,oDAAoD;gBACpD,MAAM,SAAS,GAAG,EAAE,EAAE,IAAI,IAAI,QAAQ,CAAC;gBACvC,kEAAkE;gBAClE,MAAM,gBAAgB,GAAG,EAAE,EAAE,WAAW,IAAI,eAAe,CAAC;gBAE5D,qCAAqC;gBACrC,MAAM,UAAU,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;gBAEpC,oDAAoD;gBACpD,MAAM,QAAQ,GAA8B;oBAC1C,WAAW,EAAE,gBAAgB,IAAI,EAAE;oBACnC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,IAAI,WAAW,CAAC;oBAC5E,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,IAAA,2BAAkB,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,IAAI,IAAA,2BAAkB,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;oBAC5H,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,OAAO,EAAE,EAAE,EAAE,OAAO,IAAI,EAAE;oBAC1B,UAAU,EAAE,EAAE,EAAE,UAAU,IAAI,EAAE;oBAChC,UAAU,EAAE,IAAI,CAAC,IAAI;iBACtB,CAAC;gBAEF,4DAA4D;gBAC5D,iFAAiF;gBACjF,IAAI,CAAC,UAAU,IAAI,EAAE,EAAE;oBACrB,IAAI,EAAE,CAAC,IAAI;wBAAE,QAAQ,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC;oBACrC,IAAI,EAAE,CAAC,MAAM;wBAAE,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;oBAC3C,IAAI,EAAE,CAAC,MAAM;wBAAE,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,MAAmB,CAAC;oBACxD,IAAI,EAAE,CAAC,MAAM;wBAAE,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;iBAC5C;gBAED,yBAAyB;gBACzB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI;oBAAE,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACjE,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI;oBAAE,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACjE,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG;oBAAE,QAAQ,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;gBAE9D,4DAA4D;gBAC5D,IAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,EAAE;oBACpB,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;oBAC9B,IAAI,IAAI,CAAC,IAAI;wBAAE,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;oBACzC,IAAI,IAAI,CAAC,IAAI;wBAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;oBAC1C,IAAI,IAAI,CAAC,KAAK;wBAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;oBAC5C,IAAI,aAAa,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW;wBAAE,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;oBAEvF,+CAA+C;oBAC/C,IAAI,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;wBAC/B,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,IAAiB,CAAC;wBACvC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;4BAAE,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;wBACzD,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU;4BAAE,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;qBACtE;oBACD,IAAI,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;wBACjC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,KAA6B,CAAC;qBACrD;oBACD,IAAI,UAAU,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;wBACvC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;qBACnC;oBACD,IAAI,YAAY,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE;wBAC3C,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC,UAAuB,CAAC;qBACpD;oBACD,IAAI,UAAU,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;wBACvC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAgC,CAAC;qBAC3D;oBACD,qEAAqE;oBACrE,IAAI,eAAe,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE;wBACjD,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,aAAqC,CAAC;qBACrE;iBACF;gBAED,KAAK,CAAC,IAAI,CAAC;oBACT,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,IAAI,EAAE,EAAE,EAAE,QAAQ,IAAI,IAAI,CAAC,IAAI;oBAC/B,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE;oBAClC,kDAAkD;oBAClD,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,oFAAoF;oBACpF,KAAK,EAAE,SAAS;oBAChB,SAAS,EAAE,GAAG;oBACd,SAAS,EAAE,GAAG;iBACf,CAAC,CAAC;aACJ;SACF;QAED,gBAAgB;QAChB,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,uEAAuE;YACvE,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC;YAE3D,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC/B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;gBACnB,qEAAqE;gBACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE,QAAQ,CAAC;gBAC/C,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAEjE,oDAAoD;gBACpD,MAAM,QAAQ,GAA8B;oBAC1C,KAAK,EAAE,EAAE,EAAE,KAAK,IAAI,WAAW,EAAE,KAAK,IAAI,OAAO;iBAClD,CAAC;gBAEF,0CAA0C;gBAC1C,IAAI,IAAI,CAAC,KAAK;oBAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC5C,MAAM,KAAK,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,KAAK,CAAC;gBACnE,IAAI,KAAK;oBAAE,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;gBAClC,MAAM,KAAK,GAAG,EAAE,EAAE,KAAK,IAAI,WAAW,EAAE,KAAK,CAAC;gBAC9C,IAAI,KAAK,KAAK,SAAS;oBAAE,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;gBAChD,MAAM,SAAS,GAAG,EAAE,EAAE,SAAS,IAAI,WAAW,EAAE,SAAS,CAAC;gBAC1D,IAAI,SAAS;oBAAE,QAAQ,CAAC,SAAS,GAAG,SAAsB,CAAC;gBAC3D,0CAA0C;gBAC1C,IAAI,IAAI,CAAC,QAAQ;oBAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;gBACrD,IAAI,IAAI,CAAC,MAAM;oBAAE,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAE/C,KAAK,CAAC,IAAI,CAAC;oBACT,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,IAAI,EAAE,QAAQ,IAAI,SAAS;oBAC3B,IAAI,EAAE,IAAI,CAAC,QAAQ;oBACnB,EAAE,EAAE,IAAI,CAAC,MAAM;oBACf,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,GAAG;oBACd,SAAS,EAAE,GAAG;iBACf,CAAC,CAAC;aACJ;SACF;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,iBAAiB,CACtB,KAAsB,EACtB,KAAsB,EACtB,QAAkD;QAElD,MAAM,MAAM,GAAmB;YAC7B,IAAI,EAAE,QAAQ,EAAE,IAAI,IAAI,UAAU;YAClC,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,EAAE;YACT,EAAE,EAAE;gBACF,WAAW,EAAE,QAAQ,EAAE,WAAW;gBAClC,SAAS,EAAE,EAAE;aACd;SACF,CAAC;QAEF,qBAAqB;QACrB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAgC,CAAC;QAE1D,gBAAgB;QAChB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,UAAU,GAAuB;gBACrC,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,MAAM;gBACpC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAClB,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAClB,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,GAAG;gBAClD,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE;gBACpD,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE;aACL,CAAC;YAExB,uBAAuB;YACvB,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE;gBAC1D,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;aACpC;YAED,0CAA0C;YAC1C,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE;gBACtG,UAAU,CAAC,EAAE,GAAG;oBACd,QAAQ,EAAG,IAAI,CAAC,IAAI,CAAC,QAAmB,IAAI,IAAI,CAAC,EAAE;oBACnD,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAgC;oBACjD,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAA0B;oBAC1C,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAiD;oBACnE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAA+B;oBAClD,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAkC;oBACxD,sCAAsC;oBACtC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAsJ;iBAC7K,CAAC;aACH;YAED,+DAA+D;YAC/D,qEAAqE;YACrE,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;gBACvC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;gBACzC,UAAqC,CAAC,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,OAAO,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;aACzG;YAED,MAAM,CAAC,KAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAChC;QAED,gBAAgB;QAChB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,UAAU,GAAuB;gBACrC,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,QAAQ,EAAE,IAAI,CAAC,MAAM;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE,IAAI,CAAC,YAAsC;gBACrD,MAAM,EAAE,IAAI,CAAC,YAAsC;gBACnD,KAAK,EAAE,IAAI,CAAC,KAA2B;aACxC,CAAC;YAEF,YAAY;YACZ,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE;gBACtB,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;aACtC;YAED,mBAAmB;YACnB,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE;gBACvB,UAAU,CAAC,EAAE,GAAG;oBACd,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAkB;oBACtC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAgC;oBACjD,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAA2B;oBAC5C,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAER;oBACb,0CAA0C;iBAC3C,CAAC;gBAEF,+BAA+B;gBAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;oBACtC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;wBAChC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAgC;wBACjD,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;wBACtB,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;wBACtB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAER;wBACb,0CAA0C;qBAC3C,CAAC,CAAC;iBACJ;aACF;YAED,MAAM,CAAC,KAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAChC;QAED,qCAAqC;QACrC,MAAM,CAAC,EAAG,CAAC,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAErD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAveD,0CAueC"}
|
package/package.json
CHANGED
|
@@ -104,10 +104,16 @@ function getEventName(node: ExtendedCanvasNode): string | null {
|
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
/**
|
|
107
|
-
* Extract instrumentation file paths from a canvas node
|
|
107
|
+
* Extract instrumentation file paths from a canvas node
|
|
108
|
+
* Supports both new format (node.otel.files) and legacy format (pv.otel.files)
|
|
108
109
|
*/
|
|
109
110
|
function getInstrumentationFiles(node: ExtendedCanvasNode): string[] {
|
|
110
|
-
//
|
|
111
|
+
// Check new format first (otel-event nodes)
|
|
112
|
+
const otelNode = node as { otel?: { files?: string[] } };
|
|
113
|
+
if (otelNode.otel?.files) {
|
|
114
|
+
return otelNode.otel.files;
|
|
115
|
+
}
|
|
116
|
+
// Fallback to legacy format (pv.otel.files)
|
|
111
117
|
return node.pv?.otel?.files || [];
|
|
112
118
|
}
|
|
113
119
|
|
|
@@ -129,11 +135,27 @@ async function fileContainsEvent(
|
|
|
129
135
|
|
|
130
136
|
/**
|
|
131
137
|
* Get the status of a node (returns undefined if not specified)
|
|
138
|
+
* Supports both new format (node.otel.status) and legacy format (pv.status)
|
|
132
139
|
*/
|
|
133
140
|
function getNodeStatus(node: ExtendedCanvasNode): 'draft' | 'approved' | 'implemented' | undefined {
|
|
141
|
+
// Check new format first (otel-event nodes)
|
|
142
|
+
const otelNode = node as { otel?: { status?: 'draft' | 'approved' | 'implemented' } };
|
|
143
|
+
if (otelNode.otel?.status) {
|
|
144
|
+
return otelNode.otel.status;
|
|
145
|
+
}
|
|
146
|
+
// Fallback to legacy format (pv.status)
|
|
134
147
|
return node.pv?.status;
|
|
135
148
|
}
|
|
136
149
|
|
|
150
|
+
/**
|
|
151
|
+
* Get the scope from a node
|
|
152
|
+
* Only supports new format (node.otel.scope). Legacy format (pv.otel.scope) is rejected.
|
|
153
|
+
*/
|
|
154
|
+
function getNodeScope(node: ExtendedCanvasNode): string | undefined {
|
|
155
|
+
const otelNode = node as { otel?: { scope?: string } };
|
|
156
|
+
return otelNode.otel?.scope;
|
|
157
|
+
}
|
|
158
|
+
|
|
137
159
|
/**
|
|
138
160
|
* Build a map of file -> expected events from canvas nodes
|
|
139
161
|
* Only includes nodes with status='implemented'
|
|
@@ -249,14 +271,25 @@ function validateNodes(
|
|
|
249
271
|
});
|
|
250
272
|
}
|
|
251
273
|
|
|
252
|
-
//
|
|
253
|
-
const
|
|
254
|
-
if (
|
|
274
|
+
// Error if using deprecated pv.otel.scope
|
|
275
|
+
const legacyScope = node.pv?.otel?.scope;
|
|
276
|
+
if (legacyScope) {
|
|
277
|
+
errors.push({
|
|
278
|
+
nodeId: node.id,
|
|
279
|
+
canvasPath: canvas.path,
|
|
280
|
+
status,
|
|
281
|
+
error: `Node uses deprecated "pv.otel.scope" field. Use new format: convert to type: "otel-event" with top-level "otel.scope" field instead. Run: npx @principal-ai/principal-view-cli migrate-nodes`,
|
|
282
|
+
});
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
// Require scope for ALL event nodes (using new format)
|
|
286
|
+
const scope = getNodeScope(node);
|
|
287
|
+
if (!scope) {
|
|
255
288
|
errors.push({
|
|
256
289
|
nodeId: node.id,
|
|
257
290
|
canvasPath: canvas.path,
|
|
258
291
|
status,
|
|
259
|
-
error: `
|
|
292
|
+
error: `Event node must have otel.scope specified. Scope defines which instrumentation library emits this event (e.g., "terminal-activity", "auth"). Define scopes in library.yaml and document them in architecture.scopes.canvas.`,
|
|
260
293
|
});
|
|
261
294
|
}
|
|
262
295
|
}
|
|
@@ -285,7 +285,11 @@ export class CanvasConverter {
|
|
|
285
285
|
*/
|
|
286
286
|
private static convertEdge(edge: ExtendedCanvasEdge, canvas: ExtendedCanvas): ReactFlowEdge {
|
|
287
287
|
const pv = edge.pv;
|
|
288
|
-
|
|
288
|
+
// Support both top-level edgeType (new) and pv.edgeType (deprecated)
|
|
289
|
+
const edgeType = edge.edgeType || pv?.edgeType;
|
|
290
|
+
// Support both top-level edgeTypes (new) and pv.edgeTypes (deprecated)
|
|
291
|
+
const edgeTypes = canvas.edgeTypes || canvas.pv?.edgeTypes;
|
|
292
|
+
const edgeTypeDef = edgeType ? edgeTypes?.[edgeType] : undefined;
|
|
289
293
|
const color = resolveCanvasColor(edge.color) || edgeTypeDef?.color;
|
|
290
294
|
|
|
291
295
|
const rfEdge: ReactFlowEdge = {
|
|
@@ -296,7 +300,7 @@ export class CanvasConverter {
|
|
|
296
300
|
targetHandle: sideToHandle(edge.toSide),
|
|
297
301
|
label: edge.label,
|
|
298
302
|
data: {
|
|
299
|
-
edgeType:
|
|
303
|
+
edgeType: edgeType || 'default',
|
|
300
304
|
style: pv?.style || edgeTypeDef?.style || 'solid',
|
|
301
305
|
color,
|
|
302
306
|
width: pv?.width || edgeTypeDef?.width || 2,
|
|
@@ -457,9 +461,14 @@ export class CanvasConverter {
|
|
|
457
461
|
|
|
458
462
|
// Convert edges
|
|
459
463
|
if (canvas.edges) {
|
|
464
|
+
// Support both top-level edgeTypes (new) and pv.edgeTypes (deprecated)
|
|
465
|
+
const edgeTypes = canvas.edgeTypes || canvas.pv?.edgeTypes;
|
|
466
|
+
|
|
460
467
|
for (const edge of canvas.edges) {
|
|
461
468
|
const pv = edge.pv;
|
|
462
|
-
|
|
469
|
+
// Support both top-level edgeType (new) and pv.edgeType (deprecated)
|
|
470
|
+
const edgeType = edge.edgeType || pv?.edgeType;
|
|
471
|
+
const edgeTypeDef = edgeType ? edgeTypes?.[edgeType] : undefined;
|
|
463
472
|
|
|
464
473
|
// Build data object, filtering out undefined values
|
|
465
474
|
const edgeData: Record<string, JsonValue> = {
|
|
@@ -480,7 +489,7 @@ export class CanvasConverter {
|
|
|
480
489
|
|
|
481
490
|
edges.push({
|
|
482
491
|
id: edge.id,
|
|
483
|
-
type:
|
|
492
|
+
type: edgeType || 'default',
|
|
484
493
|
from: edge.fromNode,
|
|
485
494
|
to: edge.toNode,
|
|
486
495
|
data: edgeData,
|