@eclipse-glsp/client 2.6.0-next.12 → 2.6.0-next.14
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/lib/base/model/model-change-service.d.ts.map +1 -1
- package/lib/base/model/model-change-service.js +5 -2
- package/lib/base/model/model-change-service.js.map +1 -1
- package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts +2 -0
- package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts.map +1 -1
- package/lib/features/bounds/glsp-hidden-bounds-updater.js +16 -1
- package/lib/features/bounds/glsp-hidden-bounds-updater.js.map +1 -1
- package/package.json +3 -3
- package/src/base/model/model-change-service.ts +2 -1
- package/src/features/bounds/glsp-hidden-bounds-updater.ts +13 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-change-service.d.ts","sourceRoot":"","sources":["../../../src/base/model/model-change-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,KAAK,EACL,UAAU,EACV,QAAQ,EACR,aAAa,EACb,YAAY,EAKZ,QAAQ,EAGX,MAAM,uBAAuB,CAAC;AAG/B;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAChC,6BAA6B;IAC7B,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;IACvD;;OAEG;IACH,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAEhD;;;OAGG;IACH,iBAAiB,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,uBAAuB;IACvB,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAChC,uBAAuB;IACvB,WAAW,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;CACpC;AAED,
|
|
1
|
+
{"version":3,"file":"model-change-service.d.ts","sourceRoot":"","sources":["../../../src/base/model/model-change-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,KAAK,EACL,UAAU,EACV,QAAQ,EACR,aAAa,EACb,YAAY,EAKZ,QAAQ,EAGX,MAAM,uBAAuB,CAAC;AAG/B;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAChC,6BAA6B;IAC7B,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;IACvD;;OAEG;IACH,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAEhD;;;OAGG;IACH,iBAAiB,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,uBAAuB;IACvB,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAChC,uBAAuB;IACvB,WAAW,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;CACpC;AAED,qBACa,kBAAmB,YAAW,mBAAmB,EAAE,UAAU;IAEtE,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC9C,SAAS,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5C,SAAS,CAAC,SAAS,uBAA8B;IAEjD,IAAI,WAAW,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,SAAS,CAElD;IAED,SAAS,KAAK,YAAY,IAAI,aAAa,CAE1C;IAED,SAAS,CAAC,yBAAyB,gCAAuC;IAC1E,IAAI,kBAAkB,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAEpD;IAED,SAAS,CAAC,wBAAwB,0BAAiC;IACnE,IAAI,iBAAiB,IAAI,KAAK,CAAC,cAAc,CAAC,CAE7C;IAGD,SAAS,CAAC,UAAU,IAAI,IAAI;IAM5B,OAAO,IAAI,IAAI;IAIf,SAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAS9E,SAAS,CAAC,wBAAwB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAI9D,SAAS,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAI7D,SAAS,CAAC,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAMpF,SAAS,CAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAYnF,SAAS,CAAC,kBAAkB,CAAC,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO;IAWtE,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,SAAS;CAGnF"}
|
|
@@ -27,7 +27,7 @@ exports.ModelChangeService = void 0;
|
|
|
27
27
|
********************************************************************************/
|
|
28
28
|
const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
|
-
class ModelChangeService {
|
|
30
|
+
let ModelChangeService = class ModelChangeService {
|
|
31
31
|
constructor() {
|
|
32
32
|
this.toDispose = new sprotty_1.DisposableCollection();
|
|
33
33
|
this.onModelRootChangedEmitter = new sprotty_1.Emitter();
|
|
@@ -92,7 +92,7 @@ class ModelChangeService {
|
|
|
92
92
|
toViewport(root) {
|
|
93
93
|
return (0, sprotty_1.isViewport)(root) ? { scroll: root.scroll, zoom: root.zoom } : undefined;
|
|
94
94
|
}
|
|
95
|
-
}
|
|
95
|
+
};
|
|
96
96
|
exports.ModelChangeService = ModelChangeService;
|
|
97
97
|
__decorate([
|
|
98
98
|
(0, inversify_1.inject)(sprotty_1.LazyInjector),
|
|
@@ -110,4 +110,7 @@ __decorate([
|
|
|
110
110
|
__metadata("design:paramtypes", []),
|
|
111
111
|
__metadata("design:returntype", void 0)
|
|
112
112
|
], ModelChangeService.prototype, "dispose", null);
|
|
113
|
+
exports.ModelChangeService = ModelChangeService = __decorate([
|
|
114
|
+
(0, inversify_1.injectable)()
|
|
115
|
+
], ModelChangeService);
|
|
113
116
|
//# sourceMappingURL=model-change-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-change-service.js","sourceRoot":"","sources":["../../../src/base/model/model-change-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAiB+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"model-change-service.js","sourceRoot":"","sources":["../../../src/base/model/model-change-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Action, BoundsData, EdgeRouterRegistry, ElementAndRoutingPoints, GModelElement, HiddenBoundsUpdater, LayoutData, ModelIndexImpl } from '@eclipse-glsp/sprotty';
|
|
17
17
|
import { VNode } from 'snabbdom';
|
|
18
|
+
import { EditorContextService } from '../../base/editor-context-service';
|
|
18
19
|
import { BoundsAwareModelElement } from '../../utils/gmodel-util';
|
|
19
20
|
export declare class BoundsDataExt extends BoundsData {
|
|
20
21
|
layoutData?: LayoutData;
|
|
@@ -26,6 +27,7 @@ export declare class BoundsDataExt extends BoundsData {
|
|
|
26
27
|
*/
|
|
27
28
|
export declare class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
|
|
28
29
|
protected readonly edgeRouterRegistry?: EdgeRouterRegistry;
|
|
30
|
+
protected editorContext: EditorContextService;
|
|
29
31
|
protected element2route: ElementAndRoutingPoints[];
|
|
30
32
|
protected getElement2BoundsData(): Map<BoundsAwareModelElement, BoundsDataExt>;
|
|
31
33
|
decorate(vnode: VNode, element: GModelElement): VNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-hidden-bounds-updater.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,UAAU,EAEV,kBAAkB,EAIlB,uBAAuB,EAEvB,aAAa,EACb,mBAAmB,EACnB,UAAU,EACV,cAAc,EAGjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,uBAAuB,EAAqD,MAAM,yBAAyB,CAAC;AAIrH,qBAAa,aAAc,SAAQ,UAAU;IACzC,UAAU,CAAC,EAAE,UAAU,CAAC;CAC3B;AAED;;;;GAIG;AACH,qBACa,uBAAwB,SAAQ,mBAAmB;IACpB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"glsp-hidden-bounds-updater.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,UAAU,EAEV,kBAAkB,EAIlB,uBAAuB,EAEvB,aAAa,EACb,mBAAmB,EACnB,UAAU,EACV,cAAc,EAGjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAqD,MAAM,yBAAyB,CAAC;AAIrH,qBAAa,aAAc,SAAQ,UAAU;IACzC,UAAU,CAAC,EAAE,UAAU,CAAC;CAC3B;AAED;;;;GAIG;AACH,qBACa,uBAAwB,SAAQ,mBAAmB;IACpB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACrE,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAE5E,SAAS,CAAC,aAAa,EAAE,uBAAuB,EAAE,CAAM;IAExD,SAAS,CAAC,qBAAqB,IAAI,GAAG,CAAC,uBAAuB,EAAE,aAAa,CAAC;IAIrE,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,KAAK;IAQrD,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAuEzC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI;IAYrD,SAAS,CAAC,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;CAG/F"}
|
|
@@ -27,6 +27,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
27
27
|
exports.GLSPHiddenBoundsUpdater = exports.BoundsDataExt = void 0;
|
|
28
28
|
const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
|
+
const editor_context_service_1 = require("../../base/editor-context-service");
|
|
30
31
|
const gmodel_util_1 = require("../../utils/gmodel-util");
|
|
31
32
|
const layout_data_1 = require("./layout-data");
|
|
32
33
|
const local_bounds_1 = require("./local-bounds");
|
|
@@ -99,7 +100,17 @@ let GLSPHiddenBoundsUpdater = class GLSPHiddenBoundsUpdater extends sprotty_1.Hi
|
|
|
99
100
|
// prepare and dispatch action
|
|
100
101
|
const responseId = cause.requestId;
|
|
101
102
|
const revision = this.root !== undefined ? this.root.revision : undefined;
|
|
102
|
-
const
|
|
103
|
+
const canvasBounds = this.editorContext.canvasBounds;
|
|
104
|
+
const viewport = this.editorContext.viewportData;
|
|
105
|
+
const computedBoundsAction = sprotty_1.ComputedBoundsAction.create(resizes, {
|
|
106
|
+
revision,
|
|
107
|
+
alignments,
|
|
108
|
+
layoutData,
|
|
109
|
+
routes,
|
|
110
|
+
responseId,
|
|
111
|
+
canvasBounds,
|
|
112
|
+
viewport
|
|
113
|
+
});
|
|
103
114
|
if (local_bounds_1.LocalRequestBoundsAction.is(cause)) {
|
|
104
115
|
local_bounds_1.LocalComputedBoundsAction.mark(computedBoundsAction);
|
|
105
116
|
}
|
|
@@ -128,6 +139,10 @@ __decorate([
|
|
|
128
139
|
(0, inversify_1.optional)(),
|
|
129
140
|
__metadata("design:type", sprotty_1.EdgeRouterRegistry)
|
|
130
141
|
], GLSPHiddenBoundsUpdater.prototype, "edgeRouterRegistry", void 0);
|
|
142
|
+
__decorate([
|
|
143
|
+
(0, inversify_1.inject)(editor_context_service_1.EditorContextService),
|
|
144
|
+
__metadata("design:type", editor_context_service_1.EditorContextService)
|
|
145
|
+
], GLSPHiddenBoundsUpdater.prototype, "editorContext", void 0);
|
|
131
146
|
exports.GLSPHiddenBoundsUpdater = GLSPHiddenBoundsUpdater = __decorate([
|
|
132
147
|
(0, inversify_1.injectable)()
|
|
133
148
|
], GLSPHiddenBoundsUpdater);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-hidden-bounds-updater.js","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,mDAgB+B;AAC/B,yCAAyD;AAEzD,yDAAqH;AACrH,+CAA4C;AAC5C,iDAAqF;AAErF,MAAa,aAAc,SAAQ,oBAAU;CAE5C;AAFD,sCAEC;AAED;;;;GAIG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,6BAAmB;IAAzD;;
|
|
1
|
+
{"version":3,"file":"glsp-hidden-bounds-updater.js","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.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": "2.6.0-next.
|
|
3
|
+
"version": "2.6.0-next.14+caff9e9",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"watch": "tsc -w"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@eclipse-glsp/sprotty": "2.6.0-next.
|
|
49
|
+
"@eclipse-glsp/sprotty": "2.6.0-next.14+caff9e9",
|
|
50
50
|
"autocompleter": "^9.1.2",
|
|
51
51
|
"file-saver": "^2.0.5",
|
|
52
52
|
"lodash": "4.17.21",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "caff9e9fa45fc2903c0961c36858f2d52c47603d"
|
|
67
67
|
}
|
|
@@ -31,7 +31,7 @@ import {
|
|
|
31
31
|
almostEquals,
|
|
32
32
|
isViewport
|
|
33
33
|
} from '@eclipse-glsp/sprotty';
|
|
34
|
-
import { inject, postConstruct, preDestroy } from 'inversify';
|
|
34
|
+
import { inject, injectable, postConstruct, preDestroy } from 'inversify';
|
|
35
35
|
|
|
36
36
|
/**
|
|
37
37
|
* Service that tracks changes to the model root and the viewport.
|
|
@@ -63,6 +63,7 @@ export interface ViewportChange {
|
|
|
63
63
|
oldViewport?: Readonly<Viewport>;
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
+
@injectable()
|
|
66
67
|
export class ModelChangeService implements IModelChangeService, Disposable {
|
|
67
68
|
@inject(LazyInjector)
|
|
68
69
|
protected lazyInjector: LazyInjector;
|
|
@@ -33,6 +33,7 @@ import {
|
|
|
33
33
|
} from '@eclipse-glsp/sprotty';
|
|
34
34
|
import { inject, injectable, optional } from 'inversify';
|
|
35
35
|
import { VNode } from 'snabbdom';
|
|
36
|
+
import { EditorContextService } from '../../base/editor-context-service';
|
|
36
37
|
import { BoundsAwareModelElement, calcElementAndRoute, getDescendantIds, isRoutable } from '../../utils/gmodel-util';
|
|
37
38
|
import { LayoutAware } from './layout-data';
|
|
38
39
|
import { LocalComputedBoundsAction, LocalRequestBoundsAction } from './local-bounds';
|
|
@@ -49,6 +50,7 @@ export class BoundsDataExt extends BoundsData {
|
|
|
49
50
|
@injectable()
|
|
50
51
|
export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
|
|
51
52
|
@inject(EdgeRouterRegistry) @optional() protected readonly edgeRouterRegistry?: EdgeRouterRegistry;
|
|
53
|
+
@inject(EditorContextService) protected editorContext: EditorContextService;
|
|
52
54
|
|
|
53
55
|
protected element2route: ElementAndRoutingPoints[] = [];
|
|
54
56
|
|
|
@@ -114,7 +116,17 @@ export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
|
|
|
114
116
|
// prepare and dispatch action
|
|
115
117
|
const responseId = (cause as RequestBoundsAction).requestId;
|
|
116
118
|
const revision = this.root !== undefined ? this.root.revision : undefined;
|
|
117
|
-
const
|
|
119
|
+
const canvasBounds = this.editorContext.canvasBounds;
|
|
120
|
+
const viewport = this.editorContext.viewportData;
|
|
121
|
+
const computedBoundsAction = ComputedBoundsAction.create(resizes, {
|
|
122
|
+
revision,
|
|
123
|
+
alignments,
|
|
124
|
+
layoutData,
|
|
125
|
+
routes,
|
|
126
|
+
responseId,
|
|
127
|
+
canvasBounds,
|
|
128
|
+
viewport
|
|
129
|
+
});
|
|
118
130
|
if (LocalRequestBoundsAction.is(cause)) {
|
|
119
131
|
LocalComputedBoundsAction.mark(computedBoundsAction);
|
|
120
132
|
}
|