@eclipse-glsp/client 1.1.0-next.80bb01c.251 → 1.1.0-next.86cf8e6.253

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.
Files changed (20) hide show
  1. package/lib/features/select/select-feedback-action.d.ts +4 -1
  2. package/lib/features/select/select-feedback-action.d.ts.map +1 -1
  3. package/lib/features/select/select-feedback-action.js +12 -0
  4. package/lib/features/select/select-feedback-action.js.map +1 -1
  5. package/lib/features/select/selection-service.d.ts.map +1 -1
  6. package/lib/features/select/selection-service.js +3 -1
  7. package/lib/features/select/selection-service.js.map +1 -1
  8. package/lib/features/tools/marquee-mouse-tool.d.ts.map +1 -1
  9. package/lib/features/tools/marquee-mouse-tool.js +1 -5
  10. package/lib/features/tools/marquee-mouse-tool.js.map +1 -1
  11. package/lib/utils/smodel-util.d.ts +5 -2
  12. package/lib/utils/smodel-util.d.ts.map +1 -1
  13. package/lib/utils/smodel-util.js +21 -4
  14. package/lib/utils/smodel-util.js.map +1 -1
  15. package/package.json +3 -3
  16. package/src/features/select/select-feedback-action.ts +14 -1
  17. package/src/features/select/selection-service.ts +3 -1
  18. package/src/features/tools/marquee-mouse-tool.ts +1 -5
  19. package/src/utils/smodel-util.spec.ts +222 -0
  20. package/src/utils/smodel-util.ts +27 -7
package/lib/features/select/select-feedback-action.d.ts CHANGED
@@ -7,8 +7,11 @@ export declare namespace SelectFeedbackAction {
7
7
  function is(object: any): object is SelectFeedbackAction;
8
8
  function create(options?: {
9
9
  selectedElementsIDs?: string[];
10
- deselectedElementsIDs?: string[];
10
+ deselectedElementsIDs?: string[] | boolean;
11
11
  }): SelectFeedbackAction;
12
+ function addSelection(selectedElementsIDs: string[]): SelectFeedbackAction;
13
+ function removeSelection(deselectedElementsIDs: string[]): SelectFeedbackAction;
14
+ function setSelection(selectedElementsIDs: string[]): SelectFeedbackAction;
12
15
  }
13
16
  export declare class SelectFeedbackCommand extends Command {
14
17
  action: SelectFeedbackAction;
package/lib/features/select/select-feedback-action.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select-feedback-action.d.ts","sourceRoot":"","sources":["../../../src/features/select/select-feedback-action.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,OAAO,EACP,uBAAuB,EACvB,UAAU,EACV,YAAY,EAIf,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM;IAC5E,IAAI,EAAE,OAAO,oBAAoB,CAAC,IAAI,CAAC;CAC1C;AAED,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,IAAI,mBAAmB,CAAC;IAErC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,oBAAoB,CAE9D;IAED,SAAgB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,oBAAoB,CAE3H;CACJ;AACD,qBACa,qBAAsB,SAAQ,OAAO;IAIL,MAAM,EAAE,oBAAoB;IAHrE,MAAM,CAAC,QAAQ,CAAC,IAAI,oBAA6B;IACjD,OAAO,CAAC,oBAAoB,CAAuB;gBAEV,MAAM,EAAE,oBAAoB;IAKrE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAIrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAIlD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;CAGrD"}
1
+ {"version":3,"file":"select-feedback-action.d.ts","sourceRoot":"","sources":["../../../src/features/select/select-feedback-action.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,OAAO,EACP,uBAAuB,EACvB,UAAU,EACV,YAAY,EAIf,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM;IAC5E,IAAI,EAAE,OAAO,oBAAoB,CAAC,IAAI,CAAC;CAC1C;AAED,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,IAAI,mBAAmB,CAAC;IAErC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,oBAAoB,CAE9D;IAED,SAAgB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,qBAAqB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;KAAE,GAAG,oBAAoB,CAErI;IAED,SAAgB,YAAY,CAAC,mBAAmB,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAEhF;IAED,SAAgB,eAAe,CAAC,qBAAqB,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAErF;IAED,SAAgB,YAAY,CAAC,mBAAmB,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAEhF;CACJ;AAED,qBACa,qBAAsB,SAAQ,OAAO;IAIL,MAAM,EAAE,oBAAoB;IAHrE,MAAM,CAAC,QAAQ,CAAC,IAAI,oBAA6B;IACjD,OAAO,CAAC,oBAAoB,CAAuB;gBAEV,MAAM,EAAE,oBAAoB;IAKrE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAIrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAIlD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;CAGrD"}
package/lib/features/select/select-feedback-action.js CHANGED
@@ -41,6 +41,18 @@ var SelectFeedbackAction;
41
41
  return Object.assign(Object.assign({}, _glsp_sprotty_1.SelectAction.create(options)), { kind: SelectFeedbackAction.KIND });
42
42
  }
43
43
  SelectFeedbackAction.create = create;
44
+ function addSelection(selectedElementsIDs) {
45
+ return Object.assign(Object.assign({}, _glsp_sprotty_1.SelectAction.addSelection(selectedElementsIDs)), { kind: SelectFeedbackAction.KIND });
46
+ }
47
+ SelectFeedbackAction.addSelection = addSelection;
48
+ function removeSelection(deselectedElementsIDs) {
49
+ return Object.assign(Object.assign({}, _glsp_sprotty_1.SelectAction.removeSelection(deselectedElementsIDs)), { kind: SelectFeedbackAction.KIND });
50
+ }
51
+ SelectFeedbackAction.removeSelection = removeSelection;
52
+ function setSelection(selectedElementsIDs) {
53
+ return Object.assign(Object.assign({}, _glsp_sprotty_1.SelectAction.setSelection(selectedElementsIDs)), { kind: SelectFeedbackAction.KIND });
54
+ }
55
+ SelectFeedbackAction.setSelection = setSelection;
44
56
  })(SelectFeedbackAction = exports.SelectFeedbackAction || (exports.SelectFeedbackAction = {}));
