@principal-ai/principal-view-core 0.15.0 → 0.15.2

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.
@@ -113,5 +113,9 @@ export declare class CanvasDiscovery {
113
113
  * Sort by package then name
114
114
  */
115
115
  private compareByPackageThenName;
116
+ /**
117
+ * Detect legacy flat structures and add deprecation errors
118
+ */
119
+ private detectLegacyStructures;
116
120
  }
117
121
  //# sourceMappingURL=CanvasDiscovery.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"CanvasDiscovery.d.ts","sourceRoot":"","sources":["../../src/discovery/CanvasDiscovery.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAErE,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAMnB,qBAAqB,EACrB,gBAAgB,EAGjB,MAAM,SAAS,CAAC;AAEjB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAsB;IACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAoB;IAC1D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IAE9D,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,YAAY,CAA0C;;IAM9D;;;;;;OAMG;IACG,QAAQ,CACZ,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,qBAAqB,CAAC;IA0BjC;;;;;;OAMG;IACH,sBAAsB,CACpB,SAAS,EAAE,mBAAmB,EAC9B,QAAQ,EAAE,gBAAgB,EAAE,GAC3B,gBAAgB,GAAG,IAAI;IAS1B;;;;;;OAMG;IACH,uBAAuB,CACrB,MAAM,EAAE,gBAAgB,EACxB,UAAU,EAAE,mBAAmB,EAAE,GAChC,mBAAmB,EAAE;IASxB;;OAEG;IACH,UAAU,IAAI,IAAI;IAIlB;;OAEG;YACW,mBAAmB;IA0FjC;;OAEG;YACW,6BAA6B;IA6E3C;;OAEG;YACW,yBAAyB;IAgBvC;;OAEG;IACH,OAAO,CAAC,eAAe;IAYvB;;OAEG;YACW,mBAAmB;IAkEjC;;OAEG;YACW,sBAAsB;IA0DpC;;OAEG;IACH,OAAO,CAAC,aAAa;IAkBrB;;OAEG;IACH,OAAO,CAAC,eAAe;IAuBvB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAczB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAsB1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,wBAAwB;CAiBjC"}
1
+ {"version":3,"file":"CanvasDiscovery.d.ts","sourceRoot":"","sources":["../../src/discovery/CanvasDiscovery.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAErE,OAAO,KAAK,EACV,gBAAgB,EAEhB,mBAAmB,EAMnB,qBAAqB,EACrB,gBAAgB,EAGjB,MAAM,SAAS,CAAC;AAEjB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAsB;IACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAoB;IAC1D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IAE9D,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,YAAY,CAA0C;;IAM9D;;;;;;OAMG;IACG,QAAQ,CACZ,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,qBAAqB,CAAC;IA8BjC;;;;;;OAMG;IACH,sBAAsB,CACpB,SAAS,EAAE,mBAAmB,EAC9B,QAAQ,EAAE,gBAAgB,EAAE,GAC3B,gBAAgB,GAAG,IAAI;IAS1B;;;;;;OAMG;IACH,uBAAuB,CACrB,MAAM,EAAE,gBAAgB,EACxB,UAAU,EAAE,mBAAmB,EAAE,GAChC,mBAAmB,EAAE;IASxB;;OAEG;IACH,UAAU,IAAI,IAAI;IAIlB;;OAEG;YACW,mBAAmB;IAwFjC;;OAEG;YACW,6BAA6B;IA6E3C;;OAEG;YACW,yBAAyB;IAgBvC;;OAEG;IACH,OAAO,CAAC,eAAe;IAYvB;;OAEG;YACW,mBAAmB;IAkEjC;;OAEG;YACW,sBAAsB;IA0DpC;;OAEG;IACH,OAAO,CAAC,aAAa;IAkBrB;;OAEG;IACH,OAAO,CAAC,eAAe;IAuBvB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAczB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAsB1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAkBhC;;OAEG;IACH,OAAO,CAAC,sBAAsB;CAkD/B"}
@@ -38,6 +38,7 @@ class CanvasDiscovery {
38
38
  */
39
39
  async discover(fileTree, options = {}) {
40
40
  const errors = [];
41
+ const warnings = [];
41
42
  // 1. Discover packages (with caching by fileTree.sha)
42
43
  const packages = await this.discoverPackagesWithCache(fileTree, options.fileReader);
43
44
  // 2. Build package lookup map for efficient path matching
@@ -48,11 +49,13 @@ class CanvasDiscovery {
48
49
  const executions = await this.discoverExecutionFiles(fileTree, packageMap, options, errors);
49
50
  // 5. Discover storyboards (hierarchical organization)
50
51
  const storyboards = await this.discoverStoryboards(fileTree, packageMap, canvases, executions, options, errors);
51
- // 6. Sort results
52
+ // 6. Detect legacy structures and add deprecation errors
53
+ this.detectLegacyStructures(canvases, executions, storyboards, errors);
54
+ // 7. Sort results
52
55
  canvases.sort(this.compareByPackageThenName);
53
56
  executions.sort(this.compareByPackageThenName);
54
57
  storyboards.sort(this.compareByPackageThenName);
55
- return { canvases, executions, storyboards, errors };
58
+ return { canvases, executions, storyboards, errors, warnings };
56
59
  }
57
60
  /**
58
61
  * Find canvas file for a given execution
@@ -110,9 +113,8 @@ class CanvasDiscovery {
110
113
  storyboardDirs.get(storyboardPath).add(storyboardName);
111
114
  }
112
115
  // For each potential storyboard directory, check if it has a canvas
113
- for (const [storyboardParentPath, storyboardNames] of storyboardDirs) {
116
+ for (const [storyboardPath, storyboardNames] of storyboardDirs) {
114
117
  for (const storyboardName of storyboardNames) {
115
- const storyboardPath = `${storyboardParentPath}/${storyboardName}`;
116
118
  // Skip __executions__ directory
117
119
  if (storyboardName === CanvasDiscovery.EXECUTIONS_DIR)
118
120
  continue;
@@ -460,6 +462,50 @@ class CanvasDiscovery {
460
462
  // Within same package/root, sort by name
461
463
  return a.name.localeCompare(b.name);
462
464
  }
465
+ /**
466
+ * Detect legacy flat structures and add deprecation errors
467
+ */
468
+ detectLegacyStructures(canvases, executions, storyboards, errors) {
469
+ // Build a set of storyboard canvas IDs for quick lookup
470
+ const storyboardCanvasIds = new Set(storyboards.map(s => s.canvas.id));
471
+ // Build a set of execution IDs that are part of storyboards
472
+ const storyboardExecutionIds = new Set();
473
+ for (const storyboard of storyboards) {
474
+ for (const workflow of storyboard.workflows) {
475
+ for (const execution of workflow.executions) {
476
+ storyboardExecutionIds.add(execution.id);
477
+ }
478
+ }
479
+ }
480
+ // Check for legacy flat canvases (not part of any storyboard)
481
+ for (const canvas of canvases) {
482
+ if (!storyboardCanvasIds.has(canvas.id)) {
483
+ // This is a legacy flat canvas
484
+ const canvasDir = canvas.path.split('/').slice(0, -1).join('/');
485
+ const parts = canvasDir.split('/');
486
+ const pvIndex = parts.indexOf(CanvasDiscovery.CANVAS_DIR);
487
+ // Only error if it's directly in .principal-views/ (flat structure)
488
+ if (pvIndex !== -1 && parts.length === pvIndex + 1) {
489
+ errors.push({
490
+ path: canvas.path,
491
+ error: 'DEPRECATED: Legacy flat canvas structure is no longer supported. Migrate to the storyboard structure immediately. See migration guide at docs/MIGRATION_GUIDE.md for details.',
492
+ });
493
+ }
494
+ }
495
+ }
496
+ // Check for legacy executions in __executions__/ directory
497
+ for (const execution of executions) {
498
+ if (!storyboardExecutionIds.has(execution.id)) {
499
+ // Check if this execution is in __executions__/ directory
500
+ if (execution.path.includes(`/${CanvasDiscovery.EXECUTIONS_DIR}/`)) {
501
+ errors.push({
502
+ path: execution.path,
503
+ error: 'DEPRECATED: Legacy __executions__/ directory is no longer supported. Migrate executions to workflow folders within storyboards immediately. See migration guide at docs/MIGRATION_GUIDE.md for details.',
504
+ });
505
+ }
506
+ }
507
+ }
508
+ }
463
509
  }
464
510
  CanvasDiscovery.CANVAS_DIR = '.principal-views';
465
511
  CanvasDiscovery.EXECUTIONS_DIR = '__executions__';
@@ -1 +1 @@
1
- {"version":3,"file":"CanvasDiscovery.js","sourceRoot":"","sources":["../../src/discovery/CanvasDiscovery.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,kBAAkB,EAAqB,MAAM,oCAAoC,CAAC;AAgB3F;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAa,eAAe;IAQ1B;QAFQ,iBAAY,GAAgC,IAAI,GAAG,EAAE,CAAC;QAG5D,IAAI,CAAC,aAAa,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAChD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,QAAQ,CACZ,QAAkB,EAClB,UAA4B,EAAE;QAE9B,MAAM,MAAM,GAA2C,EAAE,CAAC;QAE1D,sDAAsD;QACtD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAEpF,0DAA0D;QAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAElD,2BAA2B;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAEvF,8BAA8B;QAC9B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAE5F,sDAAsD;QACtD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAEhH,kBAAkB;QAClB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC7C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC/C,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAEhD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;IACvD,CAAC;IAED;;;;;;OAMG;IACH,sBAAsB,CACpB,SAA8B,EAC9B,QAA4B;QAE5B,+CAA+C;QAC/C,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAC5B,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,cAAc;YAC5C,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK;YAChC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,WAAW,CAC7C,IAAI,IAAI,CAAC;IACZ,CAAC;IAED;;;;;;OAMG;IACH,uBAAuB,CACrB,MAAwB,EACxB,UAAiC;QAEjC,uDAAuD;QACvD,OAAO,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CACnC,SAAS,CAAC,cAAc,KAAK,MAAM,CAAC,QAAQ;YAC5C,SAAS,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK;YAChC,SAAS,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,CAC7C,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,UAAU;QACR,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB,CAC/B,QAAkB,EAClB,UAAqC,EACrC,QAA4B,EAC5B,UAAoE,EACpE,OAAyB,EACzB,MAA8C;QAE9C,MAAM,WAAW,GAA+D,EAAE,CAAC;QAEnF,sDAAsD;QACtD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAuB,CAAC;QAEtD,qEAAqE;QACrE,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACpC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE9B,0EAA0E;YAC1E,uEAAuE;YACvE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YAC1D,IAAI,OAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,OAAO,GAAG,CAAC;gBAAE,SAAS;YAE3D,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;YAC1C,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE7D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;gBACvC,cAAc,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;aAC/C;YACD,cAAc,CAAC,GAAG,CAAC,cAAc,CAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SACzD;QAED,oEAAoE;QACpE,KAAK,MAAM,CAAC,oBAAoB,EAAE,eAAe,CAAC,IAAI,cAAc,EAAE;YACpE,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;gBAC5C,MAAM,cAAc,GAAG,GAAG,oBAAoB,IAAI,cAAc,EAAE,CAAC;gBAEnE,gCAAgC;gBAChC,IAAI,cAAc,KAAK,eAAe,CAAC,cAAc;oBAAE,SAAS;gBAEhE,kCAAkC;gBAClC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;oBACzC,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC3D,OAAO,SAAS,KAAK,cAAc,IAAI,CAAC,CAAC,QAAQ,KAAK,cAAc,CAAC;gBACvE,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,gBAAgB;oBAAE,SAAS;gBAEhC,+CAA+C;gBAC/C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,6BAA6B,CACxD,QAAQ,EACR,cAAc,EACd,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,MAAM,CACP,CAAC;gBAEF,6CAA6C;gBAC7C,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;oBAAE,SAAS;gBAErC,4BAA4B;gBAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;gBAExE,qBAAqB;gBACrB,MAAM,EAAE,GAAG,WAAW;oBACpB,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,IAAI,cAAc,EAAE;oBACrD,CAAC,CAAC,cAAc,CAAC;gBAEnB,+BAA+B;gBAC/B,MAAM,UAAU,GAA2D;oBACzE,EAAE;oBACF,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;oBACxC,IAAI,EAAE,cAAc;oBACpB,QAAQ,EAAE,cAAc;oBACxB,MAAM,EAAE,gBAAgB;oBACxB,SAAS;oBACT,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,IAAI;oBAC1C,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,IAAI;oBAC1C,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;iBACxC,CAAC;gBAEF,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC9B;SACF;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,6BAA6B,CACzC,QAAkB,EAClB,cAAsB,EACtB,cAAsB,EACtB,UAAqC,EACrC,UAAoE,EACpE,OAAyB,EACzB,MAA8C;QAE9C,MAAM,SAAS,GAA2D,EAAE,CAAC;QAE7E,6CAA6C;QAC7C,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACpC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YAElD,sCAAsC;YACtC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,GAAG,GAAG,CAAC;gBAAE,SAAS;YAErD,gCAAgC;YAChC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,kBAAkB,CAAC;gBAAE,SAAS;YAEjE,wBAAwB;YACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YACvC,IAAI,CAAC,QAAQ;gBAAE,SAAS;YAExB,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;YAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE3D,4BAA4B;YAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAE9D,qBAAqB;YACrB,MAAM,EAAE,GAAG,WAAW;gBACpB,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,IAAI,cAAc,IAAI,QAAQ,EAAE;gBACjE,CAAC,CAAC,GAAG,cAAc,IAAI,QAAQ,EAAE,CAAC;YAEpC,6EAA6E;YAC7E,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;gBAC/C,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACzD,OAAO,OAAO,KAAK,WAAW,CAAC;YACjC,CAAC,CAAC,CAAC;YAEH,6BAA6B;YAC7B,IAAI,QAAQ,GAAuD;gBACjE,EAAE;gBACF,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;gBAClC,IAAI;gBACJ,QAAQ;gBACR,YAAY,EAAE,WAAW;oBACvB,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,IAAI,cAAc,EAAE;oBACrD,CAAC,CAAC,cAAc;gBAClB,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC1C,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC1C,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;gBACvC,UAAU,EAAE,kBAAkB;aAC/B,CAAC;YAEF,0BAA0B;YAC1B,IAAI,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,UAAU,EAAE;gBAChD,IAAI;oBACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC1C,QAAQ,GAAG,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAmC,CAAC;iBACrF;gBAAC,OAAO,KAAK,EAAE;oBACd,MAAM,CAAC,IAAI,CAAC;wBACV,IAAI;wBACJ,KAAK,EAAE,qCAAsC,KAAe,CAAC,OAAO,EAAE;qBACvE,CAAC,CAAC;iBACJ;aACF;YAED,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC1B;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,yBAAyB,CACrC,QAAkB,EAClB,UAA8C;QAE9C,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC;QAE9B,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACnC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;SACzC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACjF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAE1C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;OAEG;IACK,eAAe,CAAC,QAAwB;QAC9C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAwB,CAAC;QAE5C,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;YAC1B,+EAA+E;YAC/E,MAAM,cAAc,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAChE,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;SAC9B;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB,CAC/B,QAAkB,EAClB,UAAqC,EACrC,OAAyB,EACzB,MAA8C;QAE9C,MAAM,QAAQ,GAAuB,EAAE,CAAC;QAExC,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACpC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YAElD,yCAAyC;YACzC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;gBAAE,SAAS;YAExC,0BAA0B;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,QAAQ;gBAAE,SAAS;YAExB,4BAA4B;YAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAE9D,qBAAqB;YACrB,MAAM,EAAE,GAAG,WAAW;gBACpB,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE;gBACxD,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAEtB,2BAA2B;YAC3B,MAAM,MAAM,GAAqB;gBAC/B,EAAE;gBACF,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC3C,IAAI;gBACJ,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC1C,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC1C,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;aACxC,CAAC;YAEF,0BAA0B;YAC1B,IAAI,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,UAAU,EAAE;gBAChD,IAAI;oBACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAE1C,0DAA0D;oBAC1D,MAAM,iBAAiB,GAAG,MAAqC,CAAC;oBAChE,iBAAiB,CAAC,OAAO,GAAG,aAAa,CAAC;oBAE1C,6DAA6D;oBAC7D,IAAI,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE;wBAC9B,MAAM,CAAC,YAAY,GAAG,aAAa,CAAC,EAAE,CAAC,QAAQ,CAAC;qBACjD;iBACF;gBAAC,OAAO,KAAK,EAAE;oBACd,MAAM,CAAC,IAAI,CAAC;wBACV,IAAI;wBACJ,KAAK,EAAE,mCAAoC,KAAe,CAAC,OAAO,EAAE;qBACrE,CAAC,CAAC;iBACJ;aACF;YAED,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACvB;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,sBAAsB,CAClC,QAAkB,EAClB,UAAqC,EACrC,OAAyB,EACzB,MAA8C;QAE9C,MAAM,UAAU,GAA6D,EAAE,CAAC;QAEhF,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACpC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YAElD,uCAAuC;YACvC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAAE,SAAS;YAE5C,6BAA6B;YAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ;gBAAE,SAAS;YAExB,4BAA4B;YAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAE9D,qBAAqB;YACrB,MAAM,EAAE,GAAG,WAAW;gBACpB,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE;gBACxD,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAEtB,8BAA8B;YAC9B,IAAI,SAAS,GAAyD;gBACpE,EAAE;gBACF,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC3C,IAAI;gBACJ,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,cAAc,EAAE,QAAQ,CAAC,cAAc;gBACvC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC1C,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC1C,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;aACxC,CAAC;YAEF,0BAA0B;YAC1B,IAAI,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,UAAU,EAAE;gBAChD,IAAI;oBACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBAC/C,SAAS,GAAG,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAoC,CAAC;iBAC9F;gBAAC,OAAO,KAAK,EAAE;oBACd,MAAM,CAAC,IAAI,CAAC;wBACV,IAAI;wBACJ,KAAK,EAAE,sCAAuC,KAAe,CAAC,OAAO,EAAE;qBACxE,CAAC,CAAC;iBACJ;aACF;YAED,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC5B;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,IAAY;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE9B,qCAAqC;QACrC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,UAAU,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACjE,OAAO,IAAI,CAAC;SACb;QAED,sDAAsD;QACtD,IAAI,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE;YAC9C,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACtD,iDAAiD;YACjD,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;SAC7D;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACK,eAAe,CAAC,IAAY;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE3B,gEAAgE;QAChE,IAAI,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YACrC,OAAO;gBACL,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC;gBACjD,IAAI,EAAE,MAAM;aACb,CAAC;SACH;QAED,2CAA2C;QAC3C,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAChC,OAAO;gBACL,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC3C,IAAI,EAAE,SAAS;aAChB,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,IAAY;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE9B,wCAAwC;QACxC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC;YAAE,OAAO,KAAK,CAAC;QAElE,kBAAkB;QAClB,oDAAoD;QACpD,kEAAkE;QAClE,gDAAgD;QAEhD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACK,kBAAkB,CAAC,IAAY;QAKrC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAE3B,0BAA0B;QAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACnD,IAAI,KAAK,EAAE;YACT,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC1B,OAAO;gBACL,QAAQ;gBACR,IAAI,EAAE,MAAM;gBACZ,cAAc,EAAE,QAAQ,EAAE,+BAA+B;aAC1D,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACK,kBAAkB,CACxB,IAAY,EACZ,UAAqC;QAErC,yCAAyC;QACzC,IAAI,SAAS,GAAwB,IAAI,CAAC;QAC1C,IAAI,eAAe,GAAG,CAAC,CAAC;QAExB,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,UAAU,EAAE;YACvC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC,EAAE;gBAClC,IAAI,OAAO,CAAC,MAAM,GAAG,eAAe,EAAE;oBACpC,SAAS,GAAG,GAAG,CAAC;oBAChB,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;iBAClC;aACF;SACF;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,QAAgB;QACpC,OAAO,QAAQ;aACZ,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACzD,IAAI,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAED;;OAEG;IACK,wBAAwB,CAC9B,CAAgE,EAChE,CAAgE;QAEhE,iCAAiC;QACjC,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,WAAW;YAAE,OAAO,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW;YAAE,OAAO,CAAC,CAAC;QAE9C,8CAA8C;QAC9C,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,EAAE;YAClC,MAAM,UAAU,GAAG,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAC9D,IAAI,UAAU,KAAK,CAAC;gBAAE,OAAO,UAAU,CAAC;SACzC;QAED,yCAAyC;QACzC,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;;AA3jBuB,0BAAU,GAAG,kBAAkB,AAArB,CAAsB;AAChC,8BAAc,GAAG,gBAAgB,AAAnB,CAAoB;AAClC,kCAAkB,GAAG,gBAAgB,AAAnB,CAAoB;SAHnD,eAAe"}
1
+ {"version":3,"file":"CanvasDiscovery.js","sourceRoot":"","sources":["../../src/discovery/CanvasDiscovery.ts"],"names":[],"mappings":"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"}
@@ -123,6 +123,12 @@ export interface CanvasDiscoveryResult {
123
123
  path: string;
124
124
  error: string;
125
125
  }>;
126
+ /** Deprecation warnings for legacy structures */
127
+ warnings: Array<{
128
+ path: string;
129
+ message: string;
130
+ type: 'deprecation';
131
+ }>;
126
132
  }
127
133
  /**
128
134
  * Options for file discovery
@@ -190,5 +196,10 @@ export interface CanvasDiscoveryResultWithContent {
190
196
  path: string;
191
197
  error: string;
192
198
  }>;
199
+ warnings: Array<{
200
+ path: string;
201
+ message: string;
202
+ type: 'deprecation';
203
+ }>;
193
204
  }
194
205
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/discovery/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/discovery/types.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@principal-ai/principal-view-core",
3
- "version": "0.15.0",
3
+ "version": "0.15.2",
4
4
  "description": "Core logic and types for graph-based principal view framework",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -128,8 +128,9 @@ describe('CanvasDiscovery', () => {
128
128
  });
129
129
 
130
130
  expect(result.canvases).toHaveLength(1);
131
- expect(result.errors).toHaveLength(1);
132
- expect(result.errors[0].path).toBe('.principal-views/bad.canvas');
131
+ expect(result.errors).toHaveLength(2); // Parse error + deprecation error for flat structure
132
+ expect(result.errors.some(e => e.path === '.principal-views/bad.canvas' && e.error.includes('JSON'))).toBe(true);
133
+ expect(result.errors.some(e => e.path === '.principal-views/bad.canvas' && e.error.includes('DEPRECATED'))).toBe(true);
133
134
  });
134
135
 
135
136
  test('ignores canvas files in __executions__ directory', async () => {
@@ -65,6 +65,7 @@ export class CanvasDiscovery {
65
65
  options: DiscoveryOptions = {}
66
66
  ): Promise<CanvasDiscoveryResult> {
67
67
  const errors: Array<{ path: string; error: string }> = [];
68
+ const warnings: Array<{ path: string; message: string; type: 'deprecation' }> = [];
68
69
 
69
70
  // 1. Discover packages (with caching by fileTree.sha)
70
71
  const packages = await this.discoverPackagesWithCache(fileTree, options.fileReader);
@@ -81,12 +82,15 @@ export class CanvasDiscovery {
81
82
  // 5. Discover storyboards (hierarchical organization)
82
83
  const storyboards = await this.discoverStoryboards(fileTree, packageMap, canvases, executions, options, errors);
83
84
 
84
- // 6. Sort results
85
+ // 6. Detect legacy structures and add deprecation errors
86
+ this.detectLegacyStructures(canvases, executions, storyboards, errors);
87
+
88
+ // 7. Sort results
85
89
  canvases.sort(this.compareByPackageThenName);
86
90
  executions.sort(this.compareByPackageThenName);
87
91
  storyboards.sort(this.compareByPackageThenName);
88
92
 
89
- return { canvases, executions, storyboards, errors };
93
+ return { canvases, executions, storyboards, errors, warnings };
90
94
  }
91
95
 
92
96
  /**
@@ -170,10 +174,8 @@ export class CanvasDiscovery {
170
174
  }
171
175
 
172
176
  // For each potential storyboard directory, check if it has a canvas
173
- for (const [storyboardParentPath, storyboardNames] of storyboardDirs) {
177
+ for (const [storyboardPath, storyboardNames] of storyboardDirs) {
174
178
  for (const storyboardName of storyboardNames) {
175
- const storyboardPath = `${storyboardParentPath}/${storyboardName}`;
176
-
177
179
  // Skip __executions__ directory
178
180
  if (storyboardName === CanvasDiscovery.EXECUTIONS_DIR) continue;
179
181
 
@@ -614,4 +616,58 @@ export class CanvasDiscovery {
614
616
  // Within same package/root, sort by name
615
617
  return a.name.localeCompare(b.name);
616
618
  }
619
+
620
+ /**
621
+ * Detect legacy flat structures and add deprecation errors
622
+ */
623
+ private detectLegacyStructures(
624
+ canvases: DiscoveredCanvas[],
625
+ executions: (DiscoveredExecution | DiscoveredExecutionWithContent)[],
626
+ storyboards: (DiscoveredStoryboard | DiscoveredStoryboardWithContent)[],
627
+ errors: Array<{ path: string; error: string }>
628
+ ): void {
629
+ // Build a set of storyboard canvas IDs for quick lookup
630
+ const storyboardCanvasIds = new Set(storyboards.map(s => s.canvas.id));
631
+
632
+ // Build a set of execution IDs that are part of storyboards
633
+ const storyboardExecutionIds = new Set<string>();
634
+ for (const storyboard of storyboards) {
635
+ for (const workflow of storyboard.workflows) {
636
+ for (const execution of workflow.executions) {
637
+ storyboardExecutionIds.add(execution.id);
638
+ }
639
+ }
640
+ }
641
+
642
+ // Check for legacy flat canvases (not part of any storyboard)
643
+ for (const canvas of canvases) {
644
+ if (!storyboardCanvasIds.has(canvas.id)) {
645
+ // This is a legacy flat canvas
646
+ const canvasDir = canvas.path.split('/').slice(0, -1).join('/');
647
+ const parts = canvasDir.split('/');
648
+ const pvIndex = parts.indexOf(CanvasDiscovery.CANVAS_DIR);
649
+
650
+ // Only error if it's directly in .principal-views/ (flat structure)
651
+ if (pvIndex !== -1 && parts.length === pvIndex + 1) {
652
+ errors.push({
653
+ path: canvas.path,
654
+ error: 'DEPRECATED: Legacy flat canvas structure is no longer supported. Migrate to the storyboard structure immediately. See migration guide at docs/MIGRATION_GUIDE.md for details.',
655
+ });
656
+ }
657
+ }
658
+ }
659
+
660
+ // Check for legacy executions in __executions__/ directory
661
+ for (const execution of executions) {
662
+ if (!storyboardExecutionIds.has(execution.id)) {
663
+ // Check if this execution is in __executions__/ directory
664
+ if (execution.path.includes(`/${CanvasDiscovery.EXECUTIONS_DIR}/`)) {
665
+ errors.push({
666
+ path: execution.path,
667
+ error: 'DEPRECATED: Legacy __executions__/ directory is no longer supported. Migrate executions to workflow folders within storyboards immediately. See migration guide at docs/MIGRATION_GUIDE.md for details.',
668
+ });
669
+ }
670
+ }
671
+ }
672
+ }
617
673
  }
@@ -128,6 +128,8 @@ export interface CanvasDiscoveryResult {
128
128
  storyboards: DiscoveredStoryboard[];
129
129
  /** Any errors encountered during discovery */
130
130
  errors: Array<{ path: string; error: string }>;
131
+ /** Deprecation warnings for legacy structures */
132
+ warnings: Array<{ path: string; message: string; type: 'deprecation' }>;
131
133
  }
132
134
 
133
135
  /**
@@ -199,4 +201,5 @@ export interface CanvasDiscoveryResultWithContent {
199
201
  executions: (DiscoveredExecution | DiscoveredExecutionWithContent)[];
200
202
  storyboards: (DiscoveredStoryboard | DiscoveredStoryboardWithContent)[];
201
203
  errors: Array<{ path: string; error: string }>;
204
+ warnings: Array<{ path: string; message: string; type: 'deprecation' }>;
202
205
  }
@@ -87,7 +87,7 @@ describe('WorkflowValidator', () => {
87
87
  width: 200,
88
88
  height: 100,
89
89
  pv: {
90
- event: 'test.started',
90
+ eventRef: 'test.started',
91
91
  },
92
92
  },
93
93
  {
@@ -98,7 +98,7 @@ describe('WorkflowValidator', () => {
98
98
  width: 200,
99
99
  height: 100,
100
100
  pv: {
101
- event: 'test.complete',
101
+ eventRef: 'test.complete',
102
102
  },
103
103
  },
104
104
  {
@@ -109,7 +109,7 @@ describe('WorkflowValidator', () => {
109
109
  width: 200,
110
110
  height: 100,
111
111
  pv: {
112
- event: 'test.error',
112
+ eventRef: 'test.error',
113
113
  },
114
114
  },
115
115
  ],