45
57
  let SelectFeedbackCommand = class SelectFeedbackCommand extends _glsp_sprotty_1.Command {
46
58
  constructor(action) {
package/lib/features/select/select-feedback-action.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"select-feedback-action.js","sourceRoot":"","sources":["../../../src/features/select/select-feedback-action.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA+C;AAC/C,iDASuB;AAMvB,IAAiB,oBAAoB,CAUpC;AAVD,WAAiB,oBAAoB;IACpB,yBAAI,GAAG,gBAAgB,CAAC;IAErC,SAAgB,EAAE,CAAC,MAAW;QAC1B,OAAO,sBAAM,CAAC,OAAO,CAAC,MAAM,EAAE,qBAAA,IAAI,CAAC,IAAI,IAAA,4BAAY,EAAC,MAAM,EAAE,qBAAqB,CAAC,IAAI,IAAA,4BAAY,EAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;IACxI,CAAC;IAFe,uBAAE,KAEjB,CAAA;IAED,SAAgB,MAAM,CAAC,OAA8E;QACjG,uCAAY,4BAAY,CAAC,MAAM,CAAC,OAAO,CAAC,KAAE,IAAI,EAAE,qBAAA,IAAI,IAAG;IAC3D,CAAC;IAFe,2BAAM,SAErB,CAAA;AACL,CAAC,EAVgB,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAUpC;AACD,IACa,qBAAqB,GADlC,MACa,qBAAsB,SAAQ,uBAAO;IAI9C,YAAyC,MAA4B;QACjE,KAAK,EAAE,CAAC;QAD6B,WAAM,GAAN,MAAM,CAAsB;QAEjE,IAAI,CAAC,oBAAoB,GAAG,IAAI,oCAAoB,iCAAM,MAAM,KAAE,IAAI,EAAE,4BAAY,CAAC,IAAI,IAAG,CAAC;IACjG,CAAC;IAED,OAAO,CAAC,OAAgC;QACpC,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,OAAgC;QACjC,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,CAAC,OAAgC;QACjC,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;;AAlBe,0BAAI,GAAG,oBAAoB,CAAC,IAAI,AAA5B,CAA6B;AADxC,qBAAqB;IADjC,IAAA,sBAAU,GAAE;IAKI,WAAA,IAAA,kBAAM,EAAC,qBAAK,CAAC,MAAM,CAAC,CAAA;;GAJxB,qBAAqB,CAoBjC;AApBY,sDAAqB"}
1
+ {"version":3,"file":"select-feedback-action.js","sourceRoot":"","sources":["../../../src/features/select/select-feedback-action.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA+C;AAC/C,iDASuB;AAMvB,IAAiB,oBAAoB,CAsBpC;AAtBD,WAAiB,oBAAoB;IACpB,yBAAI,GAAG,gBAAgB,CAAC;IAErC,SAAgB,EAAE,CAAC,MAAW;QAC1B,OAAO,sBAAM,CAAC,OAAO,CAAC,MAAM,EAAE,qBAAA,IAAI,CAAC,IAAI,IAAA,4BAAY,EAAC,MAAM,EAAE,qBAAqB,CAAC,IAAI,IAAA,4BAAY,EAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;IACxI,CAAC;IAFe,uBAAE,KAEjB,CAAA;IAED,SAAgB,MAAM,CAAC,OAAwF;QAC3G,uCAAY,4BAAY,CAAC,MAAM,CAAC,OAAO,CAAC,KAAE,IAAI,EAAE,qBAAA,IAAI,IAAG;IAC3D,CAAC;IAFe,2BAAM,SAErB,CAAA;IAED,SAAgB,YAAY,CAAC,mBAA6B;QACtD,uCAAY,4BAAY,CAAC,YAAY,CAAC,mBAAmB,CAAC,KAAE,IAAI,EAAE,qBAAA,IAAI,IAAG;IAC7E,CAAC;IAFe,iCAAY,eAE3B,CAAA;IAED,SAAgB,eAAe,CAAC,qBAA+B;QAC3D,uCAAY,4BAAY,CAAC,eAAe,CAAC,qBAAqB,CAAC,KAAE,IAAI,EAAE,qBAAA,IAAI,IAAG;IAClF,CAAC;IAFe,oCAAe,kBAE9B,CAAA;IAED,SAAgB,YAAY,CAAC,mBAA6B;QACtD,uCAAY,4BAAY,CAAC,YAAY,CAAC,mBAAmB,CAAC,KAAE,IAAI,EAAE,qBAAA,IAAI,IAAG;IAC7E,CAAC;IAFe,iCAAY,eAE3B,CAAA;AACL,CAAC,EAtBgB,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAsBpC;AAED,IACa,qBAAqB,GADlC,MACa,qBAAsB,SAAQ,uBAAO;IAI9C,YAAyC,MAA4B;QACjE,KAAK,EAAE,CAAC;QAD6B,WAAM,GAAN,MAAM,CAAsB;QAEjE,IAAI,CAAC,oBAAoB,GAAG,IAAI,oCAAoB,iCAAM,MAAM,KAAE,IAAI,EAAE,4BAAY,CAAC,IAAI,IAAG,CAAC;IACjG,CAAC;IAED,OAAO,CAAC,OAAgC;QACpC,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,OAAgC;QACjC,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,CAAC,OAAgC;QACjC,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;;AAlBe,0BAAI,GAAG,oBAAoB,CAAC,IAAI,AAA5B,CAA6B;AADxC,qBAAqB;IADjC,IAAA,sBAAU,GAAE;IAKI,WAAA,IAAA,kBAAM,EAAC,qBAAK,CAAC,MAAM,CAAC,CAAA;;GAJxB,qBAAqB,CAoBjC;AApBY,sDAAqB"}
package/lib/features/select/selection-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"selection-service.d.ts","sourceRoot":"","sources":["../../../src/features/select/selection-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,OAAO,EACP,uBAAuB,EACvB,OAAO,EAEP,aAAa,EACb,UAAU,EACV,YAAY,EACZ,eAAe,EACf,UAAU,EAQb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAGxF,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAClF;AAED,qBACa,gBAAiB,YAAW,kBAAkB;IAOO,SAAS,CAAC,kBAAkB,EAAE,iBAAiB,EAAE;IAN/G,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,kBAAkB,CAA0B;IAEX,SAAS,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IAC1E,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;gBAEuB,kBAAkB,GAAE,iBAAiB,EAAO;IAEpH,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI;IAIpD,UAAU,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI;IAItD,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;IAIlD,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAuDvF,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIzC,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI;IAIxE,YAAY,IAAI,QAAQ,CAAC,UAAU,CAAC;IAIpC,mBAAmB,IAAI,QAAQ,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE;IAI7D;;OAEG;IAEH,qBAAqB,IAAI,MAAM,EAAE;IAIjC,mBAAmB,IAAI,OAAO;IAI9B,iBAAiB,IAAI,OAAO;IAI5B,gBAAgB,IAAI,OAAO;CAG9B;AAED;;;;GAIG;AACH,qBACa,aAAc,SAAQ,OAAO;IAOL,MAAM,EAAE,YAAY;IACV,gBAAgB,EAAE,gBAAgB;IAP7E,MAAM,CAAC,QAAQ,CAAC,IAAI,qBAA6B;IAEjD,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAM;IACzC,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,CAAM;gBAGV,MAAM,EAAE,YAAY,EACV,gBAAgB,EAAE,gBAAgB;IAK7E,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAWrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAKlD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;CAGrD;AAED;;;;GAIG;AACH,qBACa,gBAAiB,SAAQ,OAAO;IAKR,MAAM,EAAE,eAAe;IACb,gBAAgB,EAAE,gBAAgB;IAL7E,MAAM,CAAC,QAAQ,CAAC,IAAI,iBAAgC;IACpD,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAA8B;gBAG9C,MAAM,EAAE,eAAe,EACb,gBAAgB,EAAE,gBAAgB;IAK7E,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAgBrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAKlD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;CAGrD"}
1
+ {"version":3,"file":"selection-service.d.ts","sourceRoot":"","sources":["../../../src/features/select/selection-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,OAAO,EACP,uBAAuB,EACvB,OAAO,EAEP,aAAa,EACb,UAAU,EACV,YAAY,EACZ,eAAe,EACf,UAAU,EAQb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAGxF,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAClF;AAED,qBACa,gBAAiB,YAAW,kBAAkB;IAOO,SAAS,CAAC,kBAAkB,EAAE,iBAAiB,EAAE;IAN/G,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,kBAAkB,CAA0B;IAEX,SAAS,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IAC1E,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;gBAEuB,kBAAkB,GAAE,iBAAiB,EAAO;IAEpH,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI;IAIpD,UAAU,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI;IAItD,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;IAIlD,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAuDvF,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIzC,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI;IAIxE,YAAY,IAAI,QAAQ,CAAC,UAAU,CAAC;IAIpC,mBAAmB,IAAI,QAAQ,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE;IAI7D;;OAEG;IAEH,qBAAqB,IAAI,MAAM,EAAE;IAIjC,mBAAmB,IAAI,OAAO;IAI9B,iBAAiB,IAAI,OAAO;IAI5B,gBAAgB,IAAI,OAAO;CAG9B;AAED;;;;GAIG;AACH,qBACa,aAAc,SAAQ,OAAO;IAOL,MAAM,EAAE,YAAY;IACV,gBAAgB,EAAE,gBAAgB;IAP7E,MAAM,CAAC,QAAQ,CAAC,IAAI,qBAA6B;IAEjD,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAM;IACzC,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,CAAM;gBAGV,MAAM,EAAE,YAAY,EACV,gBAAgB,EAAE,gBAAgB;IAK7E,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAarD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAKlD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;CAGrD;AAED;;;;GAIG;AACH,qBACa,gBAAiB,SAAQ,OAAO;IAKR,MAAM,EAAE,eAAe;IACb,gBAAgB,EAAE,gBAAgB;IAL7E,MAAM,CAAC,QAAQ,CAAC,IAAI,iBAAgC;IACpD,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAA8B;gBAG9C,MAAM,EAAE,eAAe,EACb,gBAAgB,EAAE,gBAAgB;IAK7E,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAgBrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;IAKlD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;CAGrD"}
package/lib/features/select/selection-service.js CHANGED
@@ -154,7 +154,9 @@ let SelectCommand = class SelectCommand extends _glsp_sprotty_1.Command {
154
154
  const model = context.root;
155
155
  const selectionGuard = (element) => element instanceof _glsp_sprotty_1.SChildElement && (0, _glsp_sprotty_1.isSelectable)(element);
156
156
  const selectedElements = (0, smodel_util_1.getElements)(model.index, this.action.selectedElementsIDs, selectionGuard);
157
- const deselectedElements = (0, smodel_util_1.getElements)(model.index, this.action.deselectedElementsIDs, selectionGuard);
157
+ const deselectedElements = this.action.deselectAll
158
+ ? this.selectionService.getSelectedElements()
159
+ : (0, smodel_util_1.getElements)(model.index, this.action.deselectedElementsIDs, selectionGuard);
158
160
  this.selectionService.updateSelection(model, (0, _glsp_sprotty_1.pluck)(selectedElements, 'id'), (0, _glsp_sprotty_1.pluck)(deselectedElements, 'id'));
159
161
  return model;
160
162
  }
package/lib/features/select/selection-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"selection-service.js","sourceRoot":"","sources":["../../../src/features/select/selection-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"selection-service.js","sourceRoot":"","sources":["../../../src/features/select/selection-service.ts"],"names":[],"mappings":"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"}
package/lib/features/tools/marquee-mouse-tool.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marquee-mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-mouse-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,WAAW,EACX,SAAS,EAET,WAAW,EAEX,aAAa,EACb,UAAU,EAMb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAI9E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEnE,qBACa,gBAAiB,SAAQ,YAAY;IAC9C,MAAM,CAAC,EAAE,SAA6B;IAEb,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IACZ,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAExF,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACrD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAA0B;IAEtE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAOd,OAAO,IAAI,IAAI;CAKlB;AAED,qBAAa,oBAAqB,SAAQ,sBAAsB;IAC5D,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAC/B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;IACjD,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IAC/B,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IACvC,SAAS,CAAC,QAAQ,UAAS;gBAEf,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,GAAG,SAAS;IAqBxF,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAQpE,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO;CAS7C;AAED,qBACa,gBAAiB,SAAQ,WAAW;IACpC,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAMzE"}
1
+ {"version":3,"file":"marquee-mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-mouse-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,WAAW,EACX,SAAS,EAET,WAAW,EAEX,aAAa,EACb,UAAU,EAMb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAI9E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEnE,qBACa,gBAAiB,SAAQ,YAAY;IAC9C,MAAM,CAAC,EAAE,SAA6B;IAEb,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IACZ,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAExF,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACrD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAA0B;IAEtE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAOd,OAAO,IAAI,IAAI;CAKlB;AAED,qBAAa,oBAAqB,SAAQ,sBAAsB;IAC5D,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAC/B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;IACjD,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IAC/B,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IACvC,SAAS,CAAC,QAAQ,UAAS;gBAEf,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,GAAG,SAAS;IAqBxF,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAW7D,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAQpE,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO;CAS7C;AAED,qBACa,gBAAiB,SAAQ,WAAW;IACpC,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAMzE"}
package/lib/features/tools/marquee-mouse-tool.js CHANGED
@@ -104,11 +104,7 @@ class MarqueeMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseLis
104
104
  const nodeIdsSelected = this.nodes.filter(e => this.marqueeUtil.isNodeMarked((0, viewpoint_util_1.toAbsoluteBounds)(e))).map(e => e.id);
105
105
  const edgeIdsSelected = this.edges.filter(e => this.isEdgeMarked(e)).map(e => this.domHelper.findSModelIdByDOMElement(e));
106
106
  const selected = nodeIdsSelected.concat(edgeIdsSelected);
107
- return [
108
- _glsp_sprotty_1.SelectAction.create({ deselectedElementsIDs: Array.from(target.root.index.all().map(e => e.id)) }),
109
- _glsp_sprotty_1.SelectAction.create({ selectedElementsIDs: selected.concat(this.previouslySelected) }),
110
- this.marqueeUtil.drawMarqueeAction()
111
- ];
107
+ return [_glsp_sprotty_1.SelectAction.setSelection(selected.concat(this.previouslySelected)), this.marqueeUtil.drawMarqueeAction()];
112
108
  }
113
109
  return [];
114
110
  }
package/lib/features/tools/marquee-mouse-tool.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marquee-mouse-tool.js","sourceRoot":"","sources":["../../../src/features/tools/marquee-mouse-tool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"marquee-mouse-tool.js","sourceRoot":"","sources":["../../../src/features/tools/marquee-mouse-tool.ts"],"names":[],"mappings":"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"}
package/lib/utils/smodel-util.d.ts CHANGED
@@ -130,6 +130,8 @@ export declare function toElementAndBounds(element: BoundsAwareModelElement): El
130
130
  * @returns The corresponding {@link ElementAndRoutingPoints} for the given element.
131
131
  */
132
132
  export declare function toElementAndRoutingPoints(element: SRoutableElement): ElementAndRoutingPoints;
133
+ /** All routing points. */
134
+ export declare const ALL_ROUTING_POINTS: undefined;
133
135
  /** Pure routing point data kinds. */
134
136
  export declare const ROUTING_POINT_KINDS: string[];
135
137
  /** Pure route data kinds. */
@@ -153,13 +155,14 @@ export declare function calcElementAndRoutingPoints(element: SRoutableElement, r
153
155
  */
154
156
  export declare function calcElementAndRoute(element: SRoutableElement, routerRegistry?: EdgeRouterRegistry): ElementAndRoutingPoints;
155
157
  /**
156
- * Helper function to calculate the route for a given {@link SRoutableElement}.
158
+ * Helper function to calculate the route for a given {@link SRoutableElement} by filtering duplicate points.
157
159
  * @param element The element to translate.
158
160
  * @param routerRegistry the edge router registry.
159
161
  * @param pointKinds the routing point kinds that should be considered.
162
+ * @param tolerance the tolerance applied to a point's coordinates to determine duplicates.
160
163
  * @returns The corresponding route for the given element.
161
164
  */
162
- export declare function calcRoute(element: SRoutableElement, routerRegistry: EdgeRouterRegistry, pointKinds?: string[]): RoutedPoint[] | undefined;
165
+ export declare function calcRoute(element: SRoutableElement, routerRegistry: EdgeRouterRegistry, pointKinds?: string[] | undefined, tolerance?: number): RoutedPoint[] | undefined;
163
166
  /**
164
167
  * Checks if the model is compatible with the passed type string.
165
168
  * (either has the same type or a subtype of this type)
package/lib/utils/smodel-util.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"smodel-util.d.ts","sourceRoot":"","sources":["../../src/utils/smodel-util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"smodel-util.d.ts","sourceRoot":"","sources":["../../src/utils/smodel-util.ts"],"names":[],"mappings":"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"}
package/lib/utils/smodel-util.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getElementTypeId = exports.hasCompatibleType = exports.calcRoute = exports.calcElementAndRoute = exports.calcElementAndRoutingPoints = exports.ROUTE_KINDS = exports.ROUTING_POINT_KINDS = exports.toElementAndRoutingPoints = exports.toElementAndBounds = exports.isSelectableAndBoundsAware = exports.isRoutingHandle = exports.isRoutable = exports.isNonRoutableSelectedBoundsAware = exports.isNonRoutableSelectedMovableBoundsAware = exports.removeCssClasses = exports.addCssClasses = exports.isNotUndefined = exports.hasSelectedElements = exports.getSelectedElementCount = exports.getElements = exports.getMatchingElements = exports.forEachElement = exports.filter = void 0;
3
+ exports.getElementTypeId = exports.hasCompatibleType = exports.calcRoute = exports.calcElementAndRoute = exports.calcElementAndRoutingPoints = exports.ROUTE_KINDS = exports.ROUTING_POINT_KINDS = exports.ALL_ROUTING_POINTS = exports.toElementAndRoutingPoints = exports.toElementAndBounds = exports.isSelectableAndBoundsAware = exports.isRoutingHandle = exports.isRoutable = exports.isNonRoutableSelectedBoundsAware = exports.isNonRoutableSelectedMovableBoundsAware = exports.removeCssClasses = exports.addCssClasses = exports.isNotUndefined = exports.hasSelectedElements = exports.getSelectedElementCount = exports.getElements = exports.getMatchingElements = exports.forEachElement = exports.filter = void 0;
4
4
  /********************************************************************************
5
5
  * Copyright (c) 2019-2023 EclipseSource and others.
6
6
  *
@@ -195,6 +195,8 @@ function toElementAndRoutingPoints(element) {
195
195
  };
196
196
  }
197
197
  exports.toElementAndRoutingPoints = toElementAndRoutingPoints;
198
+ /** All routing points. */
199
+ exports.ALL_ROUTING_POINTS = undefined;
198
200
  /** Pure routing point data kinds. */
199
201
  exports.ROUTING_POINT_KINDS = ['linear', 'bezier-junction'];
200
202
  /** Pure route data kinds. */
@@ -233,14 +235,29 @@ function calcElementAndRoute(element, routerRegistry) {
233
235
  }
234
236
  exports.calcElementAndRoute = calcElementAndRoute;
235
237
  /**
236
- * Helper function to calculate the route for a given {@link SRoutableElement}.
238
+ * Helper function to calculate the route for a given {@link SRoutableElement} by filtering duplicate points.
237
239
  * @param element The element to translate.
238
240
  * @param routerRegistry the edge router registry.
239
241
  * @param pointKinds the routing point kinds that should be considered.
242
+ * @param tolerance the tolerance applied to a point's coordinates to determine duplicates.
240
243
  * @returns The corresponding route for the given element.
241
244
  */
242
- function calcRoute(element, routerRegistry, pointKinds) {
243
- return routerRegistry === null || routerRegistry === void 0 ? void 0 : routerRegistry.get(element.routerKind).route(element).filter((point, idx, fullRoute) => idx === fullRoute.findIndex(otherPoint => otherPoint.x === point.x && otherPoint.y === point.y)).filter(point => !pointKinds || pointKinds.includes(point.kind));
245
+ function calcRoute(element, routerRegistry, pointKinds = exports.ALL_ROUTING_POINTS, tolerance = Number.EPSILON) {
246
+ const route = routerRegistry.get(element.routerKind).route(element);
247
+ const calculatedRoute = [];
248
+ for (const point of route) {
249
+ // only include points we are actually interested in
250
+ if (pointKinds && !pointKinds.includes(point.kind)) {
251
+ continue;
252
+ }
253
+ // check if we are a duplicate based on coordinates in the already calculated route
254
+ if (exports.ROUTING_POINT_KINDS.includes(point.kind) &&
255
+ calculatedRoute.find(calculatedPoint => _glsp_sprotty_1.Point.maxDistance(point, calculatedPoint) < tolerance)) {
256
+ continue;
257
+ }
258
+ calculatedRoute.push(point);
259
+ }
260
+ return calculatedRoute;
244
261
  }
245
262
  exports.calcRoute = calcRoute;
246
263
  /**
package/lib/utils/smodel-util.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"smodel-util.js","sourceRoot":"","sources":["../../src/utils/smodel-util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"smodel-util.js","sourceRoot":"","sources":["../../src/utils/smodel-util.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-glsp/client",
3
- "version": "1.1.0-next.80bb01c.251+80bb01c",
3
+ "version": "1.1.0-next.86cf8e6.253+86cf8e6",
4
4
  "description": "A sprotty-based client for GLSP",
5
5
  "keywords": [
6
6
  "eclipse",
@@ -47,7 +47,7 @@
47
47
  "watch": "tsc -w"
48
48
  },
49
49
  "dependencies": {
50
- "@eclipse-glsp/protocol": "1.1.0-next.80bb01c.251+80bb01c",
50
+ "@eclipse-glsp/protocol": "1.1.0-next.86cf8e6.253+86cf8e6",
51
51
  "autocompleter": "5.1.0",
52
52
  "lodash": "4.17.21",
53
53
  "sprotty": "0.14.0-next.02bbac0.26"
@@ -60,5 +60,5 @@
60
60
  "publishConfig": {
61
61
  "access": "public"
62
62
  },
63
- "gitHead": "80bb01c5e0129da59b31c75395f9cead632c512b"
63
+ "gitHead": "86cf8e6fd1253778579f5fb92b55e62dea216974"
64
64
  }
package/src/features/select/select-feedback-action.ts CHANGED
@@ -36,10 +36,23 @@ export namespace SelectFeedbackAction {
36
36
  return Action.hasKind(object, KIND) && hasArrayProp(object, 'selectedElementsIDs') && hasArrayProp(object, 'deselectedElementsIDs');
37
37
  }
38
38
 
39
- export function create(options?: { selectedElementsIDs?: string[]; deselectedElementsIDs?: string[] }): SelectFeedbackAction {
39
+ export function create(options?: { selectedElementsIDs?: string[]; deselectedElementsIDs?: string[] | boolean }): SelectFeedbackAction {
40
40
  return { ...SelectAction.create(options), kind: KIND };
41
41
  }
42
+
43
+ export function addSelection(selectedElementsIDs: string[]): SelectFeedbackAction {
44
+ return { ...SelectAction.addSelection(selectedElementsIDs), kind: KIND };
45
+ }
46
+
47
+ export function removeSelection(deselectedElementsIDs: string[]): SelectFeedbackAction {
48
+ return { ...SelectAction.removeSelection(deselectedElementsIDs), kind: KIND };
49
+ }
50
+
51
+ export function setSelection(selectedElementsIDs: string[]): SelectFeedbackAction {
52
+ return { ...SelectAction.setSelection(selectedElementsIDs), kind: KIND };
53
+ }
42
54
  }
55
+
43
56
  @injectable()
44
57
  export class SelectFeedbackCommand extends Command {
45
58
  static readonly KIND = SelectFeedbackAction.KIND;
package/src/features/select/selection-service.ts CHANGED
@@ -179,7 +179,9 @@ export class SelectCommand extends Command {
179
179
  const model = context.root;
180
180
  const selectionGuard = (element: any): element is SModelElement => element instanceof SChildElement && isSelectable(element);
181
181
  const selectedElements = getElements(model.index, this.action.selectedElementsIDs, selectionGuard);
182
- const deselectedElements = getElements(model.index, this.action.deselectedElementsIDs, selectionGuard);
182
+ const deselectedElements = this.action.deselectAll
183
+ ? this.selectionService.getSelectedElements()
184
+ : getElements(model.index, this.action.deselectedElementsIDs, selectionGuard);
183
185
 
184
186
  this.selectionService.updateSelection(model, pluck(selectedElements, 'id'), pluck(deselectedElements, 'id'));
185
187
  return model;
package/src/features/tools/marquee-mouse-tool.ts CHANGED
@@ -114,11 +114,7 @@ export class MarqueeMouseListener extends DragAwareMouseListener {
114
114
  const nodeIdsSelected = this.nodes.filter(e => this.marqueeUtil.isNodeMarked(toAbsoluteBounds(e))).map(e => e.id);
115
115
  const edgeIdsSelected = this.edges.filter(e => this.isEdgeMarked(e)).map(e => this.domHelper.findSModelIdByDOMElement(e));
116
116
  const selected = nodeIdsSelected.concat(edgeIdsSelected);
117
- return [
118
- SelectAction.create({ deselectedElementsIDs: Array.from(target.root.index.all().map(e => e.id)) }),
119
- SelectAction.create({ selectedElementsIDs: selected.concat(this.previouslySelected) }),
120
- this.marqueeUtil.drawMarqueeAction()
121
- ];
117
+ return [SelectAction.setSelection(selected.concat(this.previouslySelected)), this.marqueeUtil.drawMarqueeAction()];
122
118
  }
123
119
  return [];
124
120
  }
package/src/utils/smodel-util.spec.ts ADDED
@@ -0,0 +1,222 @@
1
+ /********************************************************************************
2
+ * Copyright (c) 2023 EclipseSource and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the Eclipse Public License v. 2.0 which is available at
6
+ * http://www.eclipse.org/legal/epl-2.0.
7
+ *
8
+ * This Source Code may also be made available under the following Secondary
9
+ * Licenses when the conditions for such availability set forth in the Eclipse
10
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ * with the GNU Classpath Exception which is available at
12
+ * https://www.gnu.org/software/classpath/license.html.
13
+ *
14
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
+ ********************************************************************************/
16
+ import {
17
+ AbstractEdgeRouter,
18
+ EdgeRouterRegistry,
19
+ LinearRouteOptions,
20
+ Point,
21
+ ResolvedHandleMove,
22
+ RoutedPoint,
23
+ SEdge,
24
+ SGraph,
25
+ SNode,
26
+ SRoutableElement,
27
+ SRoutingHandle,
28
+ routingModule
29
+ } from '@eclipse-glsp/client';
30
+ import { expect } from 'chai';
31
+ import { Container } from 'inversify';
32
+ import { ALL_ROUTING_POINTS, ROUTE_KINDS, ROUTING_POINT_KINDS, calcRoute } from './smodel-util';
33
+
34
+ class TestRouter extends AbstractEdgeRouter {
35
+ kind = 'test-router';
36
+
37
+ route(edge: SRoutableElement): RoutedPoint[] {
38
+ const pureRoute = edge.routingPoints.map(
39
+ (point, idx) =>
40
+ <RoutedPoint>{
41
+ kind: 'linear',
42
+ ...point,
43
+ pointIndex: idx
44
+ }
45
+ );
46
+ return [
47
+ { kind: 'source', ...edge.source!.position },
48
+ ...pureRoute,
49
+ { kind: 'bezier-control-after', x: 999, y: 999, pointIndex: pureRoute.length },
50
+ { kind: 'target', ...edge.target!.position }
51
+ ];
52
+ }
53
+
54
+ createRoutingHandles(edge: SRoutableElement): void {
55
+ // do nothing
56
+ }
57
+
58
+ protected getOptions(edge: SRoutableElement): LinearRouteOptions {
59
+ return {
60
+ minimalPointDistance: 0,
61
+ selfEdgeOffset: 0,
62
+ standardDistance: 0
63
+ };
64
+ }
65
+
66
+ protected getInnerHandlePosition(edge: SRoutableElement, route: RoutedPoint[], handle: SRoutingHandle): Point | undefined {
67
+ return undefined;
68
+ }
69
+
70
+ protected applyInnerHandleMoves(edge: SRoutableElement, moves: ResolvedHandleMove[]): void {
71
+ // do nothing
72
+ }
73
+ }
74
+
75
+ describe('SModel Util', () => {
76
+ describe('calcRoute', () => {
77
+ const graph = new SGraph();
78
+
79
+ const source = new SNode();
80
+ source.id = 'node0';
81
+ source.position = { x: 0, y: 0 };
82
+ source.size = { width: 0, height: 0 };
83
+ graph.add(source);
84
+
85
+ const target = new SNode();
86
+ target.id = 'node1';
87
+ target.position = { x: 100, y: 100 };
88
+ target.size = { width: 0, height: 0 };
89
+ graph.add(target);
90
+
91
+ const edge = new SEdge();
92
+ edge.id = 'edge0';
93
+ edge.sourceId = 'node0';
94
+ edge.targetId = 'node1';
95
+ graph.add(edge);
96
+
97
+ edge.routerKind = 'test-router';
98
+
99
+ const container = new Container();
100
+ container.load(routingModule);
101
+
102
+ const routerRegistry = container.get<EdgeRouterRegistry>(EdgeRouterRegistry);
103
+ routerRegistry.register('test-router', new TestRouter());
104
+
105
+ it('should return complete route', () => {
106
+ edge.source!.position = { x: 0, y: 0 };
107
+ edge.target!.position = { x: 100, y: 100 };
108
+ edge.routingPoints = [
109
+ { x: 20, y: 20 },
110
+ { x: 30, y: 30 },
111
+ { x: 40, y: 40 }
112
+ ];
113
+ const route = calcRoute(edge, routerRegistry);
114
+ expect(route).to.deep.equal(<RoutedPoint[]>[
115
+ { x: 0, y: 0, kind: 'source' },
116
+ { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
117
+ { x: 30, y: 30, kind: 'linear', pointIndex: 1 },
118
+ { x: 40, y: 40, kind: 'linear', pointIndex: 2 },
119
+ { x: 999, y: 999, kind: 'bezier-control-after', pointIndex: 3 },
120
+ { x: 100, y: 100, kind: 'target' }
121
+ ]);
122
+ });
123
+
124
+ it('should filter duplicates with same coordinates', () => {
125
+ edge.source!.position = { x: 0, y: 0 };
126
+ edge.target!.position = { x: 100, y: 100 };
127
+ edge.routingPoints = [
128
+ { x: 20, y: 20 },
129
+ { x: 20, y: 20 },
130
+ { x: 30, y: 30 },
131
+ { x: 40, y: 40 }
132
+ ];
133
+
134
+ const route = calcRoute(edge, routerRegistry);
135
+ expect(route).to.deep.equal(<RoutedPoint[]>[
136
+ { x: 0, y: 0, kind: 'source' },
137
+ { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
138
+ { x: 30, y: 30, kind: 'linear', pointIndex: 2 },
139
+ { x: 40, y: 40, kind: 'linear', pointIndex: 3 },
140
+ { x: 999, y: 999, kind: 'bezier-control-after', pointIndex: 4 },
141
+ { x: 100, y: 100, kind: 'target' }
142
+ ]);
143
+ });
144
+
145
+ it('should not filter source and target even if duplicate coordinates', () => {
146
+ edge.source!.position = { x: 0, y: 0 };
147
+ edge.target!.position = { x: 0, y: 0 };
148
+ edge.routingPoints = [
149
+ { x: 20, y: 20 },
150
+ { x: 30, y: 30 },
151
+ { x: 40, y: 40 }
152
+ ];
153
+
154
+ const route = calcRoute(edge, routerRegistry);
155
+ expect(route).to.deep.equal(<RoutedPoint[]>[
156
+ { x: 0, y: 0, kind: 'source' },
157
+ { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
158
+ { x: 30, y: 30, kind: 'linear', pointIndex: 1 },
159
+ { x: 40, y: 40, kind: 'linear', pointIndex: 2 },
160
+ { x: 999, y: 999, kind: 'bezier-control-after', pointIndex: 3 },
161
+ { x: 0, y: 0, kind: 'target' }
162
+ ]);
163
+ });
164
+
165
+ it('should filter duplicates with same coordinates but allow tolerance', () => {
166
+ edge.source!.position = { x: 0, y: 0 };
167
+ edge.target!.position = { x: 100, y: 100 };
168
+ edge.routingPoints = [
169
+ { x: 20, y: 20 },
170
+ { x: 25, y: 25 },
171
+ { x: 30, y: 30 },
172
+ { x: 40, y: 40 }
173
+ ];
174
+
175
+ const route = calcRoute(edge, routerRegistry, ALL_ROUTING_POINTS, 10);
176
+ expect(route).to.deep.equal(<RoutedPoint[]>[
177
+ { x: 0, y: 0, kind: 'source' },
178
+ { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
179
+ { x: 30, y: 30, kind: 'linear', pointIndex: 2 },
180
+ { x: 40, y: 40, kind: 'linear', pointIndex: 3 },
181
+ { x: 999, y: 999, kind: 'bezier-control-after', pointIndex: 4 },
182
+ { x: 100, y: 100, kind: 'target' }
183
+ ]);
184
+ });
185
+
186
+ it('should allow filtering based on point type: ROUTE_KINDS', () => {
187
+ edge.source!.position = { x: 0, y: 0 };
188
+ edge.target!.position = { x: 100, y: 100 };
189
+ edge.routingPoints = [
190
+ { x: 20, y: 20 },
191
+ { x: 30, y: 30 },
192
+ { x: 40, y: 40 }
193
+ ];
194
+
195
+ const route = calcRoute(edge, routerRegistry, ROUTE_KINDS);
196
+ expect(route).to.deep.equal(<RoutedPoint[]>[
197
+ { x: 0, y: 0, kind: 'source' },
198
+ { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
199
+ { x: 30, y: 30, kind: 'linear', pointIndex: 1 },
200
+ { x: 40, y: 40, kind: 'linear', pointIndex: 2 },
201
+ { x: 100, y: 100, kind: 'target' }
202
+ ]);
203
+ });
204
+
205
+ it('should allow filtering based on point type: ROUTING_POINT_KINDS', () => {
206
+ edge.source!.position = { x: 0, y: 0 };
207
+ edge.target!.position = { x: 100, y: 100 };
208
+ edge.routingPoints = [
209
+ { x: 20, y: 20 },
210
+ { x: 30, y: 30 },
211
+ { x: 40, y: 40 }
212
+ ];
213
+
214
+ const route = calcRoute(edge, routerRegistry, ROUTING_POINT_KINDS);
215
+ expect(route).to.deep.equal(<RoutedPoint[]>[
216
+ { x: 20, y: 20, kind: 'linear', pointIndex: 0 },
217
+ { x: 30, y: 30, kind: 'linear', pointIndex: 1 },
218
+ { x: 40, y: 40, kind: 'linear', pointIndex: 2 }
219
+ ]);
220
+ });
221
+ });
222
+ });
package/src/utils/smodel-util.ts CHANGED
@@ -232,6 +232,8 @@ export function toElementAndRoutingPoints(element: SRoutableElement): ElementAnd
232
232
  newRoutingPoints: element.routingPoints
233
233
  };
234
234
  }
235
+ /** All routing points. */
236
+ export const ALL_ROUTING_POINTS = undefined;
235
237
 
236
238
  /** Pure routing point data kinds. */
237
239
  export const ROUTING_POINT_KINDS = ['linear', 'bezier-junction'];
@@ -272,18 +274,36 @@ export function calcElementAndRoute(element: SRoutableElement, routerRegistry?:
272
274
  }
273
275
 
274
276
  /**
275
- * Helper function to calculate the route for a given {@link SRoutableElement}.
277
+ * Helper function to calculate the route for a given {@link SRoutableElement} by filtering duplicate points.
276
278
  * @param element The element to translate.
277
279
  * @param routerRegistry the edge router registry.
278
280
  * @param pointKinds the routing point kinds that should be considered.
281
+ * @param tolerance the tolerance applied to a point's coordinates to determine duplicates.
279
282
  * @returns The corresponding route for the given element.
280
283
  */
281
- export function calcRoute(element: SRoutableElement, routerRegistry: EdgeRouterRegistry, pointKinds?: string[]): RoutedPoint[] | undefined {
282
- return routerRegistry
283
- ?.get(element.routerKind)
284
- .route(element)
285
- .filter((point, idx, fullRoute) => idx === fullRoute.findIndex(otherPoint => otherPoint.x === point.x && otherPoint.y === point.y))
286
- .filter(point => !pointKinds || pointKinds.includes(point.kind));
284
+ export function calcRoute(
285
+ element: SRoutableElement,
286
+ routerRegistry: EdgeRouterRegistry,
287
+ pointKinds: string[] | undefined = ALL_ROUTING_POINTS,
288
+ tolerance = Number.EPSILON
289
+ ): RoutedPoint[] | undefined {
290
+ const route = routerRegistry.get(element.routerKind).route(element);
291
+ const calculatedRoute: RoutedPoint[] = [];
292
+ for (const point of route) {
293
+ // only include points we are actually interested in
294
+ if (pointKinds && !pointKinds.includes(point.kind)) {
295
+ continue;
296
+ }
297
+ // check if we are a duplicate based on coordinates in the already calculated route
298
+ if (
299
+ ROUTING_POINT_KINDS.includes(point.kind) &&
300
+ calculatedRoute.find(calculatedPoint => Point.maxDistance(point, calculatedPoint) < tolerance)
301
+ ) {
302
+ continue;
303
+ }
304
+ calculatedRoute.push(point);
305
+ }
306
+ return calculatedRoute;
287
307
  }
288
308
 
289
309
  /